coreboot-gerrit November 2018

coreboot-gerrit@coreboot.org

1 participants
1699 discussions

Change in ...coreboot[master]: drivers/intel/gma: Fix typo in header
by Philipp Deppenwiese (Code Review) 28 Nov '18

28 Nov '18

Philipp Deppenwiese has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/29880 ) Change subject: drivers/intel/gma: Fix typo in header ...................................................................... drivers/intel/gma: Fix typo in header Correct typo of 'version' BUG=N/A TEST=N/A Change-Id: I05d7856072042c79f9d7aafdfecc9b3635f1d0cc Signed-off-by: Frans Hendriks <fhendriks(a)eltan.com> Reviewed-on: https://review.coreboot.org/c/29880 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: HAOUAS Elyes <ehaouas(a)noos.fr> --- M src/drivers/intel/gma/edid.c M src/drivers/intel/gma/opregion.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: build bot (Jenkins): Verified HAOUAS Elyes: Looks good to me, approved diff --git a/src/drivers/intel/gma/edid.c b/src/drivers/intel/gma/edid.c index 74bb6c6..d2475cf 100644 --- a/src/drivers/intel/gma/edid.c +++ b/src/drivers/intel/gma/edid.c @@ -7,7 +7,7 @@ * 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, or (at your option) - * any later verion of the License. + * any later version 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 diff --git a/src/drivers/intel/gma/opregion.c b/src/drivers/intel/gma/opregion.c index 5def085..57d03ad 100644 --- a/src/drivers/intel/gma/opregion.c +++ b/src/drivers/intel/gma/opregion.c @@ -6,7 +6,7 @@ * 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, or (at your option) - * any later verion of the License. + * any later version 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 -- To view, visit https://review.coreboot.org/c/coreboot/+/29880 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I05d7856072042c79f9d7aafdfecc9b3635f1d0cc Gerrit-Change-Number: 29880 Gerrit-PatchSet: 2 Gerrit-Owner: Frans Hendriks <fhendriks(a)eltan.com> Gerrit-Reviewer: Frans Hendriks <fhendriks(a)eltan.com> Gerrit-Reviewer: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-MessageType: merged

1 0

Change in ...coreboot[master]: tss: implement tlcl_save_state
by Philipp Deppenwiese (Code Review) 28 Nov '18

28 Nov '18

Philipp Deppenwiese has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/29646 ) Change subject: tss: implement tlcl_save_state ...................................................................... tss: implement tlcl_save_state When an untrusted OS is running, we would like to use the Cr50 vendor-specific VENDOR_CC_TPM_MODE command to disable TPM. Before doing this, we should save TPM state. Implement tlcl_save_state for this purpose. This needs to live in coreboot codebase since on S3 resume path, depthcharge is not reached. Implement the function in both tcg-1.2 and tcg-2.0 for completeness. BUG=b:70681930,b:118202153 TEST=hack a call to tlcl_save_state into coreboot on S3 resume verify in AP console that it is called Signed-off-by: Joel Kitching <kitching(a)google.com> Change-Id: I8b51ca68456fc9b655e4dc2d0958b7c040d50510 Reviewed-on: https://review.coreboot.org/c/29646 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com> --- M src/security/tpm/tss.h M src/security/tpm/tss/tcg-1.2/tss.c M src/security/tpm/tss/tcg-2.0/tss.c M src/security/tpm/tss/tcg-2.0/tss_marshaling.c M src/security/tpm/tss/tcg-2.0/tss_structures.h 5 files changed, 57 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Philipp Deppenwiese: Looks good to me, approved diff --git a/src/security/tpm/tss.h b/src/security/tpm/tss.h index c053df9..c4f2608 100644 --- a/src/security/tpm/tss.h +++ b/src/security/tpm/tss.h @@ -102,6 +102,13 @@ uint32_t tlcl_resume(void); /** + * Save TPM state by sending either TPM_SaveState() (TPM1.2) or + * TPM_Shutdown(ST_STATE) (TPM2.0). The TPM error code is returned (0 for + * success). + */ +uint32_t tlcl_save_state(void); + +/** * Run the self test. * * Note---this is synchronous. To run this in parallel with other firmware, diff --git a/src/security/tpm/tss/tcg-1.2/tss.c b/src/security/tpm/tss/tcg-1.2/tss.c index 0cb7eaa..b11d6a3 100644 --- a/src/security/tpm/tss/tcg-1.2/tss.c +++ b/src/security/tpm/tss/tcg-1.2/tss.c @@ -178,6 +178,12 @@ return send(tpm_resume_cmd.buffer); } +uint32_t tlcl_save_state(void) +{ + VBDEBUG("TPM: Save state\n"); + return send(tpm_savestate_cmd.buffer); +} + uint32_t tlcl_self_test_full(void) { VBDEBUG("TPM: Self test full\n"); diff --git a/src/security/tpm/tss/tcg-2.0/tss.c b/src/security/tpm/tss/tcg-2.0/tss.c index c67fdfa..e579bff 100644 --- a/src/security/tpm/tss/tcg-2.0/tss.c +++ b/src/security/tpm/tss/tcg-2.0/tss.c @@ -87,6 +87,35 @@ return tlcl_send_startup(TPM_SU_STATE); } +static uint32_t tlcl_send_shutdown(TPM_SU type) +{ + struct tpm2_shutdown shutdown; + struct tpm2_response *response; + + shutdown.shutdown_type = type; + response = tpm_process_command(TPM2_Shutdown, &shutdown); + + /* IO error, tpm2_response pointer is empty. */ + if (response == NULL) { + printk(BIOS_ERR, "%s: TPM communication error\n", __func__); + return TPM_E_IOERROR; + } + + printk(BIOS_INFO, "%s: Shutdown return code is %x\n", + __func__, response->hdr.tpm_code); + + if (response->hdr.tpm_code == TPM2_RC_SUCCESS) + return TPM_SUCCESS; + + /* Collapse any other errors into TPM_E_IOERROR. */ + return TPM_E_IOERROR; +} + +uint32_t tlcl_save_state(void) +{ + return tlcl_send_shutdown(TPM_SU_STATE); +} + uint32_t tlcl_assert_physical_presence(void) { /* diff --git a/src/security/tpm/tss/tcg-2.0/tss_marshaling.c b/src/security/tpm/tss/tcg-2.0/tss_marshaling.c index ad23d9b..49ac5e8 100644 --- a/src/security/tpm/tss/tcg-2.0/tss_marshaling.c +++ b/src/security/tpm/tss/tcg-2.0/tss_marshaling.c @@ -28,6 +28,11 @@ return obuf_write_be16(ob, cmd_body->startup_type); } +static int marshal_shutdown(struct obuf *ob, struct tpm2_shutdown *cmd_body) +{ + return obuf_write_be16(ob, cmd_body->shutdown_type); +} + static int marshal_get_capability(struct obuf *ob, struct tpm2_get_capability *cmd_body) { @@ -302,6 +307,10 @@ rc |= marshal_startup(ob, tpm_command_body); break; + case TPM2_Shutdown: + rc |= marshal_shutdown(ob, tpm_command_body); + break; + case TPM2_GetCapability: rc |= marshal_get_capability(ob, tpm_command_body); break; @@ -497,6 +506,7 @@ switch (command) { case TPM2_Startup: + case TPM2_Shutdown: break; case TPM2_GetCapability: diff --git a/src/security/tpm/tss/tcg-2.0/tss_structures.h b/src/security/tpm/tss/tcg-2.0/tss_structures.h index e902f3c..2bac633 100644 --- a/src/security/tpm/tss/tcg-2.0/tss_structures.h +++ b/src/security/tpm/tss/tcg-2.0/tss_structures.h @@ -71,6 +71,7 @@ #define TPM2_NV_WriteLock ((TPM_CC)0x00000138) #define TPM2_SelfTest ((TPM_CC)0x00000143) #define TPM2_Startup ((TPM_CC)0x00000144) +#define TPM2_Shutdown ((TPM_CC)0x00000145) #define TPM2_NV_Read ((TPM_CC)0x0000014E) #define TPM2_GetCapability ((TPM_CC)0x0000017A) #define TPM2_PCR_Extend ((TPM_CC)0x00000182) @@ -138,6 +139,10 @@ TPM_SU startup_type; }; +struct tpm2_shutdown { + TPM_SU shutdown_type; +}; + /* Various TPM capability types to use when querying the device. */ typedef uint32_t TPM_CAP; #define TPM_CAP_TPM_PROPERTIES ((TPM_CAP)0x00000006) -- To view, visit https://review.coreboot.org/c/coreboot/+/29646 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I8b51ca68456fc9b655e4dc2d0958b7c040d50510 Gerrit-Change-Number: 29646 Gerrit-PatchSet: 6 Gerrit-Owner: Joel Kitching <kitching(a)google.com> Gerrit-Reviewer: Aaron Durbin <adurbin(a)chromium.org> Gerrit-Reviewer: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Reviewer: Joel Kitching <kitching(a)google.com> Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: Vadim Bendebury <vbendeb(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Vadim Bendebury <vbendeb(a)chromium.org> Gerrit-MessageType: merged

1 0

Change in ...coreboot[master]: LinuxBoot: refactor u-root.mk
by Philipp Deppenwiese (Code Review) 28 Nov '18

28 Nov '18

