sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 4.16

Browse Source 
Change-Id: I11db70a8e25a6656c5ec640a703e7b06d5a3672e
This commit is contained in:
Jeremy Soller
2022-03-04 07:19:45 -07:00
parent af64e5d166
commit d97e25ac13
3138 changed files with 317025 additions and 23253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,13 +3,18 @@ if PAYLOAD_UBOOT
config PAYLOAD_SPECIFIC_OPTIONS
def_bool y
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
@@ -32,9 +37,9 @@ config PAYLOAD_CONFIGFILE
from the U-Boot config directory
config PAYLOAD_FILE
default "payloads/external/U-Boot/u-boot/u-boot-dtb.bin"
default "payloads/external/U-Boot/build/u-boot.bin"
config PAYLOAD_OPTIONS
default "-l 0x1110000 -e 0x1110015"
default "-l 0x1110000 -e 0x1110000"
endif

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

@@ -1,15 +1,15 @@
## SPDX-License-Identifier: GPL-2.0-only
# 2019-4 tag
STABLE_COMMIT_ID=3c99166441bf3ea325af2da83cfe65430b49c066
TAG-$(CONFIG_UBOOT_MASTER)=origin/master
TAG-$(CONFIG_UBOOT_STABLE)=$(STABLE_COMMIT_ID)
project_name=U-Boot
project_dir=u-boot
project_git_repo=http://git.denx.de/u-boot.git
project_config_file=$(project_dir)/.config
project_build_dir=build
project_config_file=$(project_build_dir)/.config
make_args=-C $(project_dir) O=../build
unexport KCONFIG_AUTOHEADER
unexport KCONFIG_AUTOCONFIG
@@ -23,7 +23,7 @@ all: build
$(project_dir):
echo " Cloning $(project_name) from Git"
git clone $(project_git_repo) $(project_dir)
git clone $(project_git_repo) -b $(TAG-y) $(project_dir)
fetch: $(project_dir)
ifeq ($(CONFIG_UBOOT_MASTER),y)
@@ -31,11 +31,11 @@ ifeq ($(CONFIG_UBOOT_MASTER),y)
git fetch
#master doesn't get a file, so it's continuously updated
rm -f $(project_dir)/$(STABLE_COMMIT_ID)
rm -f $(STABLE_COMMIT_ID)
else
cd $(project_dir); git show $(TAG-y) >/dev/null 2>&1 ; if [ $$? -ne 0 ]; \
then echo " Fetching new commits from the $(project_name) git repo"; git fetch; fi
touch $(project_dir)/$(STABLE_COMMIT_ID)
touch $(STABLE_COMMIT_ID)
endif
checkout: fetch
@@ -43,26 +43,26 @@ checkout: fetch
cd $(project_dir); git checkout master; git branch -D coreboot 2>/dev/null; git checkout -b coreboot $(TAG-y)
config: checkout
mkdir -p $(project_build_dir)
rm -f $(project_config_file)
ifneq ($(CONFIG_PAYLOAD_CONFIGFILE),)
ifneq ("$(wildcard $(CONFIG_PAYLOAD_CONFIGFILE))","")
cat $(CONFIG_PAYLOAD_CONFIGFILE)" > tag-$(project_config_file)
$(MAKE) $(make_args) olddefconfig
else
echo "Error: File $(CONFIG_PAYLOAD_CONFIGFILE) does not exist"
false
endif
else
cat $(project_dir)/configs/coreboot_defconfig >> $(project_config_file)
$(MAKE) $(make_args) coreboot_defconfig
endif
$(MAKE) -C $(project_dir) olddefconfig
build: config
echo " MAKE $(project_name) $(TAG-y)"
$(MAKE) -C $(project_dir)
$(MAKE) $(make_args)
clean:
test -d $(project_dir) && $(MAKE) -C $(project_dir) clean || exit 0
test -d $(project_dir) && $(MAKE) $(make_args) clean || exit 0
distclean:
rm -rf $(project_dir)