diff options
| author | Bill XIE <persmule@hardenedlinux.org> | 2021-12-11 17:37:57 +0800 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2021-12-14 16:13:06 +0000 |
| commit | d85cee8310698d88a7e1072563be242045138917 (patch) | |
| tree | c6b105bb4fb83783ba51b4402d97dd645ea17897 /payloads | |
| parent | 2efb6142ca22a1b1372147c768e8f34dc5b4a299 (diff) | |
payloads/U-Boot: Fix various build errors
1. Fix the inconsistence of the target path of U-Boot payload
between Kconfig and Makefile.inc.
2. Perform full clone (to the destined commit) in order to get
tags.
3. Move stable commit id of U-Boot payload from Makefile to
Kconfig, and make prompt consistent with it.
Change-Id: Ic0f11c16274456a452a0422e19fab0c61d8b5d5b
Signed-off-by: Bill XIE <persmule@hardenedlinux.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/60028
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'payloads')
| -rw-r--r-- | payloads/external/Makefile.inc | 3 | ||||
| -rw-r--r-- | payloads/external/U-Boot/Kconfig | 6 | ||||
| -rw-r--r-- | payloads/external/U-Boot/Makefile | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index a185a77727..072d8d120e 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -197,8 +197,9 @@ payloads/external/GRUB2/grub2/build/default_payload.elf: grub2 # U-Boot -payloads/external/U-Boot/build/u-boot/u-boot.bin u-boot: $(DOTCONFIG) +payloads/external/U-Boot/build/u-boot.bin u-boot: $(DOTCONFIG) $(MAKE) -C payloads/external/U-Boot \ + STABLE_COMMIT_ID=$(CONFIG_UBOOT_STABLE_COMMIT_ID) \ CONFIG_UBOOT_MASTER=$(CONFIG_UBOOT_MASTER) \ CONFIG_UBOOT_STABLE=$(CONFIG_UBOOT_STABLE) diff --git a/payloads/external/U-Boot/Kconfig b/payloads/external/U-Boot/Kconfig index 01dbc950d6..06b4b73849 100644 --- a/payloads/external/U-Boot/Kconfig +++ b/payloads/external/U-Boot/Kconfig @@ -5,12 +5,16 @@ config PAYLOAD_SPECIFIC_OPTIONS select PAYLOAD_IS_FLAT_BINARY select WANT_LINEAR_FRAMEBUFFER +config UBOOT_STABLE_COMMIT_ID + string + default "v2021.07" + choice prompt "U-Boot version" default UBOOT_STABLE config UBOOT_STABLE - bool "v2019.4" + bool "v2021.07" help Stable U-Boot version diff --git a/payloads/external/U-Boot/Makefile b/payloads/external/U-Boot/Makefile index daadb3e934..07b6f48609 100644 --- a/payloads/external/U-Boot/Makefile +++ b/payloads/external/U-Boot/Makefile @@ -1,7 +1,5 @@ ## SPDX-License-Identifier: GPL-2.0-only -STABLE_COMMIT_ID=v2021.07 - TAG-$(CONFIG_UBOOT_MASTER)=origin/master TAG-$(CONFIG_UBOOT_STABLE)=$(STABLE_COMMIT_ID) @@ -25,7 +23,7 @@ all: build $(project_dir): echo " Cloning $(project_name) from Git" - git clone --depth 1 $(project_git_repo) $(project_dir) + git clone $(project_git_repo) -b $(TAG-y) $(project_dir) fetch: $(project_dir) ifeq ($(CONFIG_UBOOT_MASTER),y) |