coreboot-gerrit November 2018

coreboot-gerrit@coreboot.org

1 participants
1699 discussions

Change in coreboot[master]: LinuxBoot: refactor payload
by Marcello Sylvester Bauer (Code Review) 11 Nov '18

11 Nov '18

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/29581 to look at the new patch set (#3). Change subject: LinuxBoot: refactor payload ...................................................................... LinuxBoot: refactor payload Clean and refactor the structure of the LinuxBoot payload integration. Change-Id: I41d0275a5f7efb920e881f43b0acda29f41ee221 Signed-off-by: Marcello Sylvester Bauer <info(a)marcellobauer.com> --- M payloads/external/LinuxBoot/Kconfig M payloads/external/LinuxBoot/Makefile A payloads/external/LinuxBoot/targets/linux.mk M payloads/external/LinuxBoot/targets/u-root.mk M payloads/external/Makefile.inc 5 files changed, 194 insertions(+), 97 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/29581/3 -- To view, visit https://review.coreboot.org/29581 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I41d0275a5f7efb920e881f43b0acda29f41ee221 Gerrit-Change-Number: 29581 Gerrit-PatchSet: 3 Gerrit-Owner: Marcello Sylvester Bauer <info(a)marcellobauer.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in coreboot[master]: mb/emulation/qemu-i440fx|q35: Get rid of unused headers
by Patrick Rudolph (Code Review) 11 Nov '18

11 Nov '18

Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/29577 ) Change subject: mb/emulation/qemu-i440fx|q35: Get rid of unused headers ...................................................................... Patch Set 1: (1 comment) https://review.coreboot.org/#/c/29577/1/src/mainboard/emulation/qemu-i440fx… File src/mainboard/emulation/qemu-i440fx/mainboard.c: https://review.coreboot.org/#/c/29577/1/src/mainboard/emulation/qemu-i440fx… PS1, Line 21: > ah, true that I'd like to have a single header for those functions, but it requires touching 50% of coreboot's x86 code... -- To view, visit https://review.coreboot.org/29577 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3cf0e4ef5b090d15ad823747fcf9219644e130fc Gerrit-Change-Number: 29577 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sun, 11 Nov 2018 18:30:12 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: No

1 0

Change in coreboot[master]: LinuxBoot: refactor payload
by Marcello Sylvester Bauer (Code Review) 11 Nov '18

