diff options
Diffstat (limited to 'rules/u-boot.make')
| -rw-r--r-- | rules/u-boot.make | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/rules/u-boot.make b/rules/u-boot.make index 4bc7f3f78..2a8059170 100644 --- a/rules/u-boot.make +++ b/rules/u-boot.make @@ -36,6 +36,9 @@ endif # Prepare # ---------------------------------------------------------------------------- +U_BOOT_INJECT_PATH := ${PTXDIST_SYSROOT_TARGET}/usr/lib/firmware +U_BOOT_INJECT_OOT := $(call ptx/ifdef, PTXCONF_U_BOOT_BUILD_OOT,YES,NO) + ifdef PTXCONF_U_BOOT_BOOT_SCRIPT U_BOOT_BOOT_SCRIPT_TXT := $(call ptx/in-platformconfigdir, uboot.scr) U_BOOT_BOOT_SCRIPT_BIN := $(call remove_quotes, \ @@ -63,7 +66,9 @@ U_BOOT_CONF_OPT := \ U_BOOT_MAKE_ENV := \ CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \ - HOSTCC=$(HOSTCC) + HOSTCC=$(HOSTCC) \ + $(call remove_quotes,$(PTXCONF_U_BOOT_CUSTOM_MAKE_ENV)) + U_BOOT_MAKE_OPT := $(U_BOOT_CONF_OPT) U_BOOT_TAGS_OPT := ctags cscope etags @@ -91,14 +96,23 @@ $(U_BOOT_CONFIG): @exit 1 endif - -ifdef PTXCONF_U_BOOT_CONFIGSYSTEM_LEGACY $(STATEDIR)/u-boot.prepare: @$(call targetinfo) + +ifdef PTXCONF_U_BOOT_CONFIGSYSTEM_KCONFIG + @$(call world/prepare, U_BOOT) +endif + +ifdef PTXCONF_U_BOOT_CONFIGSYSTEM_LEGACY $(U_BOOT_CONF_ENV) $(MAKE) $(U_BOOT_CONF_OPT) - @$(call touch) endif +ifdef PTXCONF_U_BOOT_FIRMWARE + @$(call world/inject, U_BOOT) +endif + + @$(call touch) + # ---------------------------------------------------------------------------- # Compile # ---------------------------------------------------------------------------- |