diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-03-05 08:53:56 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-03-05 08:53:56 +0100 |
| commit | cce3ed31230cf60ddbc653b3ace1fb64e05bbddb (patch) | |
| tree | 5e0ea9edfdcdf9982303d8a83d40aee41ccfe3c7 /scripts | |
| parent | dc90f050c2512ffe80c2c466295056baec0f021f (diff) | |
| parent | 8d8382ec72d8a4a9ab0d53b07fd19b5248b0e8ce (diff) | |
| download | barebox-cce3ed31230cf60ddbc653b3ace1fb64e05bbddb.tar.gz barebox-cce3ed31230cf60ddbc653b3ace1fb64e05bbddb.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.lib | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index d202a7299c..272b5981e9 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -157,6 +157,12 @@ dtc_cpp_flags = -Wp,-MD,$(depfile).pre -nostdinc \ -I$(srctree)/dts/src/ \ -undef -D__DTS__ +ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY +ifneq ($(CONFIG_BOOTM_FITIMAGE_PUBKEY),"") +dtc_cpp_flags += -DCONFIG_BOOTM_FITIMAGE_PUBKEY=\"$(CONFIG_BOOTM_FITIMAGE_PUBKEY)\" +endif +endif + # Finds the multi-part object the current object will be linked into modname-multi = $(sort $(foreach m,$(multi-used),\ $(if $(filter $(subst $(obj)/,,$*.o), $($(m:.o=-objs)) $($(m:.o=-y))),$(m:.o=)))) @@ -420,7 +426,13 @@ cmd_imximage_S_dcd= \ imxcfg_cpp_flags = -Wp,-MD,$(depfile) -nostdinc -x assembler-with-cpp \ -I $(srctree)/include -I $(srctree)/arch/arm/mach-imx/include \ - -include include/generated/autoconf.h + -include include/generated/autoconf.h \ + -DCONFIG_HABV3_SRK_PEM=\"$(CONFIG_HABV3_SRK_PEM)\" \ + -DCONFIG_HABV3_CSF_CRT_DER=\"$(CONFIG_HABV3_CSF_CRT_DER)\" \ + -DCONFIG_HABV3_IMG_CRT_DER=\"$(CONFIG_HABV3_IMG_CRT_DER)\" \ + -DCONFIG_HABV4_TABLE_BIN=\"$(CONFIG_HABV4_TABLE_BIN)\" \ + -DCONFIG_HABV4_CSF_CRT_PEM=\"$(CONFIG_HABV4_CSF_CRT_PEM)\" \ + -DCONFIG_HABV4_IMG_CRT_PEM=\"$(CONFIG_HABV4_IMG_CRT_PEM)\" dcd-tmp = $(subst $(comma),_,$(dot-target).dcd.tmp) |