GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Bill XIE 2021-12-11 17:37:57 +08:00 committed by Felix Held
parent 2efb6142ca
commit d85cee8310
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
payloads/external/Makefile.inc vendored
View File

@ -197,8 +197,9 @@ payloads/external/GRUB2/grub2/build/default_payload.elf: grub2
# U-Boot # 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 \ $(MAKE) -C payloads/external/U-Boot \
STABLE_COMMIT_ID=$(CONFIG_UBOOT_STABLE_COMMIT_ID) \
CONFIG_UBOOT_MASTER=$(CONFIG_UBOOT_MASTER) \ CONFIG_UBOOT_MASTER=$(CONFIG_UBOOT_MASTER) \
CONFIG_UBOOT_STABLE=$(CONFIG_UBOOT_STABLE) CONFIG_UBOOT_STABLE=$(CONFIG_UBOOT_STABLE)

6
payloads/external/U-Boot/Kconfig vendored
View File

@ -5,12 +5,16 @@ config PAYLOAD_SPECIFIC_OPTIONS
select PAYLOAD_IS_FLAT_BINARY select PAYLOAD_IS_FLAT_BINARY
select WANT_LINEAR_FRAMEBUFFER select WANT_LINEAR_FRAMEBUFFER
config UBOOT_STABLE_COMMIT_ID
string
default "v2021.07"
choice choice
prompt "U-Boot version" prompt "U-Boot version"
default UBOOT_STABLE default UBOOT_STABLE
config UBOOT_STABLE config UBOOT_STABLE
bool "v2019.4" bool "v2021.07"
help help
Stable U-Boot version Stable U-Boot version

4
payloads/external/U-Boot/Makefile vendored
View File

@ -1,7 +1,5 @@
## SPDX-License-Identifier: GPL-2.0-only ## SPDX-License-Identifier: GPL-2.0-only
STABLE_COMMIT_ID=v2021.07
TAG-$(CONFIG_UBOOT_MASTER)=origin/master TAG-$(CONFIG_UBOOT_MASTER)=origin/master
TAG-$(CONFIG_UBOOT_STABLE)=$(STABLE_COMMIT_ID) TAG-$(CONFIG_UBOOT_STABLE)=$(STABLE_COMMIT_ID)
@ -25,7 +23,7 @@ all: build
$(project_dir): $(project_dir):
echo " Cloning $(project_name) from Git" 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) fetch: $(project_dir)
ifeq ($(CONFIG_UBOOT_MASTER),y) ifeq ($(CONFIG_UBOOT_MASTER),y)