projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mkimage -l is broken for images after gpimage
[oweals/u-boot.git]
/
tools
/
Makefile
diff --git
a/tools/Makefile
b/tools/Makefile
index 1e4b4aaa0226a99fee84f0e5d9492bc68d7827e2..f72294a98a583fee5cfb43ec15cc61615b7e8e88 100644
(file)
--- a/
tools/Makefile
+++ b/
tools/Makefile
@@
-31,7
+31,6
@@
CONFIG_BUILD_ENVCRC ?= $(ENVCRC-y)
hostprogs-$(CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER) += atmel_pmecc_params
hostprogs-$(CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER) += atmel_pmecc_params
-# TODO: CONFIG_CMD_LICENSE does not work
hostprogs-$(CONFIG_CMD_LICENSE) += bin2header
hostprogs-$(CONFIG_LCD_LOGO) += bmp_logo
hostprogs-$(CONFIG_VIDEO_LOGO) += bmp_logo
hostprogs-$(CONFIG_CMD_LICENSE) += bin2header
hostprogs-$(CONFIG_LCD_LOGO) += bmp_logo
hostprogs-$(CONFIG_VIDEO_LOGO) += bmp_logo
@@
-77,8
+76,6
@@
dumpimage-mkimage-objs := aisimage.o \
lib/fdtdec.o \
fit_common.o \
fit_image.o \
lib/fdtdec.o \
fit_common.o \
fit_image.o \
- gpimage.o \
- gpimage-common.o \
common/image-fit.o \
image-host.o \
common/image.o \
common/image-fit.o \
image-host.o \
common/image.o \
@@
-99,7
+96,10
@@
dumpimage-mkimage-objs := aisimage.o \
common/hash.o \
ublimage.o \
zynqimage.o \
common/hash.o \
ublimage.o \
zynqimage.o \
+ zynqmpimage.o \
$(LIBFDT_OBJS) \
$(LIBFDT_OBJS) \
+ gpimage.o \
+ gpimage-common.o \
$(RSA_OBJS-y)
dumpimage-objs := $(dumpimage-mkimage-objs) dumpimage.o
$(RSA_OBJS-y)
dumpimage-objs := $(dumpimage-mkimage-objs) dumpimage.o
@@
-212,6
+212,10
@@
endif
endif # !LOGO_BMP
endif # !LOGO_BMP
+# Generated gziped GPL-2.0 license text
+LICENSE_H = $(objtree)/include/license.h
+LICENSE-$(CONFIG_CMD_LICENSE) += $(LICENSE_H)
+
#
# Use native tools and options
# Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
#
# Use native tools and options
# Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
@@
-226,7
+230,7
@@
HOST_EXTRACFLAGS += -include $(srctree)/include/libfdt_env.h \
-D__KERNEL_STRICT_NAMES \
-D_GNU_SOURCE
-D__KERNEL_STRICT_NAMES \
-D_GNU_SOURCE
-__build: $(LOGO-y)
+__build: $(LOGO-y)
$(LICENSE-y)
$(LOGO_H): $(obj)/bmp_logo $(LOGO_BMP)
$(obj)/bmp_logo --gen-info $(LOGO_BMP) > $@
$(LOGO_H): $(obj)/bmp_logo $(LOGO_BMP)
$(obj)/bmp_logo --gen-info $(LOGO_BMP) > $@
@@
-234,6
+238,10
@@
$(LOGO_H): $(obj)/bmp_logo $(LOGO_BMP)
$(LOGO_DATA_H): $(obj)/bmp_logo $(LOGO_BMP)
$(obj)/bmp_logo --gen-data $(LOGO_BMP) > $@
$(LOGO_DATA_H): $(obj)/bmp_logo $(LOGO_BMP)
$(obj)/bmp_logo --gen-data $(LOGO_BMP) > $@
+$(LICENSE_H): $(obj)/bin2header $(srctree)/Licenses/gpl-2.0.txt
+ cat $(srctree)/Licenses/gpl-2.0.txt | gzip -9 -c | \
+ $(obj)/bin2header license_gzip > $(LICENSE_H)
+
# Let clean descend into subdirs
subdir- += env
# Let clean descend into subdirs
subdir- += env