Skip to content

E
ezynq
Commit 55b91381 authored by Oleg Dzhimiev's avatar Oleg Dzhimiev
Browse files
Options

makefile

parent 5bd28da8
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 24 deletions
u-boot-tree/tools/Makefile
View file @ 55b91381
...@@ -13,6 +13,7 @@ CONFIG_CMD_NET = y ...@@ -13,6 +13,7 @@ CONFIG_CMD_NET = y
CONFIG_XWAY_SWAP_BYTES = y CONFIG_XWAY_SWAP_BYTES = y
CONFIG_NETCONSOLE = y CONFIG_NETCONSOLE = y
CONFIG_SHA1_CHECK_UB_IMG = y CONFIG_SHA1_CHECK_UB_IMG = y
CONFIG_ARCH_SUNXI = y
endif endif
subdir-$(HOST_TOOLS_ALL) += easylogo subdir-$(HOST_TOOLS_ALL) += easylogo
...@@ -20,7 +21,6 @@ subdir-$(HOST_TOOLS_ALL) += gdb ...@@ -20,7 +21,6 @@ subdir-$(HOST_TOOLS_ALL) += gdb
# Merge all the different vars for envcrc into one # Merge all the different vars for envcrc into one
ENVCRC-$(CONFIG_ENV_IS_EMBEDDED) = y ENVCRC-$(CONFIG_ENV_IS_EMBEDDED) = y
ENVCRC-$(CONFIG_ENV_IS_IN_DATAFLASH) = y
ENVCRC-$(CONFIG_ENV_IS_IN_EEPROM) = y ENVCRC-$(CONFIG_ENV_IS_IN_EEPROM) = y
ENVCRC-$(CONFIG_ENV_IS_IN_FLASH) = y ENVCRC-$(CONFIG_ENV_IS_IN_FLASH) = y
ENVCRC-$(CONFIG_ENV_IS_IN_ONENAND) = y ENVCRC-$(CONFIG_ENV_IS_IN_ONENAND) = y
...@@ -31,17 +31,20 @@ CONFIG_BUILD_ENVCRC ?= $(ENVCRC-y) ...@@ -31,17 +31,20 @@ 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
hostprogs-$(CONFIG_CMD_LICENSE) += bin2header
hostprogs-$(CONFIG_LCD_LOGO) += bmp_logo hostprogs-$(CONFIG_LCD_LOGO) += bmp_logo
hostprogs-$(CONFIG_VIDEO_LOGO) += bmp_logo hostprogs-$(CONFIG_VIDEO_LOGO) += bmp_logo
HOSTCFLAGS_bmp_logo.o := -pedantic HOSTCFLAGS_bmp_logo.o := -pedantic
hostprogs-$(CONFIG_BUILD_ENVCRC) += envcrc hostprogs-$(CONFIG_BUILD_ENVCRC) += envcrc
envcrc-objs := envcrc.o lib/crc32.o common/env_embedded.o lib/sha1.o envcrc-objs := envcrc.o lib/crc32.o env/embedded.o lib/sha1.o
hostprogs-$(CONFIG_CMD_NET) += gen_eth_addr hostprogs-$(CONFIG_CMD_NET) += gen_eth_addr
HOSTCFLAGS_gen_eth_addr.o := -pedantic HOSTCFLAGS_gen_eth_addr.o := -pedantic
hostprogs-$(CONFIG_CMD_NET) += gen_ethaddr_crc
gen_ethaddr_crc-objs := gen_ethaddr_crc.o lib/crc8.o
HOSTCFLAGS_gen_ethaddr_crc.o := -pedantic
hostprogs-$(CONFIG_CMD_LOADS) += img2srec hostprogs-$(CONFIG_CMD_LOADS) += img2srec
HOSTCFLAGS_img2srec.o := -pedantic HOSTCFLAGS_img2srec.o := -pedantic
...@@ -54,11 +57,21 @@ mkenvimage-objs := mkenvimage.o os_support.o lib/crc32.o ...@@ -54,11 +57,21 @@ mkenvimage-objs := mkenvimage.o os_support.o lib/crc32.o
hostprogs-y += dumpimage mkimage hostprogs-y += dumpimage mkimage
hostprogs-$(CONFIG_FIT_SIGNATURE) += fit_info fit_check_sign hostprogs-$(CONFIG_FIT_SIGNATURE) += fit_info fit_check_sign
hostprogs-$(CONFIG_CMD_BOOTEFI_SELFTEST) += file2include
FIT_SIG_OBJS-$(CONFIG_FIT_SIGNATURE) := common/image-sig.o FIT_SIG_OBJS-$(CONFIG_FIT_SIGNATURE) := common/image-sig.o
# Flattened device tree objects
LIBFDT_OBJS := $(addprefix lib/libfdt/, \ # The following files are synced with upstream DTC.
fdt.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_wip.o \ # Use synced versions from scripts/dtc/libfdt/.
fdt_region.o fdt_sw.o) LIBFDT_SRCS_SYNCED := fdt.c fdt_wip.c fdt_sw.c fdt_rw.c \
fdt_strerror.c fdt_empty_tree.c fdt_addresses.c fdt_overlay.c
# The following files are locally modified for U-Boot (unfotunately).
# Use U-Boot own versions from lib/libfdt/.
LIBFDT_SRCS_UNSYNCED := fdt_ro.c fdt_region.c
LIBFDT_OBJS := $(addprefix libfdt/, $(patsubst %.c, %.o, $(LIBFDT_SRCS_SYNCED))) \
$(addprefix lib/libfdt/, $(patsubst %.c, %.o, $(LIBFDT_SRCS_UNSYNCED)))
RSA_OBJS-$(CONFIG_FIT_SIGNATURE) := $(addprefix lib/rsa/, \ RSA_OBJS-$(CONFIG_FIT_SIGNATURE) := $(addprefix lib/rsa/, \
rsa-sign.o rsa-verify.o rsa-checksum.o \ rsa-sign.o rsa-verify.o rsa-checksum.o \
rsa-mod-exp.o) rsa-mod-exp.o)
...@@ -76,8 +89,6 @@ dumpimage-mkimage-objs := aisimage.o \ ...@@ -76,8 +89,6 @@ dumpimage-mkimage-objs := aisimage.o \
lib/fdtdec.o \ lib/fdtdec.o \
fit_common.o \ fit_common.o \
fit_image.o \ fit_image.o \
gpimage.o \
gpimage-common.o \
common/image-fit.o \ common/image-fit.o \
image-host.o \ image-host.o \
common/image.o \ common/image.o \
...@@ -91,6 +102,7 @@ dumpimage-mkimage-objs := aisimage.o \ ...@@ -91,6 +102,7 @@ dumpimage-mkimage-objs := aisimage.o \
os_support.o \ os_support.o \
pblimage.o \ pblimage.o \
pbl_crc32.o \ pbl_crc32.o \
vybridimage.o \
$(ROCKCHIP_OBS) \ $(ROCKCHIP_OBS) \
socfpgaimage.o \ socfpgaimage.o \
lib/sha1.o \ lib/sha1.o \
...@@ -98,15 +110,17 @@ dumpimage-mkimage-objs := aisimage.o \ ...@@ -98,15 +110,17 @@ dumpimage-mkimage-objs := aisimage.o \
common/hash.o \ common/hash.o \
ublimage.o \ ublimage.o \
zynqimage.o \ zynqimage.o \
zynqmpimage.o \
$(LIBFDT_OBJS) \ $(LIBFDT_OBJS) \
gpimage.o \
gpimage-common.o \
$(RSA_OBJS-y) $(RSA_OBJS-y)
dumpimage-objs := $(dumpimage-mkimage-objs) dumpimage.o dumpimage-objs := $(dumpimage-mkimage-objs) dumpimage.o
mkimage-objs := $(dumpimage-mkimage-objs) mkimage.o mkimage-objs := $(dumpimage-mkimage-objs) mkimage.o
fit_info-objs := $(dumpimage-mkimage-objs) fit_info.o fit_info-objs := $(dumpimage-mkimage-objs) fit_info.o
fit_check_sign-objs := $(dumpimage-mkimage-objs) fit_check_sign.o fit_check_sign-objs := $(dumpimage-mkimage-objs) fit_check_sign.o
file2include-objs := file2include.o
# TODO(sjg@chromium.org): Is this correct on Mac OS?
ifneq ($(CONFIG_MX23)$(CONFIG_MX28),) ifneq ($(CONFIG_MX23)$(CONFIG_MX28),)
# Add CONFIG_MXS into host CFLAGS, so we can check whether or not register # Add CONFIG_MXS into host CFLAGS, so we can check whether or not register
...@@ -124,8 +138,12 @@ ifdef CONFIG_SYS_U_BOOT_OFFS ...@@ -124,8 +138,12 @@ ifdef CONFIG_SYS_U_BOOT_OFFS
HOSTCFLAGS_kwbimage.o += -DCONFIG_SYS_U_BOOT_OFFS=$(CONFIG_SYS_U_BOOT_OFFS) HOSTCFLAGS_kwbimage.o += -DCONFIG_SYS_U_BOOT_OFFS=$(CONFIG_SYS_U_BOOT_OFFS)
endif endif
ifneq ($(CONFIG_ARMADA_38X)$(CONFIG_ARMADA_39X),)
HOSTCFLAGS_kwbimage.o += -DCONFIG_KWB_SECURE
endif
# MXSImage needs LibSSL # MXSImage needs LibSSL
ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_FIT_SIGNATURE),) ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_ARMADA_38X)$(CONFIG_ARMADA_39X)$(CONFIG_FIT_SIGNATURE),)
HOSTLOADLIBES_mkimage += \ HOSTLOADLIBES_mkimage += \
$(shell pkg-config --libs libssl libcrypto 2> /dev/null || echo "-lssl -lcrypto") $(shell pkg-config --libs libssl libcrypto 2> /dev/null || echo "-lssl -lcrypto")
...@@ -138,6 +156,8 @@ HOSTCFLAGS_rsa-sign.o += -Wno-deprecated-declarations ...@@ -138,6 +156,8 @@ HOSTCFLAGS_rsa-sign.o += -Wno-deprecated-declarations
endif endif
endif endif
HOSTCFLAGS_fit_image.o += -DMKIMAGE_DTC=\"$(CONFIG_MKIMAGE_DTC_PATH)\"
HOSTLOADLIBES_dumpimage := $(HOSTLOADLIBES_mkimage) HOSTLOADLIBES_dumpimage := $(HOSTLOADLIBES_mkimage)
HOSTLOADLIBES_fit_info := $(HOSTLOADLIBES_mkimage) HOSTLOADLIBES_fit_info := $(HOSTLOADLIBES_mkimage)
HOSTLOADLIBES_fit_check_sign := $(HOSTLOADLIBES_mkimage) HOSTLOADLIBES_fit_check_sign := $(HOSTLOADLIBES_mkimage)
...@@ -153,7 +173,9 @@ hostprogs-$(CONFIG_MX23) += mxsboot ...@@ -153,7 +173,9 @@ hostprogs-$(CONFIG_MX23) += mxsboot
hostprogs-$(CONFIG_MX28) += mxsboot hostprogs-$(CONFIG_MX28) += mxsboot
HOSTCFLAGS_mxsboot.o := -pedantic HOSTCFLAGS_mxsboot.o := -pedantic
hostprogs-$(CONFIG_SUNXI) += mksunxiboot hostprogs-$(CONFIG_ARCH_SUNXI) += mksunxiboot
hostprogs-$(CONFIG_ARCH_SUNXI) += sunxi-spl-image-builder
sunxi-spl-image-builder-objs := sunxi-spl-image-builder.o lib/bch.o
hostprogs-$(CONFIG_NETCONSOLE) += ncb hostprogs-$(CONFIG_NETCONSOLE) += ncb
hostprogs-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1 hostprogs-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1
...@@ -166,14 +188,18 @@ hostprogs-$(CONFIG_KIRKWOOD) += kwboot ...@@ -166,14 +188,18 @@ hostprogs-$(CONFIG_KIRKWOOD) += kwboot
hostprogs-$(CONFIG_ARCH_MVEBU) += kwboot hostprogs-$(CONFIG_ARCH_MVEBU) += kwboot
hostprogs-y += proftool hostprogs-y += proftool
hostprogs-$(CONFIG_STATIC_RELA) += relocate-rela hostprogs-$(CONFIG_STATIC_RELA) += relocate-rela
hostprogs-$(CONFIG_RISCV) += prelink-riscv
hostprogs-y += fdtgrep hostprogs-y += fdtgrep
fdtgrep-objs += $(LIBFDT_OBJS) fdtgrep.o fdtgrep-objs += $(LIBFDT_OBJS) fdtgrep.o
hostprogs-$(CONFIG_MIPS) += mips-relocs
# We build some files with extra pedantic flags to try to minimize things # We build some files with extra pedantic flags to try to minimize things
# that won't build on some weird host compiler -- though there are lots of # that won't build on some weird host compiler -- though there are lots of
# exceptions for files that aren't complaint. # exceptions for files that aren't complaint.
HOSTCFLAGS_crc32.o := -pedantic HOSTCFLAGS_crc32.o := -pedantic
HOSTCFLAGS_crc8.o := -pedantic
HOSTCFLAGS_md5.o := -pedantic HOSTCFLAGS_md5.o := -pedantic
HOSTCFLAGS_sha1.o := -pedantic HOSTCFLAGS_sha1.o := -pedantic
HOSTCFLAGS_sha256.o := -pedantic HOSTCFLAGS_sha256.o := -pedantic
...@@ -181,7 +207,7 @@ HOSTCFLAGS_sha256.o := -pedantic ...@@ -181,7 +207,7 @@ HOSTCFLAGS_sha256.o := -pedantic
quiet_cmd_wrap = WRAP $@ quiet_cmd_wrap = WRAP $@
cmd_wrap = echo "\#include <../$(patsubst $(obj)/%,%,$@)>" >$@ cmd_wrap = echo "\#include <../$(patsubst $(obj)/%,%,$@)>" >$@
$(obj)/lib/%.c $(obj)/common/%.c: $(obj)/lib/%.c $(obj)/common/%.c $(obj)/env/%.c:
$(call cmd,wrap) $(call cmd,wrap)
clean-dirs := lib common clean-dirs := lib common
...@@ -211,10 +237,6 @@ endif ...@@ -211,10 +237,6 @@ 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 # Use native tools and options
# Define __KERNEL_STRICT_NAMES to prevent typedef overlaps # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
...@@ -228,7 +250,7 @@ HOST_EXTRACFLAGS += -include $(srctree)/include/compiler.h \ ...@@ -228,7 +250,7 @@ HOST_EXTRACFLAGS += -include $(srctree)/include/compiler.h \
-D__KERNEL_STRICT_NAMES \ -D__KERNEL_STRICT_NAMES \
-D_GNU_SOURCE -D_GNU_SOURCE
__build: $(LOGO-y) $(LICENSE-y) __build: $(LOGO-y)
$(LOGO_H): $(obj)/bmp_logo $(LOGO_BMP) $(LOGO_H): $(obj)/bmp_logo $(LOGO_BMP)
$(obj)/bmp_logo --gen-info $(LOGO_BMP) > $@ $(obj)/bmp_logo --gen-info $(LOGO_BMP) > $@
...@@ -236,15 +258,11 @@ $(LOGO_H): $(obj)/bmp_logo $(LOGO_BMP) ...@@ -236,15 +258,11 @@ $(LOGO_H): $(obj)/bmp_logo $(LOGO_BMP)
$(LOGO_DATA_H): $(obj)/bmp_logo $(LOGO_BMP) $(LOGO_DATA_H): $(obj)/bmp_logo $(LOGO_BMP)
$(obj)/bmp_logo --gen-data $(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 # Let clean descend into subdirs
subdir- += env subdir- += env
ifneq ($(CROSS_BUILD_TOOLS),) ifneq ($(CROSS_BUILD_TOOLS),)
HOSTCC = $(CC) override HOSTCC = $(CC)
quiet_cmd_crosstools_strip = STRIP $^ quiet_cmd_crosstools_strip = STRIP $^
cmd_crosstools_strip = $(STRIP) $^; touch $@ cmd_crosstools_strip = $(STRIP) $^; touch $@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment