coreboot-gerrit March 2015

coreboot-gerrit@coreboot.org

1 participants
2443 discussions

Patch set updated for coreboot: ce69d63 build system: rename mips/bootblock.inc to mips/bootblock.S
by Patrick Georgi 29 Mar '15

29 Mar '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9108 -gerrit commit ce69d63ca1dd271e481701c56e9203f4fe52f449 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Fri Mar 27 14:03:22 2015 +0100 build system: rename mips/bootblock.inc to mips/bootblock.S This is inspired by the commit listed below, but rewritten to match upstream, and split in smaller pieces to keep intent clear. Change-Id: I192fa50989b586fd8e967d4c22db56ac9de7a30e Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> Based-On-Change-Id: I50af7dacf616e0f8ff4c43f4acc679089ad7022b Based-On-Signed-off-by: Julius Werner <jwerner(a)chromium.org> Based-On-Reviewed-on: https://chromium-review.googlesource.com/219170 --- src/arch/mips/Makefile.inc | 2 +- src/arch/mips/bootblock.S | 44 ++++++++++++++++++++++++++++++++++++++++++++ src/arch/mips/bootblock.inc | 44 -------------------------------------------- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/arch/mips/Makefile.inc b/src/arch/mips/Makefile.inc index 956f2d5..42c3007 100644 --- a/src/arch/mips/Makefile.inc +++ b/src/arch/mips/Makefile.inc @@ -44,7 +44,7 @@ bootblock-y += ../../lib/memset.c bootblock_lds = $(src)/arch/mips/bootblock.ld -bootblock_inc += $(src)/arch/mips/bootblock.inc +bootblock_inc += $(src)/arch/mips/bootblock.S bootblock_inc += $(objgenerated)/bootblock.inc # Much of the assembly code is generated by the compiler, and may contain diff --git a/src/arch/mips/bootblock.S b/src/arch/mips/bootblock.S new file mode 100644 index 0000000..dbde803 --- /dev/null +++ b/src/arch/mips/bootblock.S @@ -0,0 +1,44 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2014 Imagination Technologies + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +.set noreorder /* Prevent assembler from "optimizing" this code. */ + +.section ".start", "ax", %progbits +.globl _start +_start: + /* Set the stack pointer */ + li $sp, CONFIG_BOOTBLOCK_STACK_TOP + + /* + * Initialise the stack to a known value, used later to check for + * overflow. + */ + li $t0, CONFIG_BOOTBLOCK_STACK_BOTTOM + addi $t1, $sp, -4 + li $t2, 0xdeadbeef +1: sw $t2, 0($t0) + bne $t0, $t1, 1b + addi $t0, $t0, 4 + + /* Run main */ + b main + + /* Should never return from main. */ +2: + b 2b diff --git a/src/arch/mips/bootblock.inc b/src/arch/mips/bootblock.inc deleted file mode 100644 index dbde803..0000000 --- a/src/arch/mips/bootblock.inc +++ /dev/null @@ -1,44 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2014 Imagination Technologies - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -.set noreorder /* Prevent assembler from "optimizing" this code. */ - -.section ".start", "ax", %progbits -.globl _start -_start: - /* Set the stack pointer */ - li $sp, CONFIG_BOOTBLOCK_STACK_TOP - - /* - * Initialise the stack to a known value, used later to check for - * overflow. - */ - li $t0, CONFIG_BOOTBLOCK_STACK_BOTTOM - addi $t1, $sp, -4 - li $t2, 0xdeadbeef -1: sw $t2, 0($t0) - bne $t0, $t1, 1b - addi $t0, $t0, 4 - - /* Run main */ - b main - - /* Should never return from main. */ -2: - b 2b

1 0

Patch set updated for coreboot: cd1457c x86/smm: Move SMM configuration out of generic Makefile
by Patrick Georgi 29 Mar '15