Philipp Deppenwiese has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/29778 ) Change subject: LinuxBoot: refactor u-root.mk ...................................................................... LinuxBoot: refactor u-root.mk Clean the u-root initramfs integration and add essential flags as options. Now u-root automatically fetch updates and rebuilts itself to apply changes. Change-Id: Id978ed2ebeff96c5be4f74ae07df9be76e106a1b Signed-off-by: Marcello Sylvester Bauer <info(a)marcellobauer.com> Reviewed-on: https://review.coreboot.org/c/29778 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com> --- M payloads/external/LinuxBoot/Kconfig M payloads/external/LinuxBoot/Makefile M payloads/external/LinuxBoot/targets/linux.mk M payloads/external/LinuxBoot/targets/u-root.mk M payloads/external/Makefile.inc 5 files changed, 130 insertions(+), 72 deletions(-) Approvals: build bot (Jenkins): Verified Philipp Deppenwiese: Looks good to me, approved diff --git a/payloads/external/LinuxBoot/Kconfig b/payloads/external/LinuxBoot/Kconfig index 046faef..3b8b70c 100644 --- a/payloads/external/LinuxBoot/Kconfig +++ b/payloads/external/LinuxBoot/Kconfig @@ -127,6 +127,7 @@ help Enable u-root linuxboot mode. See http://u-root.tk/ for more information. + endchoice if LINUXBOOT_UROOT @@ -135,37 +136,109 @@ prompt "U-root version" default LINUXBOOT_UROOT_MASTER +config LINUXBOOT_UROOT_CUSTOM + bool "custom" + help + choose a custom u-root branch + config LINUXBOOT_UROOT_MASTER bool "master" help Latest u-root version + +config LINUXBOOT_UROOT_V3_0_0 + bool "v3.0.0" + +config LINUXBOOT_UROOT_V2_0_0 + bool "v2.0.0" + +config LINUXBOOT_UROOT_V1_0_0 + bool "v1.0.0" + endchoice +config LINUXBOOT_UROOT_CHECKOUT + string "U-root custom branch" + depends on LINUXBOOT_UROOT_CUSTOM + config LINUXBOOT_UROOT_VERSION string + default LINUXBOOT_UROOT_CHECKOUT if LINUXBOOT_UROOT_CUSTOM default "master" if LINUXBOOT_UROOT_MASTER + default "v3.0.0" if LINUXBOOT_UROOT_V3_0_0 + default "v2.0.0" if LINUXBOOT_UROOT_V2_0_0 + default "v1.0.0" if LINUXBOOT_UROOT_V1_0_0 -config LINUXBOOT_UROOT_COMMANDS - string "Select u-root commands" - default "" +choice + prompt "Build format" + default LINUXBOOT_UROOT_BB help - List of additional modules to include, separated by space. Otherwise - all modules of u-root are included. + u-root build format (e.g. bb or source). (default "bb") + +config LINUXBOOT_UROOT_BB + bool "bb" + +config LINUXBOOT_UROOT_SOURCE + bool "source (experimental)" + +endchoice + +config LINUXBOOT_UROOT_FORMAT + string + default "bb" if LINUXBOOT_UROOT_BB + default "source" if LINUXBOOT_UROOT_SOURCE config LINUXBOOT_UROOT_FILES string "Add files to u-root base" - default "" help - Path to directory containing root structure for embedding into the - initramfs. + Additional files, directories, and binaries (with their ldd dependencies) to add to archive. + Can be speficified multiple times. + +config LINUXBOOT_UROOT_INITCMD + string "Init target" + default "init" + help + Symlink target for /init. + Can be an absolute path or a u-root command name. (default "init") + +config LINUXBOOT_UROOT_SHELL + string "default shell" + default "elvish" + help + Default shell. + Can be an absolute path or a u-root command name. (default "elvish") + +config LINUXBOOT_UROOT_COMMANDS + string "U-root commands" + default "coreboot-app" + help + List of additional modules to include, + separated by space. (default "coreboot-app") endif #LINUXBOOT_UROOT endif #LINUXBOOT_BUILD_INITRAMFS +choice LINUXBOOT_INITRAMFS_COMPRESSION + prompt "Initramfs compression format" + default LINUXBOOT_INITRAMFS_COMPRESSION_XZ + +config LINUXBOOT_INITRAMFS_COMPRESSION_NONE + bool "none" + +config LINUXBOOT_INITRAMFS_COMPRESSION_XZ + bool "xz compression" + +endchoice + config LINUX_INITRD string - default "payloads/external/LinuxBoot/linuxboot/initramfs_u-root.cpio.xz" if LINUXBOOT_UROOT + default "payloads/external/LinuxBoot/linuxboot/initramfs_u-root.cpio" if LINUXBOOT_UROOT default LINUXBOOT_INITRAMFS_PATH if !LINUXBOOT_BUILD_INITRAMFS +config LINUXBOOT_INITRAMFS_SUFFIX + string + default "" if LINUXBOOT_INITRAMFS_COMPRESSION_NONE + default ".xz" if LINUXBOOT_INITRAMFS_COMPRESSION_XZ + endif #PAYLOAD_LINUXBOOT diff --git a/payloads/external/LinuxBoot/Makefile b/payloads/external/LinuxBoot/Makefile index a9b35fc..8016095 100644 --- a/payloads/external/LinuxBoot/Makefile +++ b/payloads/external/LinuxBoot/Makefile @@ -17,7 +17,6 @@ kernel_dir=$(project_dir)/kernel unexport $(COREBOOT_EXPORTS) -unexport MAKEFLAGS all: linuxboot @@ -38,6 +37,11 @@ endif endif +initramfs_compressed: initramfs +ifeq ($(CONFIG_LINUXBOOT_INITRAMFS_COMPRESSION_XZ),y) + xz --keep --force --lzma2=dict=1MiB $(top)/$(CONFIG_LINUXBOOT_INITRAMFS) +endif + ifeq ($(CONFIG_LINUXBOOT_COMPILE_KERNEL),y) ifeq ($(CONFIG_LINUXBOOT_ARCH),arm64) kernel: initramfs @@ -54,13 +58,14 @@ fi endif -linuxboot: kernel initramfs +linuxboot: kernel initramfs_compressed clean: if [ -d "$(kernel_dir)" ]; then rm -rf $(kernel_dir); fi - rm -f $(project_dir)/initramfs.cpio.xz + rm -f $(project_dir)/u-root + rm -f $(project_dir)/initramfs* distclean: rm -rf $(project_dir) -.PHONY: linuxboot kernel initramfs u-root clean distclean +.PHONY: linuxboot kernel initramfs_compressed initramfs u-root clean distclean diff --git a/payloads/external/LinuxBoot/targets/linux.mk b/payloads/external/LinuxBoot/targets/linux.mk index 07700b8..91118d4 100644 --- a/payloads/external/LinuxBoot/targets/linux.mk +++ b/payloads/external/LinuxBoot/targets/linux.mk @@ -82,7 +82,7 @@ $(project_dir)/uImage: $(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) - cp $(PWD)/$(CONFIG_LINUXBOOT_INITRAMFS) $(project_dir)/u-initramfs + cp $(PWD)/$(CONFIG_LINUXBOOT_INITRAMFS)$(CONFIG_LINUXBOOT_INITRAMFS_SUFFIX) $(project_dir)/u-initramfs mkimage -f $(project_dir)/kernel_fdt_lzma.its $@ endif diff --git a/payloads/external/LinuxBoot/targets/u-root.mk b/payloads/external/LinuxBoot/targets/u-root.mk index 5cb19bb..86c9019 100644 --- a/payloads/external/LinuxBoot/targets/u-root.mk +++ b/payloads/external/LinuxBoot/targets/u-root.mk @@ -13,19 +13,27 @@ ## GNU General Public License for more details. ## -uroot_git_repo=https://github.com/u-root/u-root.git -uroot_dir=$(project_dir)/go/src/github.com/u-root/u-root +project_dir=$(shell pwd)/linuxboot +go_path_dir=$(project_dir)/go +uroot_bin=$(project_dir)/u-root +uroot_package=github.com/u-root/u-root + go_version=$(shell go version | sed -nr 's/.*go([0-9]+\.[0-9]+.?[0-9]?).*/\1/p' ) go_version_major=$(shell echo $(go_version) | sed -nr 's/^([0-9]+)\.([0-9]+)\.?([0-9]*)$$/\1/p') go_version_minor=$(shell echo $(go_version) | sed -nr 's/^([0-9]+)\.([0-9]+)\.?([0-9]*)$$/\2/p') -project_dir=$(shell pwd)/linuxboot -project_name=u-root -go_path_dir=$(shell pwd)/linuxboot/go +uroot_args+=-build=$(CONFIG_LINUXBOOT_UROOT_FORMAT) +uroot_args+=-initcmd $(CONFIG_LINUXBOOT_UROOT_INITCMD) +uroot_args+=-defaultsh $(CONFIG_LINUXBOOT_UROOT_SHELL) +ifneq (CONFIG_LINUXBOOT_UROOT_FILES,) +uroot_args+=$(foreach file,$(CONFIG_LINUXBOOT_UROOT_FILES),-files $(PWD)/$(file)) +endif + +uroot_cmds=$(CONFIG_LINUXBOOT_UROOT_COMMANDS) all: u-root -check: +version: ifeq ("$(go_version)","") printf "\n<<Please install Golang >= 1.9 for u-root mode>>\n\n" exit 1 @@ -37,59 +45,26 @@ exit 1 endif endif - mkdir -p $(project_dir)/go/src/github.com/u-root -$(uroot_dir)/.git: - echo " Git Cloning u-root $(CONFIG_LINUXBOOT_UROOT_VERSION)" - git clone $(uroot_git_repo) $(uroot_dir) - -fetch: check $(uroot_dir)/.git - -cd "$(uroot_dir)" && git fetch origin - -checkout: fetch - cd "$(uroot_dir)" && \ - if ! git diff --quiet _cb_checkout "$(CONFIG_LINUXBOOT_UROOT_VERSION)" -- 2>/dev/null; \ - then \ - printf " CHECKOUT $(project_name) [$(CONFIG_LINUXBOOT_UROOT_VERSION)]\n"; \ - git checkout $$(git rev-parse HEAD) >/dev/null 2>&1; \ - git branch -f _cb_checkout "$(CONFIG_LINUXBOOT_UROOT_VERSION)" && \ - git checkout _cb_checkout && \ - $(if $(project_patches), \ - for patch in $(project_patches); do \ - printf " PATCH $$patch\n"; \ - git am --keep-cr "$$patch" || \ - ( printf "Error when applying patches.\n"; \ - git am --abort; exit 1; ); \ - done;,true;) \ +get: version + if [ -d "$(go_path_dir)/src/$(uroot_package)" ]; then \ + git -C $(go_path_dir)/src/$(uroot_package) checkout --quiet master; \ + GOPATH=$(go_path_dir) go get -d -u -v $(uroot_package) || \ + echo -e "\n<<u-root package update failed>>\n"; \ + else \ + GOPATH=$(go_path_dir) go get -d -u -v $(uroot_package) || \ + (echo -e "\n<<failed to get u-root package. Please check your internet access>>\n" && \ + exit 1); \ fi -$(uroot_dir)/u-root: $(uroot_dir)/u-root.go - echo " GO u-root" - cd $(uroot_dir); GOPATH=$(go_path_dir) go build u-root.go +checkout: get + git -C $(go_path_dir)/src/$(uroot_package) checkout --quiet $(CONFIG_LINUXBOOT_UROOT_VERSION) -$(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_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_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_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_u-root.cpio coreboot-app -endif -endif - xz -f --check=crc32 -9 --lzma2=dict=1MiB --threads=$(CPUS) $(project_dir)/initramfs_u-root.cpio +build: checkout + GOPATH=$(go_path_dir) go build -o $(uroot_bin) $(uroot_package) -u-root: $(project_dir)/initramfs_u-root.cpio.xz +u-root: build + GOARCH=$(CONFIG_LINUXBOOT_ARCH) GOPATH=$(go_path_dir) $(uroot_bin) \ + $(uroot_args) -o $(project_dir)/initramfs_u-root.cpio $(uroot_cmds) -.PHONY: u-root checkout fetch all check +.PHONY: all u-root build checkout get version diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 54ff9ea..4fda725 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -38,7 +38,7 @@ endif ifneq ($(strip $(call strip_quotes,$(CONFIG_LINUX_INITRD))),) ifneq ($(CONFIG_LINUXBOOT_ARM64),y) - ADDITIONAL_PAYLOAD_CONFIG+=-I $(CONFIG_LINUX_INITRD) + ADDITIONAL_PAYLOAD_CONFIG+=-I $(CONFIG_LINUX_INITRD)$(CONFIG_LINUXBOOT_INITRAMFS_SUFFIX) prebuilt-files += $(strip $(call strip_quotes,$(CONFIG_LINUX_INITRD))) endif endif @@ -262,19 +262,24 @@ CONFIG_LINUXBOOT_ARCH=$(CONFIG_LINUXBOOT_ARCH) \ CONFIG_LINUXBOOT_KERNEL=$(CONFIG_PAYLOAD_FILE) \ CONFIG_LINUXBOOT_INITRAMFS=$(CONFIG_LINUX_INITRD) \ + CONFIG_LINUXBOOT_INITRAMFS_SUFFIX=$(CONFIG_LINUXBOOT_INITRAMFS_SUFFIX) \ CONFIG_LINUXBOOT_COMPILE_KERNEL=$(CONFIG_LINUXBOOT_COMPILE_KERNEL) \ CONFIG_LINUXBOOT_BUILD_INITRAMFS=$(CONFIG_LINUXBOOT_BUILD_INITRAMFS) \ CONFIG_LINUXBOOT_KERNEL_VERSION=$(CONFIG_LINUXBOOT_KERNEL_VERSION) \ CONFIG_LINUXBOOT_KERNEL_CONFIGFILE=$(CONFIG_LINUXBOOT_KERNEL_CONFIGFILE) \ + CONFIG_LINUXBOOT_INITRAMFS_COMPRESSION_XZ=$(CONFIG_LINUXBOOT_INITRAMFS_COMPRESSION_XZ) \ CONFIG_LINUXBOOT_UROOT=$(CONFIG_LINUXBOOT_UROOT) \ CONFIG_LINUXBOOT_UROOT_VERSION=$(CONFIG_LINUXBOOT_UROOT_VERSION) \ + CONFIG_LINUXBOOT_UROOT_FORMAT=$(CONFIG_LINUXBOOT_UROOT_FORMAT) \ + CONFIG_LINUXBOOT_UROOT_INITCMD=$(CONFIG_LINUXBOOT_UROOT_INITCMD) \ + CONFIG_LINUXBOOT_UROOT_SHELL=$(CONFIG_LINUXBOOT_UROOT_SHELL) \ CONFIG_LINUXBOOT_UROOT_COMMANDS=$(CONFIG_LINUXBOOT_UROOT_COMMANDS) \ CONFIG_LINUXBOOT_UROOT_FILES=$(CONFIG_LINUXBOOT_UROOT_FILES) \ CONFIG_LINUXBOOT_DTB_FILE=$(CONFIG_LINUXBOOT_DTB_FILE) payloads/external/LinuxBoot/linuxboot/bzImage: linuxboot payloads/external/LinuxBoot/linuxboot/uImage: linuxboot -payloads/external/LinuxBoot/linuxboot/initramfs_u-root.cpio.xz: linuxboot +payloads/external/LinuxBoot/linuxboot/initramfs_u-root.cpio: linuxboot # Yabits -- To view, visit https://review.coreboot.org/c/coreboot/+/29778 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Id978ed2ebeff96c5be4f74ae07df9be76e106a1b Gerrit-Change-Number: 29778 Gerrit-PatchSet: 8 Gerrit-Owner: Marcello Sylvester Bauer <sylvblck(a)sylv.io> Gerrit-Reviewer: Andrea Barberio <insomniac(a)slackware.it> Gerrit-Reviewer: Jens Drenhaus <jens.drenhaus(a)9elements.com> Gerrit-Reviewer: Marcello Sylvester Bauer <sylvblck(a)sylv.io> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

