package/uboot-tools: migrate BR2_TARGET_UBOOT_BOOT_SCRIPT from U-Boot pkg
For consistancy and dependencies between uboot and uboot-tools, this patch migrates the script creation over in a similar way as the env image creation. Cc: Arnout Vandecappelle <arnout@mind.be> Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
parent
78559d699a
commit
db2b684126
@ -146,6 +146,24 @@ endif
|
|||||||
|
|
||||||
comment "Legacy options removed in 2020.11"
|
comment "Legacy options removed in 2020.11"
|
||||||
|
|
||||||
|
config BR2_TARGET_UBOOT_BOOT_SCRIPT
|
||||||
|
bool "u-boot script generation was moved"
|
||||||
|
select BR2_LEGACY
|
||||||
|
select BR2_PACKAGE_HOST_UBOOT_TOOLS
|
||||||
|
select BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT
|
||||||
|
help
|
||||||
|
Migrated U-Boot script generation to uboot-tools
|
||||||
|
|
||||||
|
# Note: BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE is still referenced from
|
||||||
|
# package/uboot-tools/Config.in
|
||||||
|
config BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE
|
||||||
|
string "The uboot script source string has been renamed"
|
||||||
|
depends on BR2_TARGET_UBOOT_BOOT_SCRIPT
|
||||||
|
help
|
||||||
|
Migrated U-Boot script generation to uboot-tools.
|
||||||
|
New option is named
|
||||||
|
BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE
|
||||||
|
|
||||||
config BR2_TARGET_UBOOT_ENVIMAGE
|
config BR2_TARGET_UBOOT_ENVIMAGE
|
||||||
bool "u-boot env generation was moved"
|
bool "u-boot env generation was moved"
|
||||||
select BR2_LEGACY
|
select BR2_LEGACY
|
||||||
|
@ -533,22 +533,6 @@ config BR2_TARGET_UBOOT_ALTERA_SOCFPGA_IMAGE_CRC
|
|||||||
In either case the resulting file will be given a .crc
|
In either case the resulting file will be given a .crc
|
||||||
extension.
|
extension.
|
||||||
|
|
||||||
config BR2_TARGET_UBOOT_BOOT_SCRIPT
|
|
||||||
bool "Generate a U-Boot boot script"
|
|
||||||
help
|
|
||||||
Generate a U-Boot boot script, given a file listing U-Boot
|
|
||||||
commands to be executed at boot time. The generated boot
|
|
||||||
script will be called 'boot.scr'.
|
|
||||||
|
|
||||||
if BR2_TARGET_UBOOT_BOOT_SCRIPT
|
|
||||||
|
|
||||||
config BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE
|
|
||||||
string "U-Boot boot script source"
|
|
||||||
help
|
|
||||||
Source file to generate the U-Boot boot script.
|
|
||||||
|
|
||||||
endif
|
|
||||||
|
|
||||||
if BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG
|
if BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG
|
||||||
|
|
||||||
config BR2_TARGET_UBOOT_CUSTOM_DTS_PATH
|
config BR2_TARGET_UBOOT_CUSTOM_DTS_PATH
|
||||||
|
@ -323,10 +323,6 @@ define UBOOT_INSTALL_IMAGES_CMDS
|
|||||||
cp -dpf $(@D)/$(f) $(BINARIES_DIR)/
|
cp -dpf $(@D)/$(f) $(BINARIES_DIR)/
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
$(if $(BR2_TARGET_UBOOT_BOOT_SCRIPT),
|
|
||||||
$(MKIMAGE) -C none -A $(MKIMAGE_ARCH) -T script \
|
|
||||||
-d $(call qstrip,$(BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE)) \
|
|
||||||
$(BINARIES_DIR)/boot.scr)
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
ifeq ($(BR2_TARGET_UBOOT_ZYNQMP),y)
|
ifeq ($(BR2_TARGET_UBOOT_ZYNQMP),y)
|
||||||
@ -427,15 +423,6 @@ define UBOOT_KCONFIG_FIXUP_CMDS
|
|||||||
$(UBOOT_ZYNQMP_KCONFIG_PSU_INIT)
|
$(UBOOT_ZYNQMP_KCONFIG_PSU_INIT)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
ifeq ($(BR2_TARGET_UBOOT_BOOT_SCRIPT),y)
|
|
||||||
ifeq ($(BR_BUILDING),y)
|
|
||||||
ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE)),)
|
|
||||||
$(error Please define a source file for U-Boot boot script (BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE setting))
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
UBOOT_DEPENDENCIES += host-uboot-tools
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(BR2_TARGET_UBOOT)$(BR_BUILDING),yy)
|
ifeq ($(BR2_TARGET_UBOOT)$(BR_BUILDING),yy)
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -91,4 +91,21 @@ config BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_REDUNDANT
|
|||||||
|
|
||||||
endif # BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE
|
endif # BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE
|
||||||
|
|
||||||
|
config BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT
|
||||||
|
bool "Generate a U-Boot boot script"
|
||||||
|
help
|
||||||
|
Generate a U-Boot boot script, given a file listing U-Boot
|
||||||
|
commands to be executed at boot time. The generated boot
|
||||||
|
script will be called 'boot.scr'.
|
||||||
|
|
||||||
|
if BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT
|
||||||
|
|
||||||
|
config BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE
|
||||||
|
string "U-Boot boot script source"
|
||||||
|
default BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE if BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE != "" # legacy
|
||||||
|
help
|
||||||
|
Source file to generate the U-Boot boot script.
|
||||||
|
|
||||||
|
endif # BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT
|
||||||
|
|
||||||
endif # BR2_PACKAGE_HOST_UBOOT_TOOLS
|
endif # BR2_PACKAGE_HOST_UBOOT_TOOLS
|
||||||
|
@ -148,11 +148,23 @@ endif #BR_BUILDING
|
|||||||
|
|
||||||
endif #BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE
|
endif #BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE
|
||||||
|
|
||||||
|
ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT),y)
|
||||||
|
ifeq ($(BR_BUILDING),y)
|
||||||
|
ifeq ($(call qstrip,$(BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE)),)
|
||||||
|
$(error Please define a source file for U-Boot boot script (BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE setting))
|
||||||
|
endif
|
||||||
|
endif #BR_BUILDING
|
||||||
|
endif #BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT
|
||||||
|
|
||||||
define HOST_UBOOT_TOOLS_INSTALL_CMDS
|
define HOST_UBOOT_TOOLS_INSTALL_CMDS
|
||||||
$(INSTALL) -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/bin/mkimage
|
$(INSTALL) -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/bin/mkimage
|
||||||
$(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(HOST_DIR)/bin/mkenvimage
|
$(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(HOST_DIR)/bin/mkenvimage
|
||||||
$(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(HOST_DIR)/bin/dumpimage
|
$(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(HOST_DIR)/bin/dumpimage
|
||||||
$(HOST_UBOOT_TOOLS_GENERATE_ENV_IMAGE)
|
$(HOST_UBOOT_TOOLS_GENERATE_ENV_IMAGE)
|
||||||
|
$(if $(BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT),
|
||||||
|
$(MKIMAGE) -C none -A $(MKIMAGE_ARCH) -T script \
|
||||||
|
-d $(call qstrip,$(BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE)) \
|
||||||
|
$(BINARIES_DIR)/boot.scr)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(eval $(generic-package))
|
$(eval $(generic-package))
|
||||||
|
Loading…
Reference in New Issue
Block a user