coreboot-gerrit November 2015

coreboot-gerrit@coreboot.org

1 participants
1544 discussions

Patch set updated for coreboot: Makefile: Individualize help targets & set as non-compile targets
by Martin Roth 26 Nov '15

26 Nov '15

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12542 -gerrit commit d22ac163f98e93a260ebde48f0e53da85b4e6f00 Author: Martin Roth <martinroth(a)google.com> Date: Wed Nov 25 12:50:25 2015 -0700 Makefile: Individualize help targets & set as non-compile targets - Including the help targets in the list of NOCOMPILE targets means they can run even if the toolchain is mucked up. Since they contain info on building the toolchin, this is useful. - Separate the three current parts of the help target into individual components: help_coreboot, help_toolchain, and help_kconfig. This is mostly for the help_toolchin target which will be printed out by toolchain.inc. Change-Id: I365d95fd63e22bddd122fb1fede6f04270e03d63 Signed-off-by: Martin Roth <martinroth(a)google.com> --- Makefile | 6 +++--- Makefile.inc | 4 ++-- util/kconfig/Makefile | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 05da7be..8eef124 100644 --- a/Makefile +++ b/Makefile @@ -93,8 +93,8 @@ DOXYGEN_OUTPUT_DIR := doxygen all: real-all -help_coreboot help:: - @echo '*** coreboot platform targets ***' +help:: + @echo '*** coreboot platform ***' @echo ' Use "make [target] V=1" for extra build debug information' @echo ' all - Build coreboot' @echo ' clean - Remove coreboot build artifacts' @@ -121,7 +121,7 @@ ifeq ($(strip $(HAVE_DOTCONFIG)),) NOCOMPILE:=1 endif ifneq ($(MAKECMDGOALS),) -ifneq ($(filter %config %clean cross% clang iasl lint% what-jenkins-does,$(MAKECMDGOALS)),) +ifneq ($(filter %config %clean cross% clang iasl lint% help% what-jenkins-does,$(MAKECMDGOALS)),) NOCOMPILE:=1 endif ifeq ($(MAKECMDGOALS), %clean) diff --git a/Makefile.inc b/Makefile.inc index a1c882b..8caf36b 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -446,8 +446,8 @@ gitconfig: git config remote.origin.push HEAD:refs/for/master (git config --global user.name >/dev/null && git config --global user.email >/dev/null) || (printf 'Please configure your name and email in git:\n\n git config --global user.name "Your Name Comes Here"\n git config --global user.email your.email(a)example.com\n'; exit 1) -help:: - @echo '*** Toolchain ***' +help_toolchain help:: + @echo '*** Toolchain targets ***' @echo ' crossgcc - Build coreboot cross-compilers for all platforms' @echo ' crosstools - Build coreboot cross-compiler and GDB for all platforms' @echo ' crossgcc-clean - Remove all built coreboot cross-compilers' diff --git a/util/kconfig/Makefile b/util/kconfig/Makefile index a468125..cec676b 100644 --- a/util/kconfig/Makefile +++ b/util/kconfig/Makefile @@ -104,8 +104,8 @@ olddefconfig: $(objk)/conf $< --defconfig=configs/$@ $(Kconfig) # Help text used by make help -help:: - @echo '*** Kconfig Help ***' +help_kconfig help:: + @echo '*** Kconfig Targets ***' @echo ' config - Update current config utilising a line-oriented program' @echo ' nconfig - Update current config utilising a ncurses menu based program' @echo ' menuconfig - Update current config utilising a menu based program'

1 0

Patch set updated for coreboot: toolchain.inc: Add IASL test as part of coreboot toolchain
by Martin Roth 26 Nov '15

26 Nov '15

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12543 -gerrit commit 53fc7cb80e5544d5371f79253856906af5c014c7 Author: Martin Roth <martinroth(a)google.com> Date: Wed Nov 25 12:44:15 2015 -0700 toolchain.inc: Add IASL test as part of coreboot toolchain Even though coreboot has IASL as part of its toolchain, it was not being picked up when testing to make sure coreboot is being compiled with the coreboot toolchain. - Add iasl test when testing coreboot toolchain - update instructions for building, and how to allow building with any toolchain. Change-Id: I5b989869417c3f60057a91842b911855d9528f1b Signed-off-by: Martin Roth <martinroth(a)google.com> --- toolchain.inc | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/toolchain.inc b/toolchain.inc index 0f3da83..1b73ce9 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -151,14 +151,27 @@ ifneq ($(NOCOMPILE),1) # only run if we're doing a build (not for tests, kconfig, ...), using gcc # rationale: gcc versions by Linux distributions tend to be quite messed up COMPILERFAIL:=0 +IASLFAIL:=0 ifeq ($(CONFIG_COMPILER_GCC),y) ifneq ($(CONFIG_ANY_TOOLCHAIN),y) $(foreach arch,$(sort $(foreach stage,$(COREBOOT_STANDARD_STAGES),$(ARCH-$(stage)-y))), \ $(if $(shell $(CC_$(arch)) -v 2>&1 |grep -q "gcc version .*coreboot toolchain" || echo not-coreboot), \ - $(eval COMPILERFAIL:=1)$(warning Please use the coreboot toolchain for '$(arch)' (or prove that your toolchain works)))) + $(eval COMPILERFAIL:=1)$(warning Please use the coreboot toolchain for '$(arch)'))) +#if iasl doesn't match the current coreboot version, fail the test +$(if $(shell $(IASL) -v 2>&1 | grep -q "$(shell util/crossgcc/buildgcc -s iasl)" || echo not-coreboot), \ + $(eval COMPILERFAIL:=1)$(eval IASLFAIL:=1)$(warning Please use the coreboot toolchain version of iasl - $(shell util/crossgcc/buildgcc -s iasl))) endif endif endif ifeq ($(COMPILERFAIL),1) -$(error consider building our compilers: make crossgcc) +$(warning ) +$(warning To build the entire coreboot toolchain: make crossgcc) +ifeq ($(IASLFAIL),1) +$(warning To build just IASL: make iasl) +endif +$(warning For more toolchain build targets: make help_toolchain) +$(warning ) +$(warning *** To try to use your own toolchain, run 'make menuconfig', then select the) +$(warning *** config option: General setup -> Allow building with any toolchain) +$(error Note that this is NOT supported. Using it means you're on your own) endif

1 0

Patch set updated for coreboot: Makefile.inc: Add build targets for IASL & Clang
by Martin Roth 26 Nov '15

26 Nov '15

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12541 -gerrit commit 90338cd79b12bb976212892a0fc532f14afe0424 Author: Martin Roth <martinroth(a)google.com> Date: Wed Nov 25 11:50:04 2015 -0700 Makefile.inc: Add build targets for IASL & Clang - Add specific build targets for IASL & CLANG and help for those targets - Consolidate tool target .PHONY entries Change-Id: If2960d75310495d9e486b3a08808463a2ff0c644 Signed-off-by: Martin Roth <martinroth(a)google.com> --- Makefile | 6 +++--- Makefile.inc | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index fde0914..05da7be 100644 --- a/Makefile +++ b/Makefile @@ -93,8 +93,8 @@ DOXYGEN_OUTPUT_DIR := doxygen all: real-all -help:: - @echo '*** coreboot platform ***' +help_coreboot help:: + @echo '*** coreboot platform targets ***' @echo ' Use "make [target] V=1" for extra build debug information' @echo ' all - Build coreboot' @echo ' clean - Remove coreboot build artifacts' @@ -121,7 +121,7 @@ ifeq ($(strip $(HAVE_DOTCONFIG)),) NOCOMPILE:=1 endif ifneq ($(MAKECMDGOALS),) -ifneq ($(filter %config %clean cross% lint% what-jenkins-does,$(MAKECMDGOALS)),) +ifneq ($(filter %config %clean cross% clang iasl lint% what-jenkins-does,$(MAKECMDGOALS)),) NOCOMPILE:=1 endif ifeq ($(MAKECMDGOALS), %clean) diff --git a/Makefile.inc b/Makefile.inc index 7fe1e17..a1c882b 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -451,6 +451,8 @@ help:: @echo ' crossgcc - Build coreboot cross-compilers for all platforms' @echo ' crosstools - Build coreboot cross-compiler and GDB for all platforms' @echo ' crossgcc-clean - Remove all built coreboot cross-compilers' + @echo ' iasl - Build coreboot IASL compiler (built by all cross targets)' + @echo ' clang - Build coreboot clang compiler' @echo ' crossgcc-ARCH - Build cross-compiler for specific architecture' @echo ' crosstools-ARCH - Build cross-compiler with GDB for specific architecture' @echo ' ARCH can be "i386", "x64", "arm", "aarch64", "mips", or "riscv"' @@ -463,7 +465,11 @@ help:: crossgcc: $(MAKE) -C util/crossgcc all_without_gdb SKIP_CLANG=1 -.PHONY: crossgcc-i386 crossgcc-x64 crossgcc-arm crossgcc-aarch64 crossgcc-mips crossgcc-riscv +.PHONY: crossgcc crossgcc-i386 crossgcc-x64 crossgcc-arm crossgcc-aarch64 \ + crossgcc-mips crossgcc-riscv crossgcc-clean iasl clang tools \ + crosstools-i386 crosstools-x64 crosstools-arm crosstools-aarch64 \ + crosstools-mips crosstools-riscv + crossgcc-i386: clean-for-update $(MAKE) -C util/crossgcc build-i386 SKIP_GDB=1 @@ -485,7 +491,12 @@ crossgcc-riscv: clean-for-update crosstools: $(MAKE) -C util/crossgcc all_with_gdb SKIP_CLANG=1 -.PHONY: crosstools-i386 crosstools-x64 crosstools-arm crosstools-aarch64 crosstools-mips crosstools-riscv +iasl: + $(MAKE) -C util/crossgcc build_iasl + +clang: + $(MAKE) -C util/crossgcc build_clang + crosstools-i386: clean-for-update $(MAKE) -C util/crossgcc build-i386