Change in ...coreboot[master]: LinuxBoot: refactor u-root.mk
by Philipp Deppenwiese (Code Review) 28 Nov '18

28 Nov '18

Philipp Deppenwiese has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/29778 ) Change subject: LinuxBoot: refactor u-root.mk ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/29778 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Id978ed2ebeff96c5be4f74ae07df9be76e106a1b Gerrit-Change-Number: 29778 Gerrit-PatchSet: 7 Gerrit-Owner: Marcello Sylvester Bauer <sylvblck(a)sylv.io> Gerrit-Reviewer: Andrea Barberio <insomniac(a)slackware.it> Gerrit-Reviewer: Jens Drenhaus <jens.drenhaus(a)9elements.com> Gerrit-Reviewer: Marcello Sylvester Bauer <sylvblck(a)sylv.io> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Wed, 28 Nov 2018 18:32:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in ...coreboot[master]: LinuxBoot: refactor u-root.mk
by Philipp Deppenwiese (Code Review) 28 Nov '18

28 Nov '18

Philipp Deppenwiese has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/29778 ) Change subject: LinuxBoot: refactor u-root.mk ...................................................................... Patch Set 7: Let's do fixes in follow-ups and speed up integration -- To view, visit https://review.coreboot.org/c/coreboot/+/29778 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Id978ed2ebeff96c5be4f74ae07df9be76e106a1b Gerrit-Change-Number: 29778 Gerrit-PatchSet: 7 Gerrit-Owner: Marcello Sylvester Bauer <sylvblck(a)sylv.io> Gerrit-Reviewer: Andrea Barberio <insomniac(a)slackware.it> Gerrit-Reviewer: Jens Drenhaus <jens.drenhaus(a)9elements.com> Gerrit-Reviewer: Marcello Sylvester Bauer <sylvblck(a)sylv.io> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Wed, 28 Nov 2018 18:32:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in ...coreboot[master]: LinuxBoot: refactor payload
by Philipp Deppenwiese (Code Review) 28 Nov '18