29 Mar '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9115 -gerrit commit cd1457c4f2f1822b7483546c3ce7ebd18f679914 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Fri Mar 27 15:32:49 2015 +0100 x86/smm: Move SMM configuration out of generic Makefile It's x86 specific. This is inspired by the commit listed below, but rewritten to match upstream, and split in smaller pieces to keep intent clear. Change-Id: Iacb91b47c89041435dd27c2c9ad34a231adf21d2 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> Based-On-Change-Id: I50af7dacf616e0f8ff4c43f4acc679089ad7022b Based-On-Signed-off-by: Julius Werner <jwerner(a)chromium.org> Based-On-Reviewed-on: https://chromium-review.googlesource.com/219170 --- Makefile.inc | 10 ---------- src/cpu/x86/smm/Makefile.inc | 4 ++++ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 59ddf7e..c0125a8 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -134,16 +134,6 @@ endif bootblock-generic-ccopts += -D__BOOT_BLOCK__ -D__PRE_RAM__ -smmstub-generic-ccopts += -D__SMM__ -smm-generic-ccopts += -D__SMM__ - -# SMM TSEG base is dynamic -ifneq ($(CONFIG_SMM_MODULES),y) -ifeq ($(CONFIG_SMM_TSEG),y) -smm-c-ccopts += -fpic -endif -endif - ramstage-c-deps:=$$(OPTION_TABLE_H) romstage-c-deps:=$$(OPTION_TABLE_H) verstage-c-deps:=$$(OPTION_TABLE_H) diff --git a/src/cpu/x86/smm/Makefile.inc b/src/cpu/x86/smm/Makefile.inc index 971eacf..3fb92a2 100644 --- a/src/cpu/x86/smm/Makefile.inc +++ b/src/cpu/x86/smm/Makefile.inc @@ -27,6 +27,9 @@ $(eval $(call create_class_compiler,smm,x86_64)) $(eval $(call create_class_compiler,smmstub,x86_64)) endif +smmstub-generic-ccopts += -D__SMM__ +smm-generic-ccopts += -D__SMM__ + $(obj)/cpu/x86/smm/smm.o: $$(smm-objs) $(COMPILER_RT_smm) $(LD_smm) -nostdlib -r -o $@ $(COMPILER_RT_FLAGS_smm) --start-group $(smm-objs) $(COMPILER_RT_smm) --end-group @@ -101,6 +104,7 @@ endif # Use TSEG specific entry point and linker script ifeq ($(CONFIG_SMM_TSEG),y) smm-y += smmhandler_tseg.S +smm-c-ccopts += -fpic SMM_LDFLAGS := -pie SMM_LDSCRIPT := smm_tseg.ld else

1 0

Patch set updated for coreboot: be89e3b build system: provide generic compiler flag variables
by Patrick Georgi 29 Mar '15

