diff options
| author | Philipp Deppenwiese <zaolin@das-labor.org> | 2018-08-30 23:07:02 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-09-04 12:36:43 +0000 |
| commit | 9569ebeab894d22b31d5681348bbe9e65d686683 (patch) | |
| tree | d3f09d2180f343c3293904ceca395c33de866f70 /payloads/external | |
| parent | 3b5351d0444f028ebdb5d06ee51197e516b0c31e (diff) | |
| download | coreboot-9569ebeab894d22b31d5681348bbe9e65d686683.tar.xz | |
payloads/LinuxBoot: Fix remaining issues
* Update kernel versions
* Fix initrd path handling
Change-Id: Ia0641fd0c0db1e47ee4829b73871af662d4a6370
Signed-off-by: Philipp Deppenwiese <zaolin@das-labor.org>
Reviewed-on: https://review.coreboot.org/28401
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: David Hendricks <david.hendricks@gmail.com>
Diffstat (limited to 'payloads/external')
| -rw-r--r-- | payloads/external/LinuxBoot/Kconfig | 8 | ||||
| -rw-r--r-- | payloads/external/LinuxBoot/Makefile | 10 | ||||
| -rw-r--r-- | payloads/external/LinuxBoot/targets/u-root.mk | 4 | ||||
| -rw-r--r-- | payloads/external/Makefile.inc | 3 |
4 files changed, 13 insertions, 12 deletions
diff --git a/payloads/external/LinuxBoot/Kconfig b/payloads/external/LinuxBoot/Kconfig index 7a40645535..8acb542215 100644 --- a/payloads/external/LinuxBoot/Kconfig +++ b/payloads/external/LinuxBoot/Kconfig @@ -50,12 +50,12 @@ choice default LINUXBOOT_KERNEL_STABLE config LINUXBOOT_KERNEL_STABLE - bool "4.15.3" + bool "4.14.67" help Stable kernel version config LINUXBOOT_KERNEL_LATEST - bool "4.17.11" + bool "4.18.5" help Latest kernel version @@ -63,8 +63,8 @@ endchoice config LINUXBOOT_KERNEL_VERSION string - default "4.17.11" if LINUXBOOT_KERNEL_LATEST - default "4.15.3" if LINUXBOOT_KERNEL_STABLE + default "4.18.5" if LINUXBOOT_KERNEL_LATEST + default "4.14.67" if LINUXBOOT_KERNEL_STABLE config LINUXBOOT_KERNEL_CONFIGFILE string "Kernel config file" diff --git a/payloads/external/LinuxBoot/Makefile b/payloads/external/LinuxBoot/Makefile index f259373257..c0513897aa 100644 --- a/payloads/external/LinuxBoot/Makefile +++ b/payloads/external/LinuxBoot/Makefile @@ -77,26 +77,26 @@ else ifeq ($(CONFIG_LINUXBOOT_ARCH),arm64) $(project_dir)/vmlinux.bin: $(kernel_dir)/vmlinux $(OBJCOPY) -O binary $< $@ -$(project_dir)/target.dtb: $(CONFIG_LINUXBOOT_DTB_FILE) +$(project_dir)/target.dtb: $(PWD)/$(CONFIG_LINUXBOOT_DTB_FILE) cp $< $@ $(project_dir)/vmlinux.bin.lzma: $(project_dir)/vmlinux.bin xz -c -k -f --format=lzma --lzma1=dict=1MiB,lc=3,lp=0,pb=3 $< > $@ -$(project_dir)/kernel-image: $(project_dir)/vmlinux.bin.lzma $(project_dir)/../arm64/kernel_fdt_lzma.its $(project_dir)/target.dtb $(project_dir)/initramfs.cpio.xz +$(project_dir)/kernel-image: $(project_dir)/vmlinux.bin.lzma $(project_dir)/../arm64/kernel_fdt_lzma.its $(project_dir)/target.dtb $(PWD)/$(CONFIG_PAYLOAD_USERSPACE) cp $(project_dir)/../arm64/kernel_fdt_lzma.its $(project_dir) mkimage -f $(project_dir)/kernel_fdt_lzma.its $@ endif ifeq ($(CONFIG_LINUXBOOT_UROOT),y) -$(project_dir)/initramfs.cpio.xz: +$(PWD)/$(CONFIG_PAYLOAD_USERSPACE): $(MAKE) -f targets/u-root.mk else -$(project_dir)/initramfs.cpio.xz: +$(PWD)/$(CONFIG_PAYLOAD_USERSPACE): echo "Building without u-root support" endif -payload: $(project_dir)/kernel-image $(project_dir)/initramfs.cpio.xz +payload: $(project_dir)/kernel-image $(PWD)/$(CONFIG_PAYLOAD_USERSPACE) clean: if [ -d "$(kernel_dir)" ]; then rm -rf $(kernel_dir); fi diff --git a/payloads/external/LinuxBoot/targets/u-root.mk b/payloads/external/LinuxBoot/targets/u-root.mk index f3c70a6c0c..001f7c4522 100644 --- a/payloads/external/LinuxBoot/targets/u-root.mk +++ b/payloads/external/LinuxBoot/targets/u-root.mk @@ -71,10 +71,10 @@ endif else ifneq ($(CONFIG_LINUXBOOT_UROOT_FILES),) cd $(uroot_dir); GOARCH=$(CONFIG_LINUXBOOT_ARCH) GOPATH=$(go_path_dir) ./u-root \ - -build=bb -files $(CONFIG_LINUXBOOT_UROOT_FILES) -o $(project_dir)/initramfs.cpio + -build=bb -files $(CONFIG_LINUXBOOT_UROOT_FILES) -o $(project_dir)/initramfs.cpio coreboot-app else cd $(uroot_dir); GOARCH=$(CONFIG_LINUXBOOT_ARCH) GOPATH=$(go_path_dir) ./u-root \ - -build=bb -o $(project_dir)/initramfs.cpio + -build=bb -o $(project_dir)/initramfs.cpio coreboot-app endif endif xz -f --check=crc32 -9 --lzma2=dict=1MiB --threads=$(CPUS) $(project_dir)/initramfs.cpio diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index f350622738..8bd0dc3da3 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -274,7 +274,8 @@ linuxboot: CONFIG_LINUXBOOT_ARCH=$(CONFIG_LINUXBOOT_ARCH) \ CONFIG_LINUXBOOT_UROOT=$(CONFIG_LINUXBOOT_UROOT) \ CONFIG_LINUXBOOT_UROOT_FILES=$(CONFIG_LINUXBOOT_UROOT_FILES) \ - CONFIG_LINUXBOOT_DTB_FILE=$(CONFIG_LINUXBOOT_DTB_FILE) + CONFIG_LINUXBOOT_DTB_FILE=$(CONFIG_LINUXBOOT_DTB_FILE) \ + CONFIG_PAYLOAD_USERSPACE=$(CONFIG_PAYLOAD_USERSPACE) payloads/external/LinuxBoot/linuxboot/kernel-image: linuxboot |