1 0

New patch to review for coreboot: asrock/e350m1: Fix IASL warnings
by Martin Roth 25 Nov '15

25 Nov '15

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12544 -gerrit commit de24276ed911bb059d61165bcfa01af369fd7cc6 Author: Martin Roth <martinroth(a)google.com> Date: Wed Nov 25 13:11:44 2015 -0700 asrock/e350m1: Fix IASL warnings Both of these 'fixes' need to be looked at further, and fixed in a LOT of places however we decide to fix them. *** Method Local is set but never used *** I added a load of another value into Local1, doing something similar to the _OSI example from the ACPI spec. This fixes the IASL warning, although it's a kludge. A better solution might be if IASL had a way to disable the warning in that specific area. I can disable the warning completely from the command line, but I don't want to do that. However: This code is never even run, because we set the assumption that we're running linux, and bail out immediately. I don't even know if the value is used anywhere. Fixes IASL warning: dsdt.aml 22: if(CondRefOf(\_OSI,Local1)) Warning 3144 - ^ Method Local is set but never used (Local1) ***Duplicate value in list *** I'm not positive of what the intention here was. The comment says that we're clearing PciExpWakeStatus though, so let's actually clear it. Since this wasn't actually doing anything before, it might be better if the line were just deleted. Fixes IASL warning: dsdt.aml 1396: Store(PWST, PWST) Warning 3023 - ^ Duplicate value in list (Source is the same as Target) Change-Id: I055de90ee5d44af8b7cbb5af02a82f7109638a18 Signed-off-by: Martin Roth <martinroth(a)google.com> --- src/mainboard/asrock/e350m1/acpi/mainboard.asl | 3 ++- src/mainboard/asrock/e350m1/acpi/sleep.asl | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mainboard/asrock/e350m1/acpi/mainboard.asl b/src/mainboard/asrock/e350m1/acpi/mainboard.asl index 57a414e..ca98bc0 100644 --- a/src/mainboard/asrock/e350m1/acpi/mainboard.asl +++ b/src/mainboard/asrock/e350m1/acpi/mainboard.asl @@ -43,7 +43,8 @@ Scope(\_SB) { Store(2, OSVR) } } else { - If(WCMP(\_OS,"Linux")) { + Store(\_OS, Local1) + If(LEqual(Local1,"Linux")) { Store(3, OSVR) /* Linux */ } Else { Store(4, OSVR) /* Gotta be WinCE */ diff --git a/src/mainboard/asrock/e350m1/acpi/sleep.asl b/src/mainboard/asrock/e350m1/acpi/sleep.asl index e043ee2..8cbc5e3 100644 --- a/src/mainboard/asrock/e350m1/acpi/sleep.asl +++ b/src/mainboard/asrock/e350m1/acpi/sleep.asl @@ -104,7 +104,7 @@ Method(\_WAK, 1) { } /* Arbitrarily clear PciExpWakeStatus */ - Store(PWST, PWST) + Store(Zero, PWST) /* if(DeRefOf(Index(WKST,0))) { * Store(0, Index(WKST,1))

1 0

New patch to review for coreboot: toolchain.inc: Add IASL test as part of coreboot toolchain
by Martin Roth 25 Nov '15

25 Nov '15

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12543 -gerrit commit eced8b087e25129c61ec048b0131c9e60bb2adcf Author: Martin Roth <martinroth(a)google.com> Date: Wed Nov 25 12:44:15 2015 -0700 toolchain.inc: Add IASL test as part of coreboot toolchain Even though coreboot has IASL as part of its toolchain, it was not being picked up when testing to make sure coreboot is being compiled with the coreboot toolchain. - Add iasl test when testing coreboot toolchain - update instructions for building, and how to allow building with any toolchain. Change-Id: I5b989869417c3f60057a91842b911855d9528f1b Signed-off-by: Martin Roth <martinroth(a)google.com> --- toolchain.inc | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/toolchain.inc b/toolchain.inc index 0f3da83..7a3f576 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -151,14 +151,28 @@ ifneq ($(NOCOMPILE),1) # only run if we're doing a build (not for tests, kconfig, ...), using gcc # rationale: gcc versions by Linux distributions tend to be quite messed up COMPILERFAIL:=0 +IASLFAIL:=0 ifeq ($(CONFIG_COMPILER_GCC),y) ifneq ($(CONFIG_ANY_TOOLCHAIN),y) $(foreach arch,$(sort $(foreach stage,$(COREBOOT_STANDARD_STAGES),$(ARCH-$(stage)-y))), \ $(if $(shell $(CC_$(arch)) -v 2>&1 |grep -q "gcc version .*coreboot toolchain" || echo not-coreboot), \ - $(eval COMPILERFAIL:=1)$(warning Please use the coreboot toolchain for '$(arch)' (or prove that your toolchain works)))) + $(eval COMPILERFAIL:=1)$(warning Please use the coreboot toolchain for '$(arch)'))) +#if iasl was just found in the path instead of the coreboot tools dir, fail the toolchain. +ifeq ($(IASL),iasl) +$(eval COMPILERFAIL:=1)$(eval IASLFAIL:=1)$(warning Please use the coreboot toolchain version of iasl) +endif endif endif endif ifeq ($(COMPILERFAIL),1) -$(error consider building our compilers: make crossgcc) +$(warning ) +$(warning To build the entire coreboot toolchain: make crossgcc) +ifeq ($(IASLFAIL),1) +$(warning To build just IASL: make iasl) +endif +$(warning For more toolchain build targets: make help_toolchain) +$(warning ) +$(warning *** To try to use your own toolchain, run 'make menuconfig', then select the) +$(warning *** config option: General setup -> Allow building with any toolchain) +$(error Note that this is NOT supported. Using it means you're on your own) endif

1 0

New patch to review for coreboot: Makefile: Individualize help targets & set as non-compile targets
by Martin Roth 25 Nov '15

25 Nov '15

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12542 -gerrit commit df3a579aacedf226108bda1386d41539d2c8009a Author: Martin Roth <martinroth(a)google.com> Date: Wed Nov 25 12:50:25 2015 -0700 Makefile: Individualize help targets & set as non-compile targets - Including the help targets in the list of NOCOMPILE targets means they can run even if the toolchain is mucked up. Since they contain info on building the toolchin, this is useful. - Separate the three current parts of the help target into individual components: help_coreboot, help_toolchain, and help_kconfig. This is mostly for the help_toolchin target which will be printed out by toolchain.inc. Change-Id: I365d95fd63e22bddd122fb1fede6f04270e03d63 Signed-off-by: Martin Roth <martinroth(a)google.com> --- Makefile | 6 +++--- Makefile.inc | 4 ++-- util/kconfig/Makefile | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index fde0914..a8c3bd0 100644 --- a/Makefile +++ b/Makefile @@ -93,8 +93,8 @@ DOXYGEN_OUTPUT_DIR := doxygen all: real-all -help:: - @echo '*** coreboot platform ***' +help_coreboot help:: + @echo '*** coreboot platform targets ***' @echo ' Use "make [target] V=1" for extra build debug information' @echo ' all - Build coreboot' @echo ' clean - Remove coreboot build artifacts' @@ -121,7 +121,7 @@ ifeq ($(strip $(HAVE_DOTCONFIG)),) NOCOMPILE:=1 endif ifneq ($(MAKECMDGOALS),) -ifneq ($(filter %config %clean cross% lint% what-jenkins-does,$(MAKECMDGOALS)),) +ifneq ($(filter %config %clean cross% lint% help% what-jenkins-does,$(MAKECMDGOALS)),) NOCOMPILE:=1 endif ifeq ($(MAKECMDGOALS), %clean) diff --git a/Makefile.inc b/Makefile.inc index a1c882b..8caf36b 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -446,8 +446,8 @@ gitconfig: git config remote.origin.push HEAD:refs/for/master (git config --global user.name >/dev/null && git config --global user.email >/dev/null) || (printf 'Please configure your name and email in git:\n\n git config --global user.name "Your Name Comes Here"\n git config --global user.email your.email(a)example.com\n'; exit 1) -help:: - @echo '*** Toolchain ***' +help_toolchain help:: + @echo '*** Toolchain targets ***' @echo ' crossgcc - Build coreboot cross-compilers for all platforms' @echo ' crosstools - Build coreboot cross-compiler and GDB for all platforms' @echo ' crossgcc-clean - Remove all built coreboot cross-compilers' diff --git a/util/kconfig/Makefile b/util/kconfig/Makefile index a468125..cec676b 100644 --- a/util/kconfig/Makefile +++ b/util/kconfig/Makefile @@ -104,8 +104,8 @@ olddefconfig: $(objk)/conf $< --defconfig=configs/$@ $(Kconfig) # Help text used by make help -help:: - @echo '*** Kconfig Help ***' +help_kconfig help:: + @echo '*** Kconfig Targets ***' @echo ' config - Update current config utilising a line-oriented program' @echo ' nconfig - Update current config utilising a ncurses menu based program' @echo ' menuconfig - Update current config utilising a menu based program'

1 0

New patch to review for coreboot: Makefile.inc: Add build targets for IASL & Clang
by Martin Roth 25 Nov '15

25 Nov '15

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12541 -gerrit commit 338ac26ddda5b826f0584c52b55f36b08a98e91a Author: Martin Roth <martinroth(a)google.com> Date: Wed Nov 25 11:50:04 2015 -0700 Makefile.inc: Add build targets for IASL & Clang - Add specific build targets for IASL & CLANG and help for those targets - Consolidate tool target .PHONY entries Change-Id: If2960d75310495d9e486b3a08808463a2ff0c644 Signed-off-by: Martin Roth <martinroth(a)google.com> --- Makefile.inc | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 7fe1e17..a1c882b 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -451,6 +451,8 @@ help:: @echo ' crossgcc - Build coreboot cross-compilers for all platforms' @echo ' crosstools - Build coreboot cross-compiler and GDB for all platforms' @echo ' crossgcc-clean - Remove all built coreboot cross-compilers' + @echo ' iasl - Build coreboot IASL compiler (built by all cross targets)' + @echo ' clang - Build coreboot clang compiler' @echo ' crossgcc-ARCH - Build cross-compiler for specific architecture' @echo ' crosstools-ARCH - Build cross-compiler with GDB for specific architecture' @echo ' ARCH can be "i386", "x64", "arm", "aarch64", "mips", or "riscv"' @@ -463,7 +465,11 @@ help:: crossgcc: $(MAKE) -C util/crossgcc all_without_gdb SKIP_CLANG=1 -.PHONY: crossgcc-i386 crossgcc-x64 crossgcc-arm crossgcc-aarch64 crossgcc-mips crossgcc-riscv +.PHONY: crossgcc crossgcc-i386 crossgcc-x64 crossgcc-arm crossgcc-aarch64 \ + crossgcc-mips crossgcc-riscv crossgcc-clean iasl clang tools \ + crosstools-i386 crosstools-x64 crosstools-arm crosstools-aarch64 \ + crosstools-mips crosstools-riscv + crossgcc-i386: clean-for-update $(MAKE) -C util/crossgcc build-i386 SKIP_GDB=1 @@ -485,7 +491,12 @@ crossgcc-riscv: clean-for-update crosstools: $(MAKE) -C util/crossgcc all_with_gdb SKIP_CLANG=1 -.PHONY: crosstools-i386 crosstools-x64 crosstools-arm crosstools-aarch64 crosstools-mips crosstools-riscv +iasl: + $(MAKE) -C util/crossgcc build_iasl + +clang: + $(MAKE) -C util/crossgcc build_clang + crosstools-i386: clean-for-update $(MAKE) -C util/crossgcc build-i386

1 0

New patch to review for coreboot: build system: break overly long lines into logical units
by Patrick Georgi 25 Nov '15

25 Nov '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12540 -gerrit commit 4c2a6642acb5164d9df4aa2a397566fd84c30f89 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Wed Nov 25 19:17:42 2015 +0100 build system: break overly long lines into logical units Change-Id: I37b716acb305a79614cea184f57b8488111eab7a Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- Makefile.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 3d0f0fa..457db5e 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -209,7 +209,9 @@ endef # arg2: binary file name cbfs-files-processor-nvramtool= \ $(eval $(2): $(1) $(src)/mainboard/$(MAINBOARDDIR)/cmos.layout | $(objutil)/nvramtool/nvramtool ; \ - printf " CREATE $(2) (from $(1))\n"; $(objutil)/nvramtool/nvramtool -y $(src)/mainboard/$(MAINBOARDDIR)/cmos.layout -D $(2).tmp -p $(1) && mv $(2).tmp $(2)) + printf " CREATE $(2) (from $(1))\n"; \ + $(objutil)/nvramtool/nvramtool -y $(src)/mainboard/$(MAINBOARDDIR)/cmos.layout -D $(2).tmp -p $(1) && \ + mv $(2).tmp $(2)) ####################################################################### # Link VSA binary to ELF-ish stage @@ -217,7 +219,9 @@ cbfs-files-processor-nvramtool= \ # arg2: binary file name cbfs-files-processor-vsa= \ $(eval $(2): $(1) ; \ - printf " CREATE $(2) (from $(1))\n"; $(OBJCOPY_ramstage) --set-start 0x20 --adjust-vma 0x60000 -I binary -O elf32-i386 -B i386 $(1) $(2).tmp && $(LD_ramstage) -m elf_i386 -e 0x60020 --section-start .data=0x60000 $(2).tmp -o $(2)) + printf " CREATE $(2) (from $(1))\n"; \ + $(OBJCOPY_ramstage) --set-start 0x20 --adjust-vma 0x60000 -I binary -O elf32-i386 -B i386 $(1) $(2).tmp && \ + $(LD_ramstage) -m elf_i386 -e 0x60020 --section-start .data=0x60000 $(2).tmp -o $(2)) ####################################################################### # Reduce a .config file to its minimal representation

1 0

New patch to review for coreboot: build system: move defconfig creation into a cbfs-files filter
by Patrick Georgi 25 Nov '15

25 Nov '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12539 -gerrit commit 05ca58db1dbe0d3a603039b2553be3cdc6415beb Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Wed Nov 25 18:47:56 2015 +0100 build system: move defconfig creation into a cbfs-files filter That allows this special case to become a normal cbfs-files instance, too. Change-Id: I896ffebe4cec64c9c11605b4f09c7790e5419928 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- Makefile.inc | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 6208951..3d0f0fa 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -220,6 +220,17 @@ cbfs-files-processor-vsa= \ printf " CREATE $(2) (from $(1))\n"; $(OBJCOPY_ramstage) --set-start 0x20 --adjust-vma 0x60000 -I binary -O elf32-i386 -B i386 $(1) $(2).tmp && $(LD_ramstage) -m elf_i386 -e 0x60020 --section-start .data=0x60000 $(2).tmp -o $(2)) ####################################################################### +# Reduce a .config file to its minimal representation +# arg1: input +# arg2: output +cbfs-files-processor-defconfig= \ + $(eval $(2): $(1) ; \ + printf " CREATE $(2) (from $(1))\n"; \ + echo "\# This image was built using git revision" `git rev-parse HEAD` > $(2).tmp && \ + $(MAKE) DOTCONFIG=$(1) DEFCONFIG=$(2).tmp savedefconfig && \ + \mv -f $(2).tmp $(2)) + +####################################################################### # Add handler for arbitrary files in CBFS $(call add-special-class,cbfs-files) cbfs-files-handler= \ @@ -642,15 +653,6 @@ ifneq ($(CONFIG_SEABIOS_PS2_TIMEOUT),0) $(CBFSTOOL) $@.tmp add-int -i $(CONFIG_SEABIOS_PS2_TIMEOUT) -n etc/ps2-keyboard-spinup endif endif -ifeq ($(CONFIG_INCLUDE_CONFIG_FILE),y) - @printf " CONFIG $(DOTCONFIG)\n" - if [ -f $(DOTCONFIG) ]; then \ - echo "# This image was built using git revision" `git rev-parse HEAD` > $(obj)/config.tmp && \ - $(MAKE) DOTCONFIG=$(DOTCONFIG) DEFCONFIG=$(obj)/config.tmp savedefconfig && \ - $(CBFSTOOL) $@.tmp add -f $(obj)/config.tmp -n config -t raw; rm -f $(obj)/config.tmp ; fi - @printf " REVISION build.h\n" - if [ -f $(obj)/build.h ]; then $(CBFSTOOL) $@.tmp add -f $(obj)/build.h -n revision -t raw; fi -endif ifeq ($(CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE),y) ifeq ($(CONFIG_CPU_MICROCODE_CBFS_GENERATE),y) @printf " UPDATE-FIT \n" @@ -686,6 +688,14 @@ cbfs-files-$(CONFIG_PXE_ROM) += pci$(CONFIG_PXE_ROM_ID).rom pci$(CONFIG_PXE_ROM_ID).rom-file := $(CONFIG_PXE_ROM_FILE) pci$(CONFIG_PXE_ROM_ID).rom-type := raw +cbfs-files-$(CONFIG_INCLUDE_CONFIG_FILE) += config +config-file := $(DOTCONFIG):defconfig +config-type := raw + +cbfs-files-$(CONFIG_INCLUDE_CONFIG_FILE) += revision +revision-file := $(obj)/build.h +revision-type := raw + cbfs-files-$(CONFIG_INCLUDE_CONFIG_FILE) += payload_config payload_config-file := $(PAYLOAD_CONFIG) payload_config-type := raw

1 0

New patch to review for coreboot: build system: Move manual cbfstool add* invocations to cbfs-files
by Patrick Georgi 25 Nov '15

25 Nov '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12538 -gerrit commit b2ba759de25f16eeaadda0a64ae8bb931bee6197 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Wed Nov 25 18:21:53 2015 +0100 build system: Move manual cbfstool add* invocations to cbfs-files Use cbfs-files-y to deal with some of the manually added cbfs files, providing more structure to that part of the build. Change-Id: Iee1b8fec81dfa5e5f0e55637a62e5f69bd0257ad Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- Makefile.inc | 47 ++++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 5851824..6208951 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -629,7 +629,6 @@ $(obj)/coreboot.rom: $(obj)/coreboot.pre $(objcbfs)/ramstage.elf $(CBFSTOOL) $$( # file (filled with \377 = 0xff) and copy the CBFS image over it. dd if=/dev/zero bs=$(call _toint,$(CONFIG_ROM_SIZE)) count=1 2> /dev/null | tr '\000' '\377' > $@.tmp dd if=$(obj)/coreboot.pre of=$@.tmp bs=8192 conv=notrunc 2> /dev/null - $(CBFSTOOL) $@.tmp add-stage -f $(objcbfs)/ramstage.elf -n $(CONFIG_CBFS_PREFIX)/ramstage -c $(CBFS_COMPRESS_FLAG) ifeq ($(CONFIG_PAYLOAD_NONE),y) @printf " PAYLOAD none (as specified by user)\n" endif @@ -643,10 +642,6 @@ ifneq ($(CONFIG_SEABIOS_PS2_TIMEOUT),0) $(CBFSTOOL) $@.tmp add-int -i $(CONFIG_SEABIOS_PS2_TIMEOUT) -n etc/ps2-keyboard-spinup endif endif -ifeq ($(CONFIG_SEABIOS_VGA_COREBOOT),y) - @printf " SeaBIOS Adding generated legacy VGA option rom.\n" - $(CBFSTOOL) $@.tmp add -f $(CONFIG_PAYLOAD_VGABIOS_FILE) -n vgaroms/seavgabios.bin -t raw -endif ifeq ($(CONFIG_INCLUDE_CONFIG_FILE),y) @printf " CONFIG $(DOTCONFIG)\n" if [ -f $(DOTCONFIG) ]; then \ @@ -656,28 +651,12 @@ ifeq ($(CONFIG_INCLUDE_CONFIG_FILE),y) @printf " REVISION build.h\n" if [ -f $(obj)/build.h ]; then $(CBFSTOOL) $@.tmp add -f $(obj)/build.h -n revision -t raw; fi endif -ifeq ($(CONFIG_HAVE_REFCODE_BLOB),y) - $(CBFSTOOL) $@.tmp add-stage -f $(REFCODE_BLOB) -n $(CONFIG_CBFS_PREFIX)/refcode -c $(CBFS_COMPRESS_FLAG) -endif -ifeq ($(CONFIG_PXE_ROM),y) - $(CBFSTOOL) $@.tmp add -f $(CONFIG_PXE_ROM_FILE) -n pci$(CONFIG_PXE_ROM_ID).rom -t raw -endif ifeq ($(CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE),y) ifeq ($(CONFIG_CPU_MICROCODE_CBFS_GENERATE),y) @printf " UPDATE-FIT \n" $(CBFSTOOL) $@.tmp update-fit -n cpu_microcode_blob.bin -x $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES) endif endif -ifeq ($(CONFIG_INCLUDE_CONFIG_FILE),y) - @printf " CONFIG $(PAYLOAD_CONFIG)\n" - if [ -f "$(PAYLOAD_CONFIG)" ]; then \ - $(CBFSTOOL) $@.tmp add -f "$(PAYLOAD_CONFIG)" -n payload_config -t raw; \ - fi - @printf " REVISION $(PAYLOAD_VERSION)\n" - if [ -f "$(PAYLOAD_VERSION)" ]; then \ - $(CBFSTOOL) $@.tmp add -f "$(PAYLOAD_VERSION)" -n payload_revision -t raw; \ - fi -endif ifeq ($(CONFIG_SEPARATE_VERSTAGE),y) $(CBFSTOOL) $@.tmp add-stage -f $(VERSTAGE_FILE) -n $(CONFIG_CBFS_PREFIX)/verstage $(CBFSTOOL_VERSTAGE_OPTS) endif @@ -689,6 +668,32 @@ ifeq ($(CONFIG_IASL_WARNINGS_ARE_ERRORS),) @printf "***** Please fix the ASL for this platform. *****\n\n" endif +cbfs-files-y += $(CONFIG_CBFS_PREFIX)/ramstage +$(CONFIG_CBFS_PREFIX)/ramstage-file := $(objcbfs)/ramstage.elf +$(CONFIG_CBFS_PREFIX)/ramstage-type := stage +$(CONFIG_CBFS_PREFIX)/ramstage-compression := $(CBFS_COMPRESS_FLAG) + +cbfs-files-$(CONFIG_HAVE_REFCODE_BLOB) += $(CONFIG_CBFS_PREFIX)/refcode +$(CONFIG_CBFS_PREFIX)/refcode-file := $(REFCODE_BLOB) +$(CONFIG_CBFS_PREFIX)/refcode-type := stage +$(CONFIG_CBFS_PREFIX)/refcode-compression := $(CBFS_COMPRESS_FLAG) + +cbfs-files-$(CONFIG_SEABIOS_VGA_COREBOOT) += vgaroms/seavgabios.bin +vgaroms/seavgabios.bin-file := $(CONFIG_PAYLOAD_VGABIOS_FILE) +vgaroms/seavgabios.bin-type := raw + +cbfs-files-$(CONFIG_PXE_ROM) += pci$(CONFIG_PXE_ROM_ID).rom +pci$(CONFIG_PXE_ROM_ID).rom-file := $(CONFIG_PXE_ROM_FILE) +pci$(CONFIG_PXE_ROM_ID).rom-type := raw + +cbfs-files-$(CONFIG_INCLUDE_CONFIG_FILE) += payload_config +payload_config-file := $(PAYLOAD_CONFIG) +payload_config-type := raw + +cbfs-files-$(CONFIG_INCLUDE_CONFIG_FILE) += payload_revision +payload_revision-file := $(PAYLOAD_VERSION) +payload_revision-type := raw + cbfs-files-$(CONFIG_BOOTSPLASH_IMAGE) += bootsplash.jpg bootsplash.jpg-file := $(call strip_quotes,$(CONFIG_BOOTSPLASH_FILE)) bootsplash.jpg-type := bootsplash

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit November 2015