Module Name: src
Committed By: skrll
Date: Tue Jun 6 20:19:04 UTC 2017
Modified Files:
src/external/gpl2/dtc/dist: data.c dtc.h fdtdump.c fdtput.c flattree.c
srcpos.c util.h
src/external/gpl2/dtc/dist/tests: mangle-layout.c move_and_save.c
tests.h
Log Message:
Reduce number of ALIGN macros defines and rename to avoid namespace clash
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/dtc/dist/data.c \
src/external/gpl2/dtc/dist/dtc.h src/external/gpl2/dtc/dist/fdtdump.c \
src/external/gpl2/dtc/dist/fdtput.c src/external/gpl2/dtc/dist/flattree.c \
src/external/gpl2/dtc/dist/srcpos.c src/external/gpl2/dtc/dist/util.h
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/dtc/dist/tests/mangle-layout.c \
src/external/gpl2/dtc/dist/tests/move_and_save.c \
src/external/gpl2/dtc/dist/tests/tests.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/dtc/dist/data.c
diff -u src/external/gpl2/dtc/dist/data.c:1.1.1.1 src/external/gpl2/dtc/dist/data.c:1.2
--- src/external/gpl2/dtc/dist/data.c:1.1.1.1 Fri Dec 4 12:30:05 2015
+++ src/external/gpl2/dtc/dist/data.c Tue Jun 6 20:19:04 2017
@@ -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 = FDTALIGN2(d.len, align);
return data_append_zeroes(d, newlen - d.len);
}
Index: src/external/gpl2/dtc/dist/dtc.h
diff -u src/external/gpl2/dtc/dist/dtc.h:1.1.1.1 src/external/gpl2/dtc/dist/dtc.h:1.2
--- src/external/gpl2/dtc/dist/dtc.h:1.1.1.1 Fri Dec 4 12:30:05 2015
+++ src/external/gpl2/dtc/dist/dtc.h Tue Jun 6 20:19:04 2017
@@ -65,8 +65,6 @@ 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))
-
/* Data blobs */
enum markertype {
REF_PHANDLE,
Index: src/external/gpl2/dtc/dist/fdtdump.c
diff -u src/external/gpl2/dtc/dist/fdtdump.c:1.1.1.1 src/external/gpl2/dtc/dist/fdtdump.c:1.2
--- src/external/gpl2/dtc/dist/fdtdump.c:1.1.1.1 Fri Dec 4 12:30:05 2015
+++ src/external/gpl2/dtc/dist/fdtdump.c Tue Jun 6 20:19:04 2017
@@ -15,8 +15,6 @@
#include "util.h"
-#define ALIGN(x, a) (((x) + ((a) - 1)) & ~((a) - 1))
-#define PALIGN(p, a) ((void *)(ALIGN((unsigned long)(p), (a))))
#define GET_CELL(p) (p += 4, *((const uint32_t *)(p-4)))
static const char *tagname(uint32_t tag)
Index: src/external/gpl2/dtc/dist/fdtput.c
diff -u src/external/gpl2/dtc/dist/fdtput.c:1.1.1.1 src/external/gpl2/dtc/dist/fdtput.c:1.2
--- src/external/gpl2/dtc/dist/fdtput.c:1.1.1.1 Fri Dec 4 12:30:05 2015
+++ src/external/gpl2/dtc/dist/fdtput.c Tue Jun 6 20:19:04 2017
@@ -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: src/external/gpl2/dtc/dist/flattree.c
diff -u src/external/gpl2/dtc/dist/flattree.c:1.1.1.1 src/external/gpl2/dtc/dist/flattree.c:1.2
--- src/external/gpl2/dtc/dist/flattree.c:1.1.1.1 Fri Dec 4 12:30:05 2015
+++ src/external/gpl2/dtc/dist/flattree.c Tue Jun 6 20:19:04 2017
@@ -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 = FDTALIGN2(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 + FDTALIGN2(off, align);
if (inb->ptr > inb->limit)
die("Premature end of data parsing flat device tree\n");
}
Index: src/external/gpl2/dtc/dist/srcpos.c
diff -u src/external/gpl2/dtc/dist/srcpos.c:1.1.1.1 src/external/gpl2/dtc/dist/srcpos.c:1.2
--- src/external/gpl2/dtc/dist/srcpos.c:1.1.1.1 Fri Dec 4 12:30:05 2015
+++ src/external/gpl2/dtc/dist/srcpos.c Tue Jun 6 20:19:04 2017
@@ -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);
+ FDTALIGN2(current_srcfile->colno, TAB_SIZE);
} else {
current_srcfile->colno++;
}
Index: src/external/gpl2/dtc/dist/util.h
diff -u src/external/gpl2/dtc/dist/util.h:1.1.1.1 src/external/gpl2/dtc/dist/util.h:1.2
--- src/external/gpl2/dtc/dist/util.h:1.1.1.1 Fri Dec 4 12:30:05 2015
+++ src/external/gpl2/dtc/dist/util.h Tue Jun 6 20:19:04 2017
@@ -26,6 +26,8 @@
*/
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+#define FDTALIGN2(x, a) (((x) + (a) - 1) & ~((a) - 1))
+#define PALIGN(p, a) ((void *)(FDTALIGN2((unsigned long)(p), (a))))
static inline void __attribute__((noreturn)) die(const char *str, ...)
{
Index: src/external/gpl2/dtc/dist/tests/mangle-layout.c
diff -u src/external/gpl2/dtc/dist/tests/mangle-layout.c:1.1.1.1 src/external/gpl2/dtc/dist/tests/mangle-layout.c:1.2
--- src/external/gpl2/dtc/dist/tests/mangle-layout.c:1.1.1.1 Fri Dec 4 12:30:06 2015
+++ src/external/gpl2/dtc/dist/tests/mangle-layout.c Tue Jun 6 20:19:04 2017
@@ -95,7 +95,7 @@ static void add_block(struct bufstate *b
}
oldsize = buf->size;
- offset = ALIGN(oldsize, align);
+ offset = FDTALIGN2(oldsize, align);
expand_buf(buf, offset+size);
memset(buf->buf + oldsize, 0, offset - oldsize);
Index: src/external/gpl2/dtc/dist/tests/move_and_save.c
diff -u src/external/gpl2/dtc/dist/tests/move_and_save.c:1.1.1.1 src/external/gpl2/dtc/dist/tests/move_and_save.c:1.2
--- src/external/gpl2/dtc/dist/tests/move_and_save.c:1.1.1.1 Fri Dec 4 12:30:06 2015
+++ src/external/gpl2/dtc/dist/tests/move_and_save.c Tue Jun 6 20:19:04 2017
@@ -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 = FDTALIGN2(fdt_totalsize(fdt) / 2, sizeof(uint64_t));
bufsize = fdt_totalsize(fdt) + shuntsize;
buf = xmalloc(bufsize);
Index: src/external/gpl2/dtc/dist/tests/tests.h
diff -u src/external/gpl2/dtc/dist/tests/tests.h:1.1.1.1 src/external/gpl2/dtc/dist/tests/tests.h:1.2
--- src/external/gpl2/dtc/dist/tests/tests.h:1.1.1.1 Fri Dec 4 12:30:06 2015
+++ src/external/gpl2/dtc/dist/tests/tests.h Tue Jun 6 20:19:04 2017
@@ -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 FDTALIGN2(x, a) (((x) + (a) - 1) & ~((a) - 1))
+#define PALIGN(p, a) ((void *)FDTALIGN2((unsigned long)(p), (a)))
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
#define streq(s1, s2) (strcmp((s1),(s2)) == 0)