29 Mar '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9114 -gerrit commit be89e3b022f57c40d893ddb414a952a67b6d820d Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Fri Mar 27 15:27:21 2015 +0100 build system: provide generic compiler flag variables Introduce generic-$(type)-ccopts and $(class)-generic-ccopts to declare compiler flags that apply to all files of a certain type or of a certain class. Then use them. This is inspired by the commit listed below, but rewritten to match upstream, and split in smaller pieces to keep intent clear. Change-Id: I655688e82a0cc5bad89b6f55dc217b9f66b64604 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> Based-On-Change-Id: I50af7dacf616e0f8ff4c43f4acc679089ad7022b Based-On-Signed-off-by: Julius Werner <jwerner(a)chromium.org> Based-On-Reviewed-on: https://chromium-review.googlesource.com/219170 --- Makefile | 1 + Makefile.inc | 12 ++++-------- src/arch/arm64/armv8/secmon/Makefile.inc | 5 +++-- src/vendorcode/google/chromeos/Makefile.inc | 3 +-- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 8b5d61b..0cc9b6a 100644 --- a/Makefile +++ b/Makefile @@ -235,6 +235,7 @@ endef filetypes-of-class=$(subst .,,$(sort $(suffix $($(1)-srcs)))) $(foreach class,$(classes), \ $(foreach type,$(call filetypes-of-class,$(class)), \ + $(eval $(class)-$(type)-ccopts += $(generic-$(type)-ccopts) $($(class)-generic-ccopts)) \ $(eval $(call create_cc_template,$(class),$(type),$($(class)-$(type)-ccopts),$($(class)-$(type)-deps))))) foreach-src=$(foreach file,$($(1)-srcs),$(eval $(call $(1)-objs_$(subst .,,$(suffix $(file)))_template,$(subst src/,,$(basename $(file)))))) diff --git a/Makefile.inc b/Makefile.inc index 838a680..59ddf7e 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -116,8 +116,7 @@ ramstage-postprocess=$(foreach d,$(sort $(dir $(1))), \ $(eval $(d)ramstage.o: $(call files-in-dir,$(d),$(1)); $$(LD_ramstage) -o $$@ -r $$^ ) \ $(eval ramstage-objs:=$(d)ramstage.o $(filter-out $(call files-in-dir,$(d),$(1)),$(ramstage-objs)))) -romstage-c-ccopts:=-D__PRE_RAM__ -romstage-S-ccopts:=-D__PRE_RAM__ +romstage-generic-ccopts += -D__PRE_RAM__ ifeq ($(CONFIG_TRACE),y) ramstage-c-ccopts:= -finstrument-functions endif @@ -133,13 +132,10 @@ ifeq ($(CONFIG_USE_BLOBS),y) forgetthis:=$(if $(GIT),$(shell git submodule update --init --checkout 3rdparty)) endif -bootblock-c-ccopts:=-D__BOOT_BLOCK__ -D__PRE_RAM__ -bootblock-S-ccopts:=-D__BOOT_BLOCK__ -D__PRE_RAM__ +bootblock-generic-ccopts += -D__BOOT_BLOCK__ -D__PRE_RAM__ -smmstub-c-ccopts:=-D__SMM__ -smmstub-S-ccopts:=-D__SMM__ -smm-c-ccopts:=-D__SMM__ -smm-S-ccopts:=-D__SMM__ +smmstub-generic-ccopts += -D__SMM__ +smm-generic-ccopts += -D__SMM__ # SMM TSEG base is dynamic ifneq ($(CONFIG_SMM_MODULES),y) diff --git a/src/arch/arm64/armv8/secmon/Makefile.inc b/src/arch/arm64/armv8/secmon/Makefile.inc index a8d42b0..c61e876 100644 --- a/src/arch/arm64/armv8/secmon/Makefile.inc +++ b/src/arch/arm64/armv8/secmon/Makefile.inc @@ -28,8 +28,9 @@ SECMON_ELF=$(SECMON_DIR)/secmon.elf SECMON_RMOD=$(SECMON_DIR)/secmon.elf.rmod SECMON_RAMSTAGE=$(SECMON_DIR)/secmon.ramstage.o -secmon-c-ccopts += -I$(src)/arch/arm64/include/armv8/ -include $(src)/include/kconfig.h -D__SECMON__ -secmon-S-ccopts += -I$(src)/arch/arm64/include/armv8/ -include $(src)/include/kconfig.h -D__SECMON__ +secmon-generic-ccopts += -D__SECMON__ +secmon-c-ccopts += -I$(src)/arch/arm64/include/armv8/ -include $(src)/include/kconfig.h +secmon-S-ccopts += -I$(src)/arch/arm64/include/armv8/ -include $(src)/include/kconfig.h secmon-y += secmon_init.c secmon-y += psci.c diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc index d8c57fb..8cf84fe 100644 --- a/src/vendorcode/google/chromeos/Makefile.inc +++ b/src/vendorcode/google/chromeos/Makefile.inc @@ -96,8 +96,7 @@ VB_SOURCE := vboot_reference INCLUDES += -I$(VB_SOURCE)/firmware/2lib/include INCLUDES += -I$(VB_SOURCE)/firmware/include -verstage-c-ccopts += -D__PRE_RAM__ -D__VER_STAGE__ -verstage-S-ccopts += -D__PRE_RAM__ -D__VER_STAGE__ +verstage-generic-ccopts += -D__PRE_RAM__ -D__VER_STAGE__ ifeq ($(CONFIG_RETURN_FROM_VERSTAGE),y) bootblock-y += verstub.c chromeos.c

1 0

Patch merged into coreboot/master: b558902 util/genbuild_h: work around GNU date
by gerrit＠coreboot.org 29 Mar '15

29 Mar '15

the following patch was just integrated into master: commit b5589026c7eba0a0aef880e57d10f7134ab1837b Author: Idwer Vollering <vidwer(a)gmail.com> Date: Fri Mar 27 00:15:20 2015 +0100 util/genbuild_h: work around GNU date Confirmed to work on FreeBSD using sh from base and bash from ports. Verified to not break M.O. on Linux. Change-Id: I3bce724c889c7fb760b30b25e9fc0b74620e2c53 Signed-off-by: Idwer Vollering <vidwer(a)gmail.com> Reviewed-on: http://review.coreboot.org/9056 Tested-by: build bot (Jenkins) Reviewed-by: Alexander Couzens <lynxis(a)fe80.eu> Reviewed-by: Patrick Georgi <pgeorgi(a)google.com> See http://review.coreboot.org/9056 for details. -gerrit

1 0

Patch merged into coreboot/master: 00d4846 build system: remove intermediate link step in vboot
by gerrit＠coreboot.org 29 Mar '15

29 Mar '15

