diff options
| author | Andreas Gnau | 2025-05-30 15:47:57 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2025-06-07 19:10:28 +0000 |
| commit | 49843b31bc601d52c993530ad5ec185d06e623bf (patch) | |
| tree | 3ffc10f2aeb2135c8a087a0abbebc843fc25138a | |
| parent | b6a07dd0914e17d923f08c38fbfd4fa63fb2883b (diff) | |
| download | openwrt-49843b31bc601d52c993530ad5ec185d06e623bf.tar.gz | |
uboot-mk: Enable specifying defconfig fragments
U-Boot allows specifying additional KConfig fragments to be applied on
top of a defconfig. These are usually located in the board
sub-directory.
make foo_defconfig bar.config baz.config
Add support for specifying additional KConfig fragments using the
UBOOT_CONFIG variable. Treat the first word in UBOOT_CONFIG as the name
of the defconfig, any additional words as additional fragments.
This can be useful to distinguish between different variants of U-Boot
builds such as different RAM, storage (NAND/eMMC), security etc.
While c05c0699d479 (u-boot.mk: add support for config customization,
2023-06-02) already added means to modify specific KConfig options
directly from the OpenWrt Makefile, leveraging existing fragments the
U-Boot source-dir provides a more convenient way to extend the config
when customising more than just one or two options. Furthermore it is
desirable to leverage existing fragments from upstream U-Boot where they
exist.
Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>
Link: https://github.com/openwrt/openwrt/pull/18963
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | include/u-boot.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/u-boot.mk b/include/u-boot.mk index 529d69f4ba..45f4d454f7 100644 --- a/include/u-boot.mk +++ b/include/u-boot.mk @@ -111,7 +111,11 @@ define Build/U-Boot/Target endef define Build/Configure/U-Boot - +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) CROSS_COMPILE=$(TARGET_CROSS) $(UBOOT_CONFIGURE_VARS) $(UBOOT_CONFIG)_config + +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ + CROSS_COMPILE=$(TARGET_CROSS) \ + $(UBOOT_CONFIGURE_VARS) \ + $(firstword $(UBOOT_CONFIG))_config \ + $(wordlist 2,$(words $(UBOOT_CONFIG)),$(UBOOT_CONFIG:%=%.config)) $(if $(strip $(UBOOT_CUSTOMIZE_CONFIG)), $(PKG_BUILD_DIR)/scripts/config --file $(PKG_BUILD_DIR)/.config $(UBOOT_CUSTOMIZE_CONFIG) +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) CROSS_COMPILE=$(TARGET_CROSS) $(UBOOT_CONFIGURE_VARS) oldconfig) |