28 Nov '18

Philipp Deppenwiese has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/29581 ) Change subject: LinuxBoot: refactor payload ...................................................................... LinuxBoot: refactor payload Clean and refactor the structure of the LinuxBoot payload integration, to make it more modular and readable. The kernel and initramfs should handled in separated makefiles. tested with: - qemu-i440fx (x86, x86_64) - cavium CN8100 (arm64) Change-Id: I41d0275a5f7efb920e881f43b0acda29f41ee221 Signed-off-by: Marcello Sylvester Bauer <info(a)marcellobauer.com> Reviewed-on: https://review.coreboot.org/c/29581 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com> --- M payloads/external/LinuxBoot/Kconfig M payloads/external/LinuxBoot/Makefile M payloads/external/LinuxBoot/arm64/kernel_fdt_lzma.its A payloads/external/LinuxBoot/targets/linux.mk M payloads/external/LinuxBoot/targets/u-root.mk M payloads/external/Makefile.inc 6 files changed, 207 insertions(+), 111 deletions(-) Approvals: build bot (Jenkins): Verified Philipp Deppenwiese: Looks good to me, approved diff --git a/payloads/external/LinuxBoot/Kconfig b/payloads/external/LinuxBoot/Kconfig index ba8b5a6..046faef 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 "Image" + depends on !LINUXBOOT_COMPILE_KERNEL + +if LINUXBOOT_COMPILE_KERNEL + choice prompt "Kernel version" default LINUXBOOT_KERNEL_STABLE @@ -73,19 +88,35 @@ 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 && ( LINUXBOOT_X86 || LINUXBOOT_X86_64 ) + default "payloads/external/LinuxBoot/linuxboot/uImage" if LINUXBOOT_COMPILE_KERNEL && LINUXBOOT_ARM64 + 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 +159,13 @@ Path to directory containing root structure for embedding into the initramfs. +endif #LINUXBOOT_UROOT + +endif #LINUXBOOT_BUILD_INITRAMFS + config LINUX_INITRD string - default "payloads/external/LinuxBoot/linuxboot/initramfs.cpio.xz" + default "payloads/external/LinuxBoot/linuxboot/initramfs_u-root.cpio.xz" 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..a9b35fc 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,48 @@ ## 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 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),) +initramfs: + if [[ ! -f "$(top)/$(CONFIG_LINUXBOOT_INITRAMFS)" ]]; then \ + echo "<< Linux initramfs '$(CONFIG_LINUXBOOT_INITRAMFS)' 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) +ifeq ($(CONFIG_LINUXBOOT_ARCH),arm64) +kernel: initramfs + $(MAKE) -f targets/linux.mk else -$(PWD)/$(CONFIG_LINUX_INITRD): - echo "Building without u-root support" +kernel: + $(MAKE) -f targets/linux.mk +endif +else +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 +63,4 @@ distclean: rm -rf $(project_dir) -.PHONY: config patch payload clean distclean clone fetch all toolchain +.PHONY: linuxboot kernel initramfs u-root clean distclean diff --git a/payloads/external/LinuxBoot/arm64/kernel_fdt_lzma.its b/payloads/external/LinuxBoot/arm64/kernel_fdt_lzma.its index 50f6a2f..26a8120 100644 --- a/payloads/external/LinuxBoot/arm64/kernel_fdt_lzma.its +++ b/payloads/external/LinuxBoot/arm64/kernel_fdt_lzma.its @@ -45,20 +45,20 @@ }; }; ramdisk-1 { - description = "Compressed Initramfs"; - data = /incbin/("initramfs.cpio.xz"); - type = "ramdisk"; - arch = "arm64"; - os = "linux"; - compression = "none"; - load = <00000000>; - entry = <00000000>; - hash-1 { - algo = "sha1"; - }; - hash-2 { - algo = "sha256"; - }; + description = "Compressed Initramfs"; + data = /incbin/("u-initramfs"); + type = "ramdisk"; + arch = "arm64"; + os = "linux"; + compression = "none"; + load = <00000000>; + entry = <00000000>; + hash-1 { + algo = "sha1"; + }; + hash-2 { + algo = "sha256"; + }; }; }; diff --git a/payloads/external/LinuxBoot/targets/linux.mk b/payloads/external/LinuxBoot/targets/linux.mk new file mode 100644 index 0000000..07700b8 --- /dev/null +++ b/payloads/external/LinuxBoot/targets/linux.mk @@ -0,0 +1,95 @@ +## 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),i386) +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),i386) + 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),i386 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),i386 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)/uImage: $(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) + cp $(PWD)/$(CONFIG_LINUXBOOT_INITRAMFS) $(project_dir)/u-initramfs + mkimage -f $(project_dir)/kernel_fdt_lzma.its $@ +endif + +ifneq (,$(filter $(CONFIG_LINUXBOOT_ARCH),i386 amd64)) +kernel: $(project_dir)/bzImage +else ifeq ($(CONFIG_LINUXBOOT_ARCH),arm64) +kernel: $(project_dir)/uImage +endif + +.PHONY: kernel config toolchain 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..54ff9ea 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -37,7 +37,10 @@ ADDITIONAL_PAYLOAD_CONFIG+=-C $(CONFIG_LINUX_COMMAND_LINE) endif ifneq ($(strip $(call strip_quotes,$(CONFIG_LINUX_INITRD))),) +ifneq ($(CONFIG_LINUXBOOT_ARM64),y) ADDITIONAL_PAYLOAD_CONFIG+=-I $(CONFIG_LINUX_INITRD) + prebuilt-files += $(strip $(call strip_quotes,$(CONFIG_LINUX_INITRD))) +endif endif endif ifneq ($(strip $(call strip_quotes,$(CONFIG_PAYLOAD_OPTIONS))),) @@ -256,21 +259,24 @@ 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_VERSION=$(CONFIG_LINUXBOOT_KERNEL_VERSION) \ CONFIG_LINUXBOOT_KERNEL_CONFIGFILE=$(CONFIG_LINUXBOOT_KERNEL_CONFIGFILE) \ + 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/uImage: 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/c/coreboot/+/29581 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I41d0275a5f7efb920e881f43b0acda29f41ee221 Gerrit-Change-Number: 29581 Gerrit-PatchSet: 12 Gerrit-Owner: Marcello Sylvester Bauer <sylvblck(a)sylv.io> Gerrit-Reviewer: Andrea Barberio <insomniac(a)slackware.it> Gerrit-Reviewer: Jens Drenhaus <jens.drenhaus(a)9elements.com> Gerrit-Reviewer: Marcello Sylvester Bauer <sylvblck(a)sylv.io> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> 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-CC: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: merged