11 Nov '18

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/29581 to look at the new patch set (#2). Change subject: LinuxBoot: refactor payload ...................................................................... LinuxBoot: refactor payload Clean and refactor the structure of the LinuxBoot payload integration. Change-Id: I41d0275a5f7efb920e881f43b0acda29f41ee221 Signed-off-by: Marcello Sylvester Bauer <info(a)marcellobauer.com> --- M payloads/external/LinuxBoot/Kconfig M payloads/external/LinuxBoot/Makefile A payloads/external/LinuxBoot/targets/linux.mk M payloads/external/LinuxBoot/targets/u-root.mk M payloads/external/Makefile.inc 5 files changed, 194 insertions(+), 97 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/29581/2 -- To view, visit https://review.coreboot.org/29581 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I41d0275a5f7efb920e881f43b0acda29f41ee221 Gerrit-Change-Number: 29581 Gerrit-PatchSet: 2 Gerrit-Owner: Marcello Sylvester Bauer <info(a)marcellobauer.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in coreboot[master]: LinuxBoot: refactor payload
by Marcello Sylvester Bauer (Code Review) 11 Nov '18

11 Nov '18

Marcello Sylvester Bauer has uploaded this change for review. ( https://review.coreboot.org/29581 Change subject: LinuxBoot: refactor payload ...................................................................... LinuxBoot: refactor payload Clean and refactor the structure of the LinuxBoot payload integration. Change-Id: I41d0275a5f7efb920e881f43b0acda29f41ee221 Signed-off-by: Marcello Sylvester Bauer <info(a)marcellobauer.com> --- M payloads/external/LinuxBoot/Kconfig M payloads/external/LinuxBoot/Makefile A payloads/external/LinuxBoot/targets/linux.mk M payloads/external/LinuxBoot/targets/u-root.mk M payloads/external/Makefile.inc 5 files changed, 196 insertions(+), 97 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/29581/1 diff --git a/payloads/external/LinuxBoot/Kconfig b/payloads/external/LinuxBoot/Kconfig index ba8b5a6..1f41ffa 100644 --- a/payloads/external/LinuxBoot/Kconfig +++ b/payloads/external/LinuxBoot/Kconfig @@ -1,6 +1,7 @@ ## This file is part of the coreboot project. ## ## Copyright (C) 2017 Facebook Inc. +## Copyright (C) 2018 9elements Cyber Security ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -16,6 +17,7 @@ choice prompt "Architecture" + depends on LINUXBOOT_COMPILE_KERNEL || LINUXBOOT_BUILD_INITRAMFS default LINUXBOOT_X86_64 config LINUXBOOT_X86_64 @@ -42,9 +44,22 @@ config LINUXBOOT_ARCH string default "amd64" if LINUXBOOT_X86_64 - default "386" if LINUXBOOT_X86 + default "i386" if LINUXBOOT_X86 default "arm64" if LINUXBOOT_ARM64 +comment "Linux kernel" + +config LINUXBOOT_COMPILE_KERNEL + bool "Compile kernel" + default n + +config LINUXBOOT_KERNEL_PATH + string "Path to kernel" + default "bzImage" + depends on !LINUXBOOT_COMPILE_KERNEL + +if LINUXBOOT_COMPILE_KERNEL + choice prompt "Kernel version" default LINUXBOOT_KERNEL_STABLE @@ -73,19 +88,34 @@ Add your own kernel configuration file. Otherwise a default minimal defconfig is used. +config LINUXBOOT_DTB_FILE + string "Compiled devicetree file" + depends on LINUXBOOT_ARM64 + default "" + +endif #LINUXBOOT_COMPILE_KERNEL + config LINUX_COMMAND_LINE string "Kernel command-line" default "" help Add your own kernel command-line arguments. -config LINUXBOOT_DTB_FILE - string "Compiled devicetree file" - depends on LINUXBOOT_ARM64 - default "" - config PAYLOAD_FILE - default "payloads/external/LinuxBoot/linuxboot/kernel-image" + default "payloads/external/LinuxBoot/linuxboot/bzImage" if LINUXBOOT_COMPILE_KERNEL + default LINUXBOOT_KERNEL_PATH if !LINUXBOOT_COMPILE_KERNEL + +comment "Linux initramfs" + +config LINUXBOOT_BUILD_INITRAMFS + bool "Build initramfs" + default n + +config LINUXBOOT_INITRAMFS_PATH + string "Path to initramfs" + depends on !LINUXBOOT_BUILD_INITRAMFS + +if LINUXBOOT_BUILD_INITRAMFS choice prompt "Payload Mode" @@ -128,9 +158,17 @@ Path to directory containing root structure for embedding into the initramfs. +config LINUXBOOT_UROOT_PATH + string + default "payloads/external/LinuxBoot/linuxboot/initramfs_u-root.cpio.xz" + +endif #LINUXBOOT_UROOT + +endif #LINUXBOOT_BUILD_INITRAMFS + config LINUX_INITRD string - default "payloads/external/LinuxBoot/linuxboot/initramfs.cpio.xz" + default LINUXBOOT_UROOT_PATH if LINUXBOOT_UROOT + default LINUXBOOT_INITRAMFS_PATH if !LINUXBOOT_BUILD_INITRAMFS -endif -endif +endif #PAYLOAD_LINUXBOOT diff --git a/payloads/external/LinuxBoot/Makefile b/payloads/external/LinuxBoot/Makefile index 6d852cb..090e7f0 100644 --- a/payloads/external/LinuxBoot/Makefile +++ b/payloads/external/LinuxBoot/Makefile @@ -1,6 +1,7 @@ ## This file is part of the coreboot project. ## ## Copyright (C) 2017 Facebook Inc. +## Copyright (C) 2018 9elements Cyber Security ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -12,90 +13,44 @@ ## GNU General Public License for more details. ## -kernel_tarball=https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-$(CONFIG_LINUXBOOT_KERNEL_VERSION).tar.xz project_dir=linuxboot kernel_dir=$(project_dir)/kernel +TOP=../../.. unexport $(COREBOOT_EXPORTS) unexport MAKEFLAGS -XGCCPATH?=$(PWD)/util/crossgcc/xgcc/bin -ifeq ($(CONFIG_LINUXBOOT_ARCH),386) -LINUXBOOT_COMPILE?=$(XGCCPATH)/i386-linux- -ARCH?=x86 -else ifeq ($(CONFIG_LINUXBOOT_ARCH),amd64) -LINUXBOOT_COMPILE?=$(XGCCPATH)/x86_64-linux- -ARCH?=x86_64 -else ifeq ($(CONFIG_LINUXBOOT_ARCH),arm64) -LINUXBOOT_COMPILE?=$(XGCCPATH)/aarch64-linux- -ARCH?=arm64 -endif - -OBJCOPY:=$(LINUXBOOT_COMPILE)objcopy - all: linuxboot -toolchain: - if [[ ! -x "$(LINUXBOOT_COMPILE)gcc" ]]; then \ - echo "Toolchain '$(LINUXBOOT_COMPILE)*' is missing."; \ +u-root: + $(MAKE) -f targets/u-root.mk + +ifeq ($(CONFIG_LINUXBOOT_BUILD_INITRAMFS),y) +ifeq ($(CONFIG_LINUXBOOT_UROOT),y) +initramfs: u-root +endif +else +ifneq ("$(CONFIG_LINUXBOOT_INITRAMFS_PATH)","") +initramfs: + if [[ ! -f "$(TOP)/$(CONFIG_LINUXBOOT_INITRAMFS_PATH)" ]]; then \ + echo "<< Linux initramfs '$(CONFIG_LINUXBOOT_INITRAMFS_PATH)' is missing. >>"; \ exit 1; \ fi - -$(kernel_dir)/.config: - echo " WWW Download Linux $(CONFIG_LINUXBOOT_KERNEL_VERSION)" - mkdir -p $(kernel_dir) -ifeq ("$(wildcard $(kernel_dir)/README)","") - curl -s $(kernel_tarball) | tar xJ -C $(kernel_dir) --strip 1 +endif endif -config: $(kernel_dir)/.config - echo " CONFIG Linux $(CONFIG_LINUXBOOT_KERNEL_VERSION)" -ifneq ($(CONFIG_LINUXBOOT_KERNEL_CONFIGFILE),) - cp $(CONFIG_LINUXBOOT_KERNEL_CONFIGFILE) $(kernel_dir)/.config -else ifeq ($(CONFIG_LINUXBOOT_ARCH),386) - cp x86/defconfig $(kernel_dir)/.config -else ifeq ($(CONFIG_LINUXBOOT_ARCH),amd64) - cp x86_64/defconfig $(kernel_dir)/.config -else ifeq ($(CONFIG_LINUXBOOT_ARCH),arm64) - cp arm64/defconfig $(kernel_dir)/.config -endif - -ifneq (,$(filter $(CONFIG_LINUXBOOT_ARCH),386 amd64)) -$(kernel_dir)/arch/x86/boot/bzImage: config toolchain -else ifeq ($(CONFIG_LINUXBOOT_ARCH),arm64) -$(kernel_dir)/vmlinux: config toolchain -endif - echo " MAKE Kernel $(CONFIG_LINUXBOOT_KERNEL_VERSION)" - $(MAKE) -C $(kernel_dir) olddefconfig CROSS_COMPILE=$(LINUXBOOT_COMPILE) ARCH=$(ARCH) - $(MAKE) -C $(kernel_dir) -j $(CPUS) CROSS_COMPILE=$(LINUXBOOT_COMPILE) ARCH=$(ARCH) - -ifneq (,$(filter $(CONFIG_LINUXBOOT_ARCH),386 amd64)) -$(project_dir)/kernel-image: $(kernel_dir)/arch/x86/boot/bzImage - cp $< $@ -else ifeq ($(CONFIG_LINUXBOOT_ARCH),arm64) -$(project_dir)/vmlinux.bin: $(kernel_dir)/vmlinux - $(OBJCOPY) -O binary $< $@ - -$(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 $(PWD)/$(CONFIG_LINUX_INITRD) - cp $(project_dir)/../arm64/kernel_fdt_lzma.its $(project_dir) - mkimage -f $(project_dir)/kernel_fdt_lzma.its $@ -endif - -ifeq ($(CONFIG_LINUXBOOT_UROOT),y) -$(PWD)/$(CONFIG_LINUX_INITRD): - $(MAKE) -f targets/u-root.mk +ifeq ($(CONFIG_LINUXBOOT_COMPILE_KERNEL),y) +kernel: + $(MAKE) -f targets/linux.mk else -$(PWD)/$(CONFIG_LINUX_INITRD): - echo "Building without u-root support" +kernel: + if [[ ! -f "$(TOP)/$(CONFIG_LINUXBOOT_KERNEL)" ]]; then \ + echo "<< Linux kernel '$(CONFIG_LINUXBOOT_KERNEL)' is missing. >>"; \ + exit 1; \ + fi endif -linuxboot: $(project_dir)/kernel-image $(PWD)/$(CONFIG_LINUX_INITRD) +linuxboot: kernel initramfs clean: if [ -d "$(kernel_dir)" ]; then rm -rf $(kernel_dir); fi @@ -104,4 +59,4 @@ distclean: rm -rf $(project_dir) -.PHONY: config patch payload clean distclean clone fetch all toolchain +.PHONY: config kernel initramfs u-root clean distclean diff --git a/payloads/external/LinuxBoot/targets/linux.mk b/payloads/external/LinuxBoot/targets/linux.mk new file mode 100644 index 0000000..c1d9f83 --- /dev/null +++ b/payloads/external/LinuxBoot/targets/linux.mk @@ -0,0 +1,100 @@ +## This file is part of the coreboot project. +## +## Copyright (C) 2017 Facebook Inc. +## Copyright (C) 2018 9elements Cyber Security +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; version 2 of the License. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## + +kernel_tarball=https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-$(CONFIG_LINUXBOOT_KERNEL_VERSION).tar.xz +project_dir=linuxboot +kernel_dir=$(project_dir)/kernel + +XGCCPATH?=$(PWD)/util/crossgcc/xgcc/bin +ifeq ($(CONFIG_LINUXBOOT_ARCH),386) +LINUXBOOT_COMPILE?=$(XGCCPATH)/i386-linux- +ARCH?=x86 +else ifeq ($(CONFIG_LINUXBOOT_ARCH),amd64) +LINUXBOOT_COMPILE?=$(XGCCPATH)/x86_64-linux- +ARCH?=x86_64 +else ifeq ($(CONFIG_LINUXBOOT_ARCH),arm64) +LINUXBOOT_COMPILE?=$(XGCCPATH)/aarch64-linux- +ARCH?=arm64 +endif + +OBJCOPY:=$(LINUXBOOT_COMPILE)objcopy + +all: kernel + +toolchain: + if [[ ! -x "$(LINUXBOOT_COMPILE)gcc" ]]; then \ + echo "Toolchain '$(LINUXBOOT_COMPILE)*' is missing."; \ + exit 1; \ + fi + +$(kernel_dir)/.config: + echo " WWW Download Linux $(CONFIG_LINUXBOOT_KERNEL_VERSION)" + mkdir -p $(kernel_dir) +ifeq ("$(wildcard $(kernel_dir)/README)","") + curl -s $(kernel_tarball) | tar xJ -C $(kernel_dir) --strip 1 +endif + +config: $(kernel_dir)/.config + echo " CONFIG Linux $(CONFIG_LINUXBOOT_KERNEL_VERSION)" +ifneq ($(CONFIG_LINUXBOOT_KERNEL_CONFIGFILE),) + cp $(CONFIG_LINUXBOOT_KERNEL_CONFIGFILE) $(kernel_dir)/.config +else ifeq ($(CONFIG_LINUXBOOT_ARCH),386) + cp x86/defconfig $(kernel_dir)/.config +else ifeq ($(CONFIG_LINUXBOOT_ARCH),amd64) + cp x86_64/defconfig $(kernel_dir)/.config +else ifeq ($(CONFIG_LINUXBOOT_ARCH),arm64) + cp arm64/defconfig $(kernel_dir)/.config +endif + +ifneq (,$(filter $(CONFIG_LINUXBOOT_ARCH),386 amd64)) +$(kernel_dir)/arch/x86/boot/bzImage: config toolchain +else ifeq ($(CONFIG_LINUXBOOT_ARCH),arm64) +$(kernel_dir)/vmlinux: config toolchain +endif + echo " MAKE Kernel $(CONFIG_LINUXBOOT_KERNEL_VERSION)" + $(MAKE) -C $(kernel_dir) olddefconfig CROSS_COMPILE=$(LINUXBOOT_COMPILE) ARCH=$(ARCH) + $(MAKE) -C $(kernel_dir) -j $(CPUS) CROSS_COMPILE=$(LINUXBOOT_COMPILE) ARCH=$(ARCH) + +ifneq (,$(filter $(CONFIG_LINUXBOOT_ARCH),386 amd64)) +$(project_dir)/bzImage: $(kernel_dir)/arch/x86/boot/bzImage + cp $< $@ +else ifeq ($(CONFIG_LINUXBOOT_ARCH),arm64) +$(project_dir)/vmlinux.bin: $(kernel_dir)/vmlinux + $(OBJCOPY) -O binary $< $@ + +$(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)/bzImage: $(project_dir)/vmlinux.bin.lzma $(project_dir)/../arm64/kernel_fdt_lzma.its $(project_dir)/target.dtb + cp $(project_dir)/../arm64/kernel_fdt_lzma.its $(project_dir) + mkimage -f $(project_dir)/kernel_fdt_lzma.its $@ +endif + +ifeq ($(CONFIG_LINUXBOOT_UROOT),y) +$(PWD)/$(CONFIG_LINUX_INITRD): + $(MAKE) -f targets/u-root.mk +else +$(PWD)/$(CONFIG_LINUX_INITRD): + echo "Building without u-root support" +endif + +bzImage:$(project_dir)/bzImage + +kernel: bzImage + +.PHONY: config kernel diff --git a/payloads/external/LinuxBoot/targets/u-root.mk b/payloads/external/LinuxBoot/targets/u-root.mk index 27f184e..5cb19bb 100644 --- a/payloads/external/LinuxBoot/targets/u-root.mk +++ b/payloads/external/LinuxBoot/targets/u-root.mk @@ -1,6 +1,7 @@ ## This file is part of the coreboot project. ## ## Copyright (C) 2017 Facebook Inc. +## Copyright (C) 2018 9elements Cyber Security ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -22,7 +23,7 @@ project_name=u-root go_path_dir=$(shell pwd)/linuxboot/go -all: build +all: u-root check: ifeq ("$(go_version)","") @@ -66,29 +67,29 @@ echo " GO u-root" cd $(uroot_dir); GOPATH=$(go_path_dir) go build u-root.go -$(project_dir)/initramfs.cpio.xz: checkout $(uroot_dir)/u-root +$(project_dir)/initramfs_u-root.cpio.xz: checkout $(uroot_dir)/u-root echo " MAKE u-root $(CONFIG_LINUXBOOT_UROOT_VERSION)" ifneq ($(CONFIG_LINUXBOOT_UROOT_COMMANDS),) 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_u-root.cpio \ $(patsubst %,cmds/%,$(CONFIG_LINUXBOOT_UROOT_COMMANDS)) 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_u-root.cpio \ $(patsubst %,cmds/%,$(CONFIG_LINUXBOOT_UROOT_COMMANDS)) 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 coreboot-app + -build=bb -files $(CONFIG_LINUXBOOT_UROOT_FILES) -o $(project_dir)/initramfs_u-root.cpio coreboot-app else cd $(uroot_dir); GOARCH=$(CONFIG_LINUXBOOT_ARCH) GOPATH=$(go_path_dir) ./u-root \ - -build=bb -o $(project_dir)/initramfs.cpio coreboot-app + -build=bb -o $(project_dir)/initramfs_u-root.cpio coreboot-app endif endif - xz -f --check=crc32 -9 --lzma2=dict=1MiB --threads=$(CPUS) $(project_dir)/initramfs.cpio + xz -f --check=crc32 -9 --lzma2=dict=1MiB --threads=$(CPUS) $(project_dir)/initramfs_u-root.cpio -build: $(project_dir)/initramfs.cpio.xz +u-root: $(project_dir)/initramfs_u-root.cpio.xz -.PHONY: build checkout fetch all check +.PHONY: u-root checkout fetch all check diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 74bec47..a1ee4a3 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -38,6 +38,7 @@ endif ifneq ($(strip $(call strip_quotes,$(CONFIG_LINUX_INITRD))),) ADDITIONAL_PAYLOAD_CONFIG+=-I $(CONFIG_LINUX_INITRD) + prebuilt-files += $(strip $(call strip_quotes,$(CONFIG_LINUX_INITRD))) endif endif ifneq ($(strip $(call strip_quotes,$(CONFIG_PAYLOAD_OPTIONS))),) @@ -256,21 +257,25 @@ linuxboot: $(MAKE) -C payloads/external/LinuxBoot \ CPUS=$(CPUS) \ + CONFIG_LINUXBOOT_ARCH=$(CONFIG_LINUXBOOT_ARCH) \ + CONFIG_LINUXBOOT_KERNEL=$(CONFIG_PAYLOAD_FILE) \ + CONFIG_LINUXBOOT_INITRAMFS=$(CONFIG_LINUX_INITRD) \ + CONFIG_LINUXBOOT_COMPILE_KERNEL=$(CONFIG_LINUXBOOT_COMPILE_KERNEL) \ + CONFIG_LINUXBOOT_BUILD_INITRAMFS=$(CONFIG_LINUXBOOT_BUILD_INITRAMFS) \ + CONFIG_LINUXBOOT_KERNEL_PATH=$(CONFIG_LINUXBOOT_KERNEL_PATH) \ CONFIG_LINUXBOOT_KERNEL_VERSION=$(CONFIG_LINUXBOOT_KERNEL_VERSION) \ CONFIG_LINUXBOOT_KERNEL_CONFIGFILE=$(CONFIG_LINUXBOOT_KERNEL_CONFIGFILE) \ + CONFIG_LINUXBOOT_INITRAMFS_PATH=$(CONFIG_LINUXBOOT_INITRAMFS_PATH) \ + CONFIG_LINUXBOOT_UROOT=$(CONFIG_LINUXBOOT_UROOT) \ CONFIG_LINUXBOOT_UROOT_VERSION=$(CONFIG_LINUXBOOT_UROOT_VERSION) \ CONFIG_LINUXBOOT_UROOT_COMMANDS=$(CONFIG_LINUXBOOT_UROOT_COMMANDS) \ - 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_LINUX_INITRD=$(CONFIG_LINUX_INITRD) + CONFIG_LINUXBOOT_DTB_FILE=$(CONFIG_LINUXBOOT_DTB_FILE) +payloads/external/LinuxBoot/linuxboot/bzImage: linuxboot +payloads/external/LinuxBoot/linuxboot/initramfs_u-root.cpio.xz: linuxboot -payloads/external/LinuxBoot/linuxboot/kernel-image: linuxboot -payloads/external/LinuxBoot/linuxboot/initramfs.cpio.xz: linuxboot -payloads/external/LinuxBoot/linuxboot/kernel/.config: linuxboot -payloads/external/LinuxBoot/linuxboot/go/src/github.com/u-root/u-root/.git: linuxboot +# Yabits payloads/external/Yabits/uefi/build/uefi.elf yabits: $(MAKE) -C payloads/external/Yabits all \ -- To view, visit https://review.coreboot.org/29581 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I41d0275a5f7efb920e881f43b0acda29f41ee221 Gerrit-Change-Number: 29581 Gerrit-PatchSet: 1 Gerrit-Owner: Marcello Sylvester Bauer <info(a)marcellobauer.com>

1 0

Change in coreboot[master]: Linux/Linuxboot: share cmdline and initrd parser
by Philipp Deppenwiese (Code Review) 11 Nov '18

11 Nov '18

Philipp Deppenwiese has posted comments on this change. ( https://review.coreboot.org/29510 ) Change subject: Linux/Linuxboot: share cmdline and initrd parser ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://review.coreboot.org/29510 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I2d2aef5d07453b98e115af6ee06318c690def785 Gerrit-Change-Number: 29510 Gerrit-PatchSet: 2 Gerrit-Owner: Marcello Sylvester Bauer <info(a)marcellobauer.com> Gerrit-Reviewer: Marcello Sylvester Bauer <info(a)marcellobauer.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sun, 11 Nov 2018 18:00:40 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in coreboot[master]: nb/amd/amdmct/{mct, mct_ddr3}: Replace MTRR addresses with macros
by Elyes HAOUAS (Code Review) 11 Nov '18

11 Nov '18

Hello build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/29580 to look at the new patch set (#2). Change subject: nb/amd/amdmct/{mct,mct_ddr3}: Replace MTRR addresses with macros ...................................................................... nb/amd/amdmct/{mct,mct_ddr3}: Replace MTRR addresses with macros Replace numbers by macro Change-Id: I224136ed4a19199bae0223a1aae366b3dd4ef9cf Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- M src/northbridge/amd/amdmct/mct/mctmtr_d.c M src/northbridge/amd/amdmct/mct_ddr3/mctmtr_d.c 2 files changed, 22 insertions(+), 21 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/29580/2 -- To view, visit https://review.coreboot.org/29580 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I224136ed4a19199bae0223a1aae366b3dd4ef9cf Gerrit-Change-Number: 29580 Gerrit-PatchSet: 2 Gerrit-Owner: Elyes HAOUAS <ehaouas(a)noos.fr> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in coreboot[master]: nb/amd/amdmct/{mct, mct_ddr3}: Replace MTRR addresses with macros
by Elyes HAOUAS (Code Review) 11 Nov '18

11 Nov '18

Elyes HAOUAS has uploaded this change for review. ( https://review.coreboot.org/29580 Change subject: nb/amd/amdmct/{mct,mct_ddr3}: Replace MTRR addresses with macros ...................................................................... nb/amd/amdmct/{mct,mct_ddr3}: Replace MTRR addresses with macros Change-Id: I224136ed4a19199bae0223a1aae366b3dd4ef9cf Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- M src/northbridge/amd/amdmct/mct/mctmtr_d.c M src/northbridge/amd/amdmct/mct_ddr3/mctmtr_d.c 2 files changed, 14 insertions(+), 13 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/29580/1 diff --git a/src/northbridge/amd/amdmct/mct/mctmtr_d.c b/src/northbridge/amd/amdmct/mct/mctmtr_d.c index 1e47ab4..6c60308 100644 --- a/src/northbridge/amd/amdmct/mct/mctmtr_d.c +++ b/src/northbridge/amd/amdmct/mct/mctmtr_d.c @@ -13,9 +13,9 @@ * GNU General Public License for more details. */ - #include "mct_d.h" #include <cpu/amd/mtrr.h> +#include <cpu/x86/mtrr.h> static void SetMTRRrangeWB_D(u32 Base, u32 *pLimit, u32 *pMtrrAddr); static void SetMTRRrange_D(u32 Base, u32 *pLimit, u32 *pMtrrAddr, u16 MtrrType); @@ -67,11 +67,11 @@ /* NOTE : For coreboot, we don't need to set mtrr enables here because they are still enable from cache_as_ram.inc */ - addr = 0x250; + addr = MTRR_FIX_64K_00000; lo = 0x1E1E1E1E; hi = lo; _WRMSR(addr, lo, hi); /* 0 - 512K = WB Mem */ - addr = 0x258; + addr = MTRR_FIX_16K_80000; _WRMSR(addr, lo, hi); /* 512K - 640K = WB Mem */ /*====================================================================== @@ -81,7 +81,7 @@ 0x200, 0x201 for [1M, CONFIG_TOP_MEM) 0x202, 0x203 for ROM Caching */ - addr = 0x204; /* MTRR phys base 2*/ + addr = MTRR_PHYS_BASE(2); /* MTRR phys base 2*/ /* use TOP_MEM as limit*/ /* Limit = TOP_MEM|TOM2*/ /* Base = 0*/ @@ -112,7 +112,7 @@ addr += 3; /* TOM2 */ _WRMSR(addr, lo, hi); } - addr = 0xC0010010; /* SYS_CFG */ + addr = SYSCFG_MSR; /* SYS_CFG */ _RDMSR(addr, &lo, &hi); if (Bottom40bIO) { lo |= (1<<21); /* MtrrTom2En = 1 */ @@ -235,10 +235,10 @@ /*====================================================================== * Clear variable MTRR values *======================================================================*/ - addr = 0x200; + addr = MTRR_PHYS_BASE(0); lo = 0; hi = lo; - while (addr < 0x20C) { + while (addr < MTRR_PHYS_BASE(6)) { _WRMSR(addr, lo, hi); /* prog. MTRR with current region Mask */ addr++; /* next MTRR pair addr */ } diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctmtr_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mctmtr_d.c index 2bf8562..1e316e9 100644 --- a/src/northbridge/amd/amdmct/mct_ddr3/mctmtr_d.c +++ b/src/northbridge/amd/amdmct/mct_ddr3/mctmtr_d.c @@ -20,6 +20,7 @@ #include "mct_d.h" #include "mct_d_gcc.h" #include <cpu/amd/mtrr.h> +#include <cpu/x86/mtrr.h> static void SetMTRRrangeWB_D(u32 Base, u32 *pLimit, u32 *pMtrrAddr); static void SetMTRRrange_D(u32 Base, u32 *pLimit, u32 *pMtrrAddr, u16 MtrrType); @@ -71,11 +72,11 @@ /* NOTE : For coreboot, we don't need to set mtrr enables here because they are still enable from cache_as_ram.inc */ - addr = 0x250; + addr = MTRR_FIX_64K_00000; lo = 0x1E1E1E1E; hi = lo; _WRMSR(addr, lo, hi); /* 0 - 512K = WB Mem */ - addr = 0x258; + addr = MTRR_FIX_16K_80000; _WRMSR(addr, lo, hi); /* 512K - 640K = WB Mem */ /*====================================================================== @@ -85,7 +86,7 @@ 0x200, 0x201 for [1M, CONFIG_TOP_MEM) 0x202, 0x203 for ROM Caching */ - addr = 0x204; /* MTRR phys base 2*/ + addr = MTRR_PHYS_BASE(2); /* MTRR phys base 2*/ /* use TOP_MEM as limit*/ /* Limit = TOP_MEM|TOM2*/ /* Base = 0*/ @@ -114,7 +115,7 @@ addr += 3; /* TOM2 */ _WRMSR(addr, lo, hi); } - addr = 0xC0010010; /* SYS_CFG */ + addr = SYSCFG_MSR; /* SYS_CFG */ _RDMSR(addr, &lo, &hi); if (Bottom40bIO) { lo |= (1<<21); /* MtrrTom2En = 1 */ @@ -236,10 +237,10 @@ /*====================================================================== * Clear variable MTRR values *======================================================================*/ - addr = 0x200; + addr = MTRR_PHYS_BASE(0); lo = 0; hi = lo; - while (addr < 0x20C) { + while (addr < MTRR_PHYS_BASE(6)) { _WRMSR(addr, lo, hi); /* prog. MTRR with current region Mask */ addr++; /* next MTRR pair addr */ } -- To view, visit https://review.coreboot.org/29580 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I224136ed4a19199bae0223a1aae366b3dd4ef9cf Gerrit-Change-Number: 29580 Gerrit-PatchSet: 1 Gerrit-Owner: Elyes HAOUAS <ehaouas(a)noos.fr>

1 0

Change in coreboot[master]: src/arch/x86/acpi.c: Update ACPI table revisions
by Elyes HAOUAS (Code Review) 11 Nov '18

11 Nov '18

Elyes HAOUAS has posted comments on this change. ( https://review.coreboot.org/29579 ) Change subject: src/arch/x86/acpi.c: Update ACPI table revisions ...................................................................... Patch Set 2: Code-Review-1 agree. Could you review Change-29569 when you have time, if I'm not wrong, the size is unchanged. -- To view, visit https://review.coreboot.org/29579 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I22020bd156536ee8f23a267d7c7b2d7af6c7cfeb Gerrit-Change-Number: 29579 Gerrit-PatchSet: 2 Gerrit-Owner: Elyes HAOUAS <ehaouas(a)noos.fr> Gerrit-Reviewer: Elyes HAOUAS <ehaouas(a)noos.fr> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sun, 11 Nov 2018 16:03:56 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in coreboot[master]: mb/emulation/qemu-i440fx|q35: Get rid of unused headers
by Felix Held (Code Review) 11 Nov '18

11 Nov '18

Felix Held has posted comments on this change. ( https://review.coreboot.org/29577 ) Change subject: mb/emulation/qemu-i440fx|q35: Get rid of unused headers ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://review.coreboot.org/#/c/29577/1/src/mainboard/emulation/qemu-i440fx… File src/mainboard/emulation/qemu-i440fx/mainboard.c: https://review.coreboot.org/#/c/29577/1/src/mainboard/emulation/qemu-i440fx… PS1, Line 21: > the arch independent ramstage headers are at <device/pci_ops.h> […] ah, true that -- To view, visit https://review.coreboot.org/29577 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I3cf0e4ef5b090d15ad823747fcf9219644e130fc Gerrit-Change-Number: 29577 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sun, 11 Nov 2018 16:01:27 +0000 Gerrit-HasComments: Yes Gerrit-HasLabels: Yes

1 0

Change in coreboot[master]: src/arch/x86/acpi.c: Update ACPI table revisions
by Patrick Rudolph (Code Review) 11 Nov '18

11 Nov '18

Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/29579 ) Change subject: src/arch/x86/acpi.c: Update ACPI table revisions ...................................................................... Patch Set 2: Code-Review-1 You need to update all those table prototypes, which might increase their size due to new table entries and implement all the new functionality. Just incrementing the revision doesn't improve anything, it might even confuse the operating system. -- To view, visit https://review.coreboot.org/29579 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I22020bd156536ee8f23a267d7c7b2d7af6c7cfeb Gerrit-Change-Number: 29579 Gerrit-PatchSet: 2 Gerrit-Owner: Elyes HAOUAS <ehaouas(a)noos.fr> Gerrit-Reviewer: Elyes HAOUAS <ehaouas(a)noos.fr> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Sun, 11 Nov 2018 15:59:20 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit November 2018