mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-19 16:40:46 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/uboot-tools: migrate BR2_TARGET_UBOOT_ENVIMAGE from U-Boot pkg

Browse Source 
Migrating the support for this feature to uboot-tools to gain the
ability to build env files when BR2_TARGET_UBOOT isn't selected.

When _ENVIMAGE_SOURCE is not set, we generate a default environment.
However, this default depends on the U-Boot configuration. Therefore,
this can only be done if uboot itself is built as well, and
host-uboot-tools needs to depend on uboot.

For the same reason, the commands for creating the environment have to
be adapted a little. Take this occasion to drastically simplify them.

Note: This patch creates a circular dependency with uboot until the
similar migration patch is merged for uboot scripts

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:
Matt Weber
2020-09-24 14:29:10 -05:00
committed by Arnout Vandecappelle (Essensium/Mind)
parent 245c643fc7
commit 78559d699a
5 changed files with 127 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Config.in.legacy
View File

@@ -146,6 +146,40 @@ endif
comment "Legacy options removed in 2020.11"
config BR2_TARGET_UBOOT_ENVIMAGE
bool "u-boot env generation was moved"
select BR2_LEGACY
select BR2_PACKAGE_HOST_UBOOT_TOOLS
select BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE
help
Migrated U-Boot env generation to uboot-tools
# Note: BR2_TARGET_UBOOT_ENVIMAGE_SOURCE is still referenced from
# package/uboot-tools/Config.in
config BR2_TARGET_UBOOT_ENVIMAGE_SOURCE
string "The uboot env image source string has been renamed"
depends on BR2_TARGET_UBOOT_ENVIMAGE
help
Migrated U-Boot env generation to uboot-tools.
New option is named
BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE
# Note: BR2_TARGET_UBOOT_ENVIMAGE_SIZE is still referenced from
# package/uboot-tools/Config.in
config BR2_TARGET_UBOOT_ENVIMAGE_SIZE
string "The uboot env image size string has been renamed"
depends on BR2_TARGET_UBOOT_ENVIMAGE
help
Migrated U-Boot env generation to uboot-tools.
New option is named BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE
config BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT
bool "u-boot env generation was moved"
depends on BR2_TARGET_UBOOT_ENVIMAGE
select BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_REDUNDANT
help
Migrated U-Boot env generation to uboot-tools
config BR2_GCC_VERSION_7_X
bool "gcc 7.x support removed"
select BR2_LEGACY