the following patch was just integrated into master: commit 00d48464b9d6b93680da686de02121ffd7d65ba2 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Fri Mar 27 14:08:03 2015 +0100 build system: remove intermediate link step in vboot This is inspired by the commit listed below, but rewritten to match upstream, and split in smaller pieces to keep intent clear. Change-Id: I5405c0ee6bee203281e723feaecaee57fad8f6cb Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> Based-On-Change-Id: I50af7dacf616e0f8ff4c43f4acc679089ad7022b Based-On-Signed-off-by: Julius Werner <jwerner(a)chromium.org> Based-On-Reviewed-on: https://chromium-review.googlesource.com/219170 Reviewed-on: http://review.coreboot.org/9109 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Reviewed-by: Aaron Durbin <adurbin(a)google.com> See http://review.coreboot.org/9109 for details. -gerrit

1 0

Patch merged into coreboot/master: 8688def mips: mips, not mipsel
by gerrit＠coreboot.org 29 Mar '15

29 Mar '15

the following patch was just integrated into master: commit 8688defd5094110bea0bbd0e3cec2752fdbd6386 Author: Patrick Georgi <pgeorgi(a)google.com> Date: Sat Mar 28 16:27:42 2015 +0100 mips: mips, not mipsel Change-Id: I49df089d3fd5f578702dcc32be08bf6245277a45 Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> Reviewed-on: http://review.coreboot.org/9149 Reviewed-by: Aaron Durbin <adurbin(a)google.com> Tested-by: build bot (Jenkins) See http://review.coreboot.org/9149 for details. -gerrit

1 0

Patch merged into coreboot/master: 99f1a61 mips: add verstage configuration
by gerrit＠coreboot.org 29 Mar '15

29 Mar '15

the following patch was just integrated into master: commit 99f1a61a421adc51eec4acf1509214479e8859e9 Author: Patrick Georgi <pgeorgi(a)google.com> Date: Sat Mar 28 16:01:14 2015 +0100 mips: add verstage configuration Change-Id: I79b4969c34500fd51b1ce2ad751bc0723ee0afa2 Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> Reviewed-on: http://review.coreboot.org/9147 Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin(a)google.com> See http://review.coreboot.org/9147 for details. -gerrit

1 0

Patch merged into coreboot/master: 0d06b2d crossgcc: Build mipsel-elf, not mips-elf
by gerrit＠coreboot.org 29 Mar '15

29 Mar '15

the following patch was just integrated into master: commit 0d06b2dee9912feb55f14100f9520ab242161059 Author: Patrick Georgi <pgeorgi(a)google.com> Date: Sat Mar 28 15:24:06 2015 +0100 crossgcc: Build mipsel-elf, not mips-elf The build system expects mipsel, and it's the more precise name, too. Change-Id: I9e1135385b3f1374b3179ecf5e11a1d60bc17ef7 Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> Reviewed-on: http://review.coreboot.org/9144 Reviewed-by: Aaron Durbin <adurbin(a)google.com> Tested-by: build bot (Jenkins) Reviewed-by: Alexander Couzens <lynxis(a)fe80.eu> Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> See http://review.coreboot.org/9144 for details. -gerrit

1 0

Patch merged into coreboot/master: 4785f2a arch/x86/boot/smbios: Rename fill_dimm_manufacturer and make public
by gerrit＠coreboot.org 29 Mar '15

29 Mar '15

the following patch was just integrated into master: commit 4785f2a358ea39d28086f85fdb7a9edeaf62dcba Author: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Date: Fri Mar 27 23:05:36 2015 -0500 arch/x86/boot/smbios: Rename fill_dimm_manufacturer and make public Change-Id: Ib85701965337bb6231d8df59d43789dfe8a036d3 Signed-off-by: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Reviewed-on: http://review.coreboot.org/9136 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin(a)google.com> Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> See http://review.coreboot.org/9136 for details. -gerrit

1 0

Patch merged into coreboot/master: 821217b arch/x86/boot/smbios: Add additional SMBIOS defines and enums
by gerrit＠coreboot.org 29 Mar '15

29 Mar '15

the following patch was just integrated into master: commit 821217b60fbaf58cdda6cfdc03d1f0fc1fc31011 Author: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Date: Fri Mar 27 22:47:25 2015 -0500 arch/x86/boot/smbios: Add additional SMBIOS defines and enums Change-Id: I337584d1f4ce32094c24478a99418e0775cf9ab5 Signed-off-by: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Reviewed-on: http://review.coreboot.org/9135 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin(a)google.com> See http://review.coreboot.org/9135 for details. -gerrit

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit March 2015