1 0

Change in ...coreboot[master]: payloads/external/SeaBIOS/Kconfig: relax native VGA dependency
by Philipp Deppenwiese (Code Review) 28 Nov '18

28 Nov '18

Philipp Deppenwiese has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/29823 ) Change subject: payloads/external/SeaBIOS/Kconfig: relax native VGA dependency ...................................................................... payloads/external/SeaBIOS/Kconfig: relax native VGA dependency Allow the inclusion of a generated option rom despite the presence of a VGA BIOS. It is useful for dual graphics with an Intel GPU. Change-Id: Ic3a219c2dc2133c3328192840538f0fbd1ed935a Signed-off-by: Marcello Sylvester Bauer <info(a)marcellobauer.com> Reviewed-on: https://review.coreboot.org/c/29823 Reviewed-by: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com> Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M payloads/external/SeaBIOS/Kconfig 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Paul Menzel: Looks good to me, but someone else must approve Philipp Deppenwiese: Looks good to me, approved diff --git a/payloads/external/SeaBIOS/Kconfig b/payloads/external/SeaBIOS/Kconfig index 181a9d6..e6df425 100644 --- a/payloads/external/SeaBIOS/Kconfig +++ b/payloads/external/SeaBIOS/Kconfig @@ -54,7 +54,7 @@ config SEABIOS_VGA_COREBOOT prompt "Include generated option rom that implements legacy VGA BIOS compatibility" default y if !VENDOR_EMULATION - depends on !(VGA_BIOS || VGA_ROM_RUN) && (VGA_TEXT_FRAMEBUFFER || LINEAR_FRAMEBUFFER) + depends on !VGA_ROM_RUN && (VGA_TEXT_FRAMEBUFFER || LINEAR_FRAMEBUFFER) bool help coreboot can initialize the GPU of some mainboards. -- To view, visit https://review.coreboot.org/c/coreboot/+/29823 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ic3a219c2dc2133c3328192840538f0fbd1ed935a Gerrit-Change-Number: 29823 Gerrit-PatchSet: 5 Gerrit-Owner: Marcello Sylvester Bauer <sylvblck(a)sylv.io> Gerrit-Reviewer: Marcello Sylvester Bauer <sylvblck(a)sylv.io> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

