? external/gpl2/dtc/cscope.out Index: external/gpl2/dtc/dist/data.c =================================================================== RCS file: /cvsroot/src/external/gpl2/dtc/dist/data.c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 data.c --- external/gpl2/dtc/dist/data.c 4 Dec 2015 12:30:05 -0000 1.1.1.1 +++ external/gpl2/dtc/dist/data.c 6 Jun 2017 08:46:39 -0000 @@ -233,7 +233,7 @@ struct data data_append_zeroes(struct da struct data data_append_align(struct data d, int align) { - int newlen = ALIGN(d.len, align); + int newlen = FDTALIGN(d.len, align); return data_append_zeroes(d, newlen - d.len); } Index: external/gpl2/dtc/dist/dtc.h =================================================================== RCS file: /cvsroot/src/external/gpl2/dtc/dist/dtc.h,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 dtc.h --- external/gpl2/dtc/dist/dtc.h 4 Dec 2015 12:30:05 -0000 1.1.1.1 +++ external/gpl2/dtc/dist/dtc.h 6 Jun 2017 08:46:40 -0000 @@ -65,7 +65,7 @@ typedef uint32_t cell_t; #define streq(a, b) (strcmp((a), (b)) == 0) #define strneq(a, b, n) (strncmp((a), (b), (n)) == 0) -#define ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1)) +#define FDTALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1)) /* Data blobs */ enum markertype { Index: external/gpl2/dtc/dist/fdtdump.c =================================================================== RCS file: /cvsroot/src/external/gpl2/dtc/dist/fdtdump.c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 fdtdump.c --- external/gpl2/dtc/dist/fdtdump.c 4 Dec 2015 12:30:05 -0000 1.1.1.1 +++ external/gpl2/dtc/dist/fdtdump.c 6 Jun 2017 08:46:40 -0000 @@ -15,8 +15,8 @@ #include "util.h" -#define ALIGN(x, a) (((x) + ((a) - 1)) & ~((a) - 1)) -#define PALIGN(p, a) ((void *)(ALIGN((unsigned long)(p), (a)))) +#define XALIGN(x, a) (((x) + ((a) - 1)) & ~((a) - 1)) +#define PALIGN(p, a) ((void *)(XALIGN((unsigned long)(p), (a)))) #define GET_CELL(p) (p += 4, *((const uint32_t *)(p-4))) static const char *tagname(uint32_t tag) Index: external/gpl2/dtc/dist/fdtput.c =================================================================== RCS file: /cvsroot/src/external/gpl2/dtc/dist/fdtput.c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 fdtput.c --- external/gpl2/dtc/dist/fdtput.c 4 Dec 2015 12:30:05 -0000 1.1.1.1 +++ external/gpl2/dtc/dist/fdtput.c 6 Jun 2017 08:46:40 -0000 @@ -128,7 +128,7 @@ static int encode_value(struct display_i return 0; } -#define ALIGN(x) (((x) + (FDT_TAGSIZE) - 1) & ~((FDT_TAGSIZE) - 1)) +#define FDTALIGN(x) (((x) + (FDT_TAGSIZE) - 1) & ~((FDT_TAGSIZE) - 1)) static char *_realloc_fdt(char *fdt, int delta) { @@ -142,7 +142,7 @@ static char *realloc_node(char *fdt, con { int delta; /* FDT_BEGIN_NODE, node name in off_struct and FDT_END_NODE */ - delta = sizeof(struct fdt_node_header) + ALIGN(strlen(name) + 1) + delta = sizeof(struct fdt_node_header) + FDTALIGN(strlen(name) + 1) + FDT_TAGSIZE; return _realloc_fdt(fdt, delta); } @@ -159,7 +159,7 @@ static char *realloc_property(char *fdt, if (newlen > oldlen) /* actual value in off_struct */ - delta += ALIGN(newlen) - ALIGN(oldlen); + delta += FDTALIGN(newlen) - FDTALIGN(oldlen); return _realloc_fdt(fdt, delta); } Index: external/gpl2/dtc/dist/flattree.c =================================================================== RCS file: /cvsroot/src/external/gpl2/dtc/dist/flattree.c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 flattree.c --- external/gpl2/dtc/dist/flattree.c 4 Dec 2015 12:30:05 -0000 1.1.1.1 +++ external/gpl2/dtc/dist/flattree.c 6 Jun 2017 08:46:40 -0000 @@ -350,7 +350,7 @@ static void make_fdt_header(struct fdt_h fdt->last_comp_version = cpu_to_fdt32(vi->last_comp_version); /* Reserve map should be doubleword aligned */ - reserve_off = ALIGN(vi->hdr_size, 8); + reserve_off = FDTALIGN(vi->hdr_size, 8); fdt->off_mem_rsvmap = cpu_to_fdt32(reserve_off); fdt->off_dt_struct = cpu_to_fdt32(reserve_off + reservesize); @@ -613,7 +613,7 @@ static void flat_realign(struct inbuf *i { int off = inb->ptr - inb->base; - inb->ptr = inb->base + ALIGN(off, align); + inb->ptr = inb->base + FDTALIGN(off, align); if (inb->ptr > inb->limit) die("Premature end of data parsing flat device tree\n"); } Index: external/gpl2/dtc/dist/srcpos.c =================================================================== RCS file: /cvsroot/src/external/gpl2/dtc/dist/srcpos.c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 srcpos.c --- external/gpl2/dtc/dist/srcpos.c 4 Dec 2015 12:30:05 -0000 1.1.1.1 +++ external/gpl2/dtc/dist/srcpos.c 6 Jun 2017 08:46:40 -0000 @@ -226,7 +226,7 @@ void srcpos_update(struct srcpos *pos, c current_srcfile->colno = 1; } else if (text[i] == '\t') { current_srcfile->colno = - ALIGN(current_srcfile->colno, TAB_SIZE); + FDTALIGN(current_srcfile->colno, TAB_SIZE); } else { current_srcfile->colno++; } Index: external/gpl2/dtc/dist/tests/mangle-layout.c =================================================================== RCS file: /cvsroot/src/external/gpl2/dtc/dist/tests/mangle-layout.c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 mangle-layout.c --- external/gpl2/dtc/dist/tests/mangle-layout.c 4 Dec 2015 12:30:06 -0000 1.1.1.1 +++ external/gpl2/dtc/dist/tests/mangle-layout.c 6 Jun 2017 08:46:40 -0000 @@ -95,7 +95,7 @@ static void add_block(struct bufstate *b } oldsize = buf->size; - offset = ALIGN(oldsize, align); + offset = FDTALIGN(oldsize, align); expand_buf(buf, offset+size); memset(buf->buf + oldsize, 0, offset - oldsize); Index: external/gpl2/dtc/dist/tests/move_and_save.c =================================================================== RCS file: /cvsroot/src/external/gpl2/dtc/dist/tests/move_and_save.c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 move_and_save.c --- external/gpl2/dtc/dist/tests/move_and_save.c 4 Dec 2015 12:30:06 -0000 1.1.1.1 +++ external/gpl2/dtc/dist/tests/move_and_save.c 6 Jun 2017 08:46:40 -0000 @@ -43,7 +43,7 @@ int main(int argc, char *argv[]) fdt = load_blob_arg(argc, argv); inname = argv[1]; - shuntsize = ALIGN(fdt_totalsize(fdt) / 2, sizeof(uint64_t)); + shuntsize = FDTALIGN(fdt_totalsize(fdt) / 2, sizeof(uint64_t)); bufsize = fdt_totalsize(fdt) + shuntsize; buf = xmalloc(bufsize); Index: external/gpl2/dtc/dist/tests/tests.h =================================================================== RCS file: /cvsroot/src/external/gpl2/dtc/dist/tests/tests.h,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 tests.h --- external/gpl2/dtc/dist/tests/tests.h 4 Dec 2015 12:30:06 -0000 1.1.1.1 +++ external/gpl2/dtc/dist/tests/tests.h 6 Jun 2017 08:46:40 -0000 @@ -32,8 +32,8 @@ extern int verbose_test; extern char *test_name; void test_init(int argc, char *argv[]); -#define ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1)) -#define PALIGN(p, a) ((void *)ALIGN((unsigned long)(p), (a))) +#define XALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1)) +#define PALIGN(p, a) ((void *)XALIGN((unsigned long)(p), (a))) #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #define streq(s1, s2) (strcmp((s1),(s2)) == 0)