diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile | 3 | ||||
| -rw-r--r-- | tools/imls/Makefile | 2 | ||||
| -rw-r--r-- | tools/scripts/define2mk.sed | 8 |
3 files changed, 9 insertions, 4 deletions
diff --git a/tools/Makefile b/tools/Makefile index 8ec92d2cb..619c9f2ac 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -145,7 +145,8 @@ HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \ -idirafter $(OBJTREE)/include \ -I $(SRCTREE)/lib/libfdt \ -I $(SRCTREE)/tools \ - -DTEXT_BASE=$(TEXT_BASE) -DUSE_HOSTCC \ + -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ + -DUSE_HOSTCC \ -D__KERNEL_STRICT_NAMES diff --git a/tools/imls/Makefile b/tools/imls/Makefile index 840727707..0caa397b2 100644 --- a/tools/imls/Makefile +++ b/tools/imls/Makefile @@ -67,7 +67,7 @@ $(obj)imls: $(obj)imls.o $(obj)crc32.o $(obj)image.o $(obj)md5.o \ $(CC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ $(STRIP) $@ -# Some files complain if compiled with -pedantic, use FIT_CFLAGS +# Some files complain if compiled with -pedantic, use HOSTCFLAGS_NOPED $(obj)image.o: $(SRCTREE)/common/image.c $(CC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $< diff --git a/tools/scripts/define2mk.sed b/tools/scripts/define2mk.sed index af40bfaf2..13e2845e7 100644 --- a/tools/scripts/define2mk.sed +++ b/tools/scripts/define2mk.sed @@ -18,8 +18,12 @@ s/="\(.*\)"$/=\1/; # Concatenate string values s/" *"//g; - # Wrap non-numeral values with quotes - s/=\(.*\?[^0-9].*\)$/=\"\1\"/; + # Assume strings as default - add quotes around values + s/=\(..*\)/="\1"/; + # but remove again from decimal numbers + s/="\([0-9][0-9]*\)"/=\1/; + # ... and from hex numbers + s/="\(0[Xx][0-9a-fA-F][0-9a-fA-F]*\)"/=\1/; # Change '1' and empty values to "y" (not perfect, but # supports conditional compilation in the makefiles s/=$/=y/; |