Change in ...coreboot[master]: vendorcode/facebook: Add vendorcode
by Philipp Deppenwiese (Code Review) 28 Nov '18

28 Nov '18

Philipp Deppenwiese has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/28351 ) Change subject: vendorcode/facebook: Add vendorcode ...................................................................... Abandoned -- To view, visit https://review.coreboot.org/c/coreboot/+/28351 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I761ac3d1dcbab9dceb7a4c4f835ca8363680eb03 Gerrit-Change-Number: 28351 Gerrit-PatchSet: 5 Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com> Gerrit-Reviewer: Alex Thiessen <alex.thiessen.de+coreboot(a)gmail.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-CC: David Hendricks <david.hendricks(a)gmail.com> Gerrit-CC: Patrick Rudolph <patrick.rudolph(a)9elements.com> Gerrit-CC: Werner Zeh <werner.zeh(a)siemens.com> Gerrit-MessageType: abandon

1 0

Change in ...coreboot[master]: security/crypto: Add crypto primitives for hashing data
by Philipp Deppenwiese (Code Review) 28 Nov '18

28 Nov '18

Philipp Deppenwiese has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/22872 ) Change subject: security/crypto: Add crypto primitives for hashing data ...................................................................... Abandoned -- To view, visit https://review.coreboot.org/c/coreboot/+/22872 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I807084ebfffdc159fe95c45b4e5f0820bbfee5e1 Gerrit-Change-Number: 22872 Gerrit-PatchSet: 27 Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Name of user not set #1001824 Gerrit-Reviewer: Name of user not set #1001845 Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com> Gerrit-Reviewer: Werner Zeh <werner.zeh(a)siemens.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Julius Werner <jwerner(a)chromium.org> Gerrit-CC: Patrick Georgi <pgeorgi(a)google.com> Gerrit-CC: Patrick Rudolph <patrick.rudolph(a)9elements.com> Gerrit-CC: Randall Spangler <randall(a)spanglers.com> Gerrit-MessageType: abandon

1 0

Change in ...coreboot[master]: OC fixes WIP
by Philipp Deppenwiese (Code Review) 28 Nov '18

28 Nov '18

Philipp Deppenwiese has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/28335 ) Change subject: OC fixes WIP ...................................................................... Abandoned -- To view, visit https://review.coreboot.org/c/coreboot/+/28335 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I1ccd0c28e05f5d57f0c2a7575021efbe4ba1c570 Gerrit-Change-Number: 28335 Gerrit-PatchSet: 2 Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: abandon

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit November 2018