coreboot-gerrit July 2015

coreboot-gerrit@coreboot.org

1 participants
1048 discussions

New patch to review for coreboot: smscsuperio: map well-known interrupt in smscsuperio_enable_serial()
by Jonathan A. Kollasch 06 Jul '15

06 Jul '15

Jonathan A. Kollasch (jakllsch(a)kollasch.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10807 -gerrit commit ccc1e0d82fd1d99e82620c8c37c08f3f04fb6f5b Author: Jonathan A. Kollasch <jakllsch(a)kollasch.net> Date: Mon Jul 6 08:07:50 2015 -0500 smscsuperio: map well-known interrupt in smscsuperio_enable_serial() This is a stopgap for when you use SUPERIO_SMSC_SMSCSUPERIO and the interrupt is unmapped at reset, but for whatever reason the chip is inaccessible in smscsuperio/superio.c::enable_dev() and thus the devicetree.cb IRQ information is not applied in ramstage and then serial console output fails to work for more than the UART FIFO depth in the OS. Change-Id: I00998088975569516f7caeb7f4098b48fe437889 Signed-off-by: Jonathan A. Kollasch <jakllsch(a)kollasch.net> --- src/superio/smsc/smscsuperio/early_serial.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/superio/smsc/smscsuperio/early_serial.c b/src/superio/smsc/smscsuperio/early_serial.c index 3eb9347..fd26169 100644 --- a/src/superio/smsc/smscsuperio/early_serial.c +++ b/src/superio/smsc/smscsuperio/early_serial.c @@ -55,6 +55,10 @@ void smscsuperio_enable_serial(pnp_devfn_t dev, u16 iobase) pnp_set_logical_device(dev); pnp_set_enable(dev, 0); pnp_set_iobase(dev, PNP_IDX_IO0, iobase); + if (iobase == 0x03f8) + pnp_set_irq(dev, PNP_IDX_IRQ0, 4); + if (iobase == 0x02f8) + pnp_set_irq(dev, PNP_IDX_IRQ0, 3); pnp_set_enable(dev, 1); pnp_exit_conf_state(dev); }

1 0

New patch to review for coreboot: gitconfig: Improve robustness when blobs aren't present
by Patrick Georgi 06 Jul '15

06 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10806 -gerrit commit 3bab117b5dab2c3f3db6cb38c92b8ad16aa3d342 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Mon Jul 6 09:31:42 2015 +0000 gitconfig: Improve robustness when blobs aren't present With no blobs present the 'make gitconfig' target failed when trying to add a file to a directory which doesn't exist. Only try to deal with blobs if they're around. Change-Id: I27ed33e2e22bb1571bc73fe55cf45aa1e2310bf1 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- Makefile.inc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 2f1fe82..a6a8431 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -426,10 +426,11 @@ gitconfig: fi; \ done # Now set up thehooks for 3rdparty/blobs - if [ util/gitconfig/commit-msg -nt .git/modules/3rdparty/hooks/commit-msg -o \ - ! -x .git/modules/3rdparty/hooks/commit-msg ]; then \ - sed -e "s,%MAKE%,$(MAKE),g" util/gitconfig/commit-msg > .git/modules/3rdparty/hooks/commit-msg; \ - chmod +x .git/modules/3rdparty/hooks/commit-msg; \ + if [ -d .git/modules/3rdparty -a \ + $ util/gitconfig/commit-msg -nt .git/modules/3rdparty/hooks/commit-msg -o \ + ! -x .git/modules/3rdparty/hooks/commit-msg $ ]; then \ + sed -e "s,%MAKE%,$(MAKE),g" util/gitconfig/commit-msg > .git/modules/3rdparty/hooks/commit-msg; \ + chmod +x .git/modules/3rdparty/hooks/commit-msg; \ fi [ -d 3rdparty/blobs ] && cd 3rdparty/blobs && git config remote.origin.push HEAD:refs/for/master git config remote.origin.push HEAD:refs/for/master

1 0

New patch to review for coreboot: libpayload: update defconfigs
by Patrick Georgi 06 Jul '15

06 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10805 -gerrit commit 81bb47d471f3ae4453ac83926f74485987d8fec9 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Mon Jul 6 09:12:42 2015 +0000 libpayload: update defconfigs That way they don't need an initial 'make oldconfig' pass to be useful again. Change-Id: I3724fffab24b69478b8077f34e9d787555fd157b Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- payloads/libpayload/configs/config.arm64-generic | 14 +++++++++----- payloads/libpayload/configs/config.purin | 16 +++++++++++++--- payloads/libpayload/configs/config.veyron_brain | 11 +++++++---- payloads/libpayload/configs/config.veyron_danger | 11 +++++++---- payloads/libpayload/configs/defconfig | 13 ++++++++----- payloads/libpayload/configs/defconfig-arm | 15 ++++++++++----- payloads/libpayload/configs/defconfig-mips | 12 ++++++++---- 7 files changed, 62 insertions(+), 30 deletions(-) diff --git a/payloads/libpayload/configs/config.arm64-generic b/payloads/libpayload/configs/config.arm64-generic index 986ebe1..cca00b3 100644 --- a/payloads/libpayload/configs/config.arm64-generic +++ b/payloads/libpayload/configs/config.arm64-generic @@ -1,7 +1,6 @@ # -# Automatically generated make config: don't edit -# libpayload version: 0.2.0 -# Sat Mar 21 13:53:09 2015 +# Automatically generated file; DO NOT EDIT. +# Libpayload Configuration # # @@ -9,8 +8,9 @@ # # CONFIG_LP_GPL is not set # CONFIG_LP_EXPERIMENTAL is not set -# CONFIG_LP_OBSOLETE is not set # CONFIG_LP_DEVELOPER is not set +CONFIG_LP_COMPILER_GCC=y +# CONFIG_LP_COMPILER_LLVM_CLANG is not set CONFIG_LP_CHROMEOS=y # @@ -51,17 +51,21 @@ CONFIG_LP_TIMER_NONE=y # CONFIG_LP_TIMER_IPQ806X is not set # CONFIG_LP_TIMER_RK is not set # CONFIG_LP_TIMER_BG4CD is not set +# CONFIG_LP_TIMER_CYGNUS is not set # CONFIG_LP_TIMER_IMG_PISTACHIO is not set +# CONFIG_LP_TIMER_MTK is not set CONFIG_LP_USB=y # CONFIG_LP_USB_OHCI is not set CONFIG_LP_USB_EHCI=y CONFIG_LP_USB_XHCI=y +# CONFIG_LP_USB_XHCI_MTK_QUIRK is not set CONFIG_LP_USB_HID=y CONFIG_LP_USB_HUB=y +# CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT is not set CONFIG_LP_USB_MSC=y CONFIG_LP_USB_GEN_HUB=y -# CONFIG_LP_USB_DWC2 is not set # CONFIG_LP_USB_PCI is not set +# CONFIG_LP_UDC is not set # CONFIG_LP_BIG_ENDIAN is not set CONFIG_LP_LITTLE_ENDIAN=y # CONFIG_LP_IO_ADDRESS_SPACE is not set diff --git a/payloads/libpayload/configs/config.purin b/payloads/libpayload/configs/config.purin index e2d0d7c..74856a6 100644 --- a/payloads/libpayload/configs/config.purin +++ b/payloads/libpayload/configs/config.purin @@ -1,10 +1,16 @@ # +# Automatically generated file; DO NOT EDIT. +# Libpayload Configuration +# + +# # Generic Options # CONFIG_LP_GPL=y # CONFIG_LP_EXPERIMENTAL is not set -# CONFIG_LP_OBSOLETE is not set # CONFIG_LP_DEVELOPER is not set +CONFIG_LP_COMPILER_GCC=y +# CONFIG_LP_COMPILER_LLVM_CLANG is not set # CONFIG_LP_REMOTEGDB is not set CONFIG_LP_CHROMEOS=y @@ -14,6 +20,7 @@ CONFIG_LP_CHROMEOS=y CONFIG_LP_ARCH_ARM=y # CONFIG_LP_ARCH_X86 is not set # CONFIG_LP_ARCH_ARM64 is not set +# CONFIG_LP_ARCH_MIPS is not set # CONFIG_LP_MEMMAP_RAM_ONLY is not set # @@ -39,7 +46,6 @@ CONFIG_LP_8250_MMIO32_SERIAL_CONSOLE=y # CONFIG_LP_SERIAL_ACS_FALLBACK is not set # CONFIG_LP_VIDEO_CONSOLE is not set # CONFIG_LP_PC_KEYBOARD is not set -CONFIG_LP_CYGNUS_SERIAL_CONSOLE=y # # Drivers @@ -53,6 +59,9 @@ CONFIG_LP_CYGNUS_SERIAL_CONSOLE=y # CONFIG_LP_TIMER_RK is not set # CONFIG_LP_TIMER_BG4CD is not set CONFIG_LP_TIMER_CYGNUS=y +# CONFIG_LP_TIMER_IMG_PISTACHIO is not set +# CONFIG_LP_TIMER_MTK is not set +CONFIG_LP_IPROC_PERIPH_GLB_TIM_REG_BASE=0x19020200 CONFIG_LP_USB=y # CONFIG_LP_USB_OHCI is not set # CONFIG_LP_USB_EHCI is not set @@ -61,8 +70,9 @@ CONFIG_LP_USB=y # CONFIG_LP_USB_HID is not set # CONFIG_LP_USB_HUB is not set # CONFIG_LP_USB_MSC is not set -# CONFIG_LP_USB_PCI is not set # CONFIG_LP_USB_GEN_HUB is not set +# CONFIG_LP_USB_PCI is not set +# CONFIG_LP_UDC is not set # CONFIG_LP_BIG_ENDIAN is not set CONFIG_LP_LITTLE_ENDIAN=y # CONFIG_LP_IO_ADDRESS_SPACE is not set diff --git a/payloads/libpayload/configs/config.veyron_brain b/payloads/libpayload/configs/config.veyron_brain index 9366ef2..8843098 100644 --- a/payloads/libpayload/configs/config.veyron_brain +++ b/payloads/libpayload/configs/config.veyron_brain @@ -1,7 +1,6 @@ # -# Automatically generated make config: don't edit -# libpayload version: 0.2.0 -# Wed Oct 15 20:54:55 2014 +# Automatically generated file; DO NOT EDIT. +# Libpayload Configuration # # @@ -9,8 +8,9 @@ # CONFIG_LP_GPL=y # CONFIG_LP_EXPERIMENTAL is not set -# CONFIG_LP_OBSOLETE is not set # CONFIG_LP_DEVELOPER is not set +CONFIG_LP_COMPILER_GCC=y +# CONFIG_LP_COMPILER_LLVM_CLANG is not set # CONFIG_LP_REMOTEGDB is not set CONFIG_LP_CHROMEOS=y @@ -59,7 +59,9 @@ CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # CONFIG_LP_TIMER_IPQ806X is not set CONFIG_LP_TIMER_RK=y # CONFIG_LP_TIMER_BG4CD is not set +# CONFIG_LP_TIMER_CYGNUS is not set # CONFIG_LP_TIMER_IMG_PISTACHIO is not set +# CONFIG_LP_TIMER_MTK is not set CONFIG_LP_TIMER_RK_ADDRESS=0xff810020 CONFIG_LP_USB=y # CONFIG_LP_USB_OHCI is not set @@ -72,6 +74,7 @@ CONFIG_LP_USB_HUB=y CONFIG_LP_USB_MSC=y CONFIG_LP_USB_GEN_HUB=y # CONFIG_LP_USB_PCI is not set +# CONFIG_LP_UDC is not set # CONFIG_LP_BIG_ENDIAN is not set CONFIG_LP_LITTLE_ENDIAN=y # CONFIG_LP_IO_ADDRESS_SPACE is not set diff --git a/payloads/libpayload/configs/config.veyron_danger b/payloads/libpayload/configs/config.veyron_danger index 9366ef2..8843098 100644 --- a/payloads/libpayload/configs/config.veyron_danger +++ b/payloads/libpayload/configs/config.veyron_danger @@ -1,7 +1,6 @@ # -# Automatically generated make config: don't edit -# libpayload version: 0.2.0 -# Wed Oct 15 20:54:55 2014 +# Automatically generated file; DO NOT EDIT. +# Libpayload Configuration # # @@ -9,8 +8,9 @@ # CONFIG_LP_GPL=y # CONFIG_LP_EXPERIMENTAL is not set -# CONFIG_LP_OBSOLETE is not set # CONFIG_LP_DEVELOPER is not set +CONFIG_LP_COMPILER_GCC=y +# CONFIG_LP_COMPILER_LLVM_CLANG is not set # CONFIG_LP_REMOTEGDB is not set CONFIG_LP_CHROMEOS=y @@ -59,7 +59,9 @@ CONFIG_LP_COREBOOT_VIDEO_CONSOLE=y # CONFIG_LP_TIMER_IPQ806X is not set CONFIG_LP_TIMER_RK=y # CONFIG_LP_TIMER_BG4CD is not set +# CONFIG_LP_TIMER_CYGNUS is not set # CONFIG_LP_TIMER_IMG_PISTACHIO is not set +# CONFIG_LP_TIMER_MTK is not set CONFIG_LP_TIMER_RK_ADDRESS=0xff810020 CONFIG_LP_USB=y # CONFIG_LP_USB_OHCI is not set @@ -72,6 +74,7 @@ CONFIG_LP_USB_HUB=y CONFIG_LP_USB_MSC=y CONFIG_LP_USB_GEN_HUB=y # CONFIG_LP_USB_PCI is not set +# CONFIG_LP_UDC is not set # CONFIG_LP_BIG_ENDIAN is not set CONFIG_LP_LITTLE_ENDIAN=y # CONFIG_LP_IO_ADDRESS_SPACE is not set diff --git a/payloads/libpayload/configs/defconfig b/payloads/libpayload/configs/defconfig index a518da5..37bf50d 100644 --- a/payloads/libpayload/configs/defconfig +++ b/payloads/libpayload/configs/defconfig @@ -1,7 +1,6 @@ # -# Automatically generated make config: don't edit -# libpayload version: 0.2.0 -# Wed Mar 18 16:11:08 2015 +# Automatically generated file; DO NOT EDIT. +# Libpayload Configuration # # @@ -9,8 +8,9 @@ # # CONFIG_LP_GPL is not set # CONFIG_LP_EXPERIMENTAL is not set -# CONFIG_LP_OBSOLETE is not set # CONFIG_LP_DEVELOPER is not set +CONFIG_LP_COMPILER_GCC=y +# CONFIG_LP_COMPILER_LLVM_CLANG is not set # CONFIG_LP_CHROMEOS is not set # @@ -43,6 +43,7 @@ CONFIG_LP_8250_SERIAL_CONSOLE=y # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_8250_MMIO32_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set +# CONFIG_LP_BG4CD_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set CONFIG_LP_SERIAL_IOBASE=0x3f8 # CONFIG_LP_SERIAL_SET_SPEED is not set @@ -74,12 +75,14 @@ CONFIG_LP_USB_UHCI=y CONFIG_LP_USB_OHCI=y CONFIG_LP_USB_EHCI=y CONFIG_LP_USB_XHCI=y +# CONFIG_LP_USB_XHCI_MTK_QUIRK is not set CONFIG_LP_USB_HID=y CONFIG_LP_USB_HUB=y +# CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT is not set CONFIG_LP_USB_MSC=y CONFIG_LP_USB_GEN_HUB=y -# CONFIG_LP_USB_DWC2 is not set CONFIG_LP_USB_PCI=y +# CONFIG_LP_UDC is not set # CONFIG_LP_BIG_ENDIAN is not set CONFIG_LP_LITTLE_ENDIAN=y CONFIG_LP_IO_ADDRESS_SPACE=y diff --git a/payloads/libpayload/configs/defconfig-arm b/payloads/libpayload/configs/defconfig-arm index 750c0bd..fa7e4f6 100644 --- a/payloads/libpayload/configs/defconfig-arm +++ b/payloads/libpayload/configs/defconfig-arm @@ -1,7 +1,6 @@ # -# Automatically generated make config: don't edit -# libpayload version: 0.2.0 -# Wed Mar 18 16:11:16 2015 +# Automatically generated file; DO NOT EDIT. +# Libpayload Configuration # # @@ -9,8 +8,9 @@ # # CONFIG_LP_GPL is not set # CONFIG_LP_EXPERIMENTAL is not set -# CONFIG_LP_OBSOLETE is not set # CONFIG_LP_DEVELOPER is not set +CONFIG_LP_COMPILER_GCC=y +# CONFIG_LP_COMPILER_LLVM_CLANG is not set # CONFIG_LP_CHROMEOS is not set # @@ -42,6 +42,7 @@ CONFIG_LP_SERIAL_CONSOLE=y # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_8250_MMIO32_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set +# CONFIG_LP_BG4CD_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set CONFIG_LP_VIDEO_CONSOLE=y @@ -62,17 +63,21 @@ CONFIG_LP_TIMER_NONE=y # CONFIG_LP_TIMER_IPQ806X is not set # CONFIG_LP_TIMER_RK is not set # CONFIG_LP_TIMER_BG4CD is not set +# CONFIG_LP_TIMER_CYGNUS is not set # CONFIG_LP_TIMER_IMG_PISTACHIO is not set +# CONFIG_LP_TIMER_MTK is not set CONFIG_LP_USB=y CONFIG_LP_USB_OHCI=y CONFIG_LP_USB_EHCI=y CONFIG_LP_USB_XHCI=y +# CONFIG_LP_USB_XHCI_MTK_QUIRK is not set CONFIG_LP_USB_HID=y CONFIG_LP_USB_HUB=y +# CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT is not set CONFIG_LP_USB_MSC=y CONFIG_LP_USB_GEN_HUB=y -# CONFIG_LP_USB_DWC2 is not set # CONFIG_LP_USB_PCI is not set +# CONFIG_LP_UDC is not set # CONFIG_LP_BIG_ENDIAN is not set CONFIG_LP_LITTLE_ENDIAN=y # CONFIG_LP_IO_ADDRESS_SPACE is not set diff --git a/payloads/libpayload/configs/defconfig-mips b/payloads/libpayload/configs/defconfig-mips index 76b8474..0b05f87 100644 --- a/payloads/libpayload/configs/defconfig-mips +++ b/payloads/libpayload/configs/defconfig-mips @@ -1,7 +1,6 @@ # -# Automatically generated make config: don't edit -# libpayload version: 0.2.0 -# Sat Mar 21 10:22:59 2015 +# Automatically generated file; DO NOT EDIT. +# Libpayload Configuration # # @@ -9,8 +8,9 @@ # # CONFIG_LP_GPL is not set # CONFIG_LP_EXPERIMENTAL is not set -# CONFIG_LP_OBSOLETE is not set # CONFIG_LP_DEVELOPER is not set +CONFIG_LP_COMPILER_GCC=y +# CONFIG_LP_COMPILER_LLVM_CLANG is not set # CONFIG_LP_CHROMEOS is not set # @@ -42,6 +42,7 @@ CONFIG_LP_8250_SERIAL_CONSOLE=y # CONFIG_LP_S5P_SERIAL_CONSOLE is not set # CONFIG_LP_8250_MMIO32_SERIAL_CONSOLE is not set # CONFIG_LP_IPQ806X_SERIAL_CONSOLE is not set +# CONFIG_LP_BG4CD_SERIAL_CONSOLE is not set # CONFIG_LP_PL011_SERIAL_CONSOLE is not set # CONFIG_LP_SERIAL_SET_SPEED is not set # CONFIG_LP_SERIAL_ACS_FALLBACK is not set @@ -65,9 +66,12 @@ CONFIG_LP_STORAGE_ATAPI=y # CONFIG_LP_TIMER_IPQ806X is not set # CONFIG_LP_TIMER_RK is not set # CONFIG_LP_TIMER_BG4CD is not set +# CONFIG_LP_TIMER_CYGNUS is not set CONFIG_LP_TIMER_IMG_PISTACHIO=y +# CONFIG_LP_TIMER_MTK is not set # CONFIG_LP_USB is not set # CONFIG_LP_USB_GEN_HUB is not set +# CONFIG_LP_UDC is not set # CONFIG_LP_BIG_ENDIAN is not set CONFIG_LP_LITTLE_ENDIAN=y # CONFIG_LP_IO_ADDRESS_SPACE is not set

1 0

New patch to review for coreboot: libpayload: don't overwrite CFLAGS
by Patrick Georgi 06 Jul '15

06 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10804 -gerrit commit d68d16a79ae323fa33b82974df277676e0e569b3 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Mon Jul 6 09:09:30 2015 +0000 libpayload: don't overwrite CFLAGS Makefile already sets it to contain the architecture specific flags, don't drop them, but add to that instead. Change-Id: I147e6480ab2b3c1ee4f4ace511197b4ba94280b8 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- payloads/libpayload/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc index 05754fe..c8a49fc 100644 --- a/payloads/libpayload/Makefile.inc +++ b/payloads/libpayload/Makefile.inc @@ -57,7 +57,7 @@ subdirs-$(CONFIG_LP_LZMA) += liblzma INCLUDES := -Iinclude -Iinclude/$(ARCHDIR-y) -I$(obj) -include include/kconfig.h -CFLAGS = $(EXTRA_CFLAGS) $(INCLUDES) -Os -pipe -nostdinc -ggdb3 +CFLAGS += $(EXTRA_CFLAGS) $(INCLUDES) -Os -pipe -nostdinc -ggdb3 CFLAGS += -nostdlib -fno-builtin -ffreestanding -fomit-frame-pointer CFLAGS += -ffunction-sections -fdata-sections CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes

1 0

New patch to review for coreboot: libpayload: architecture mapping is now done in xcompile
by Patrick Georgi 06 Jul '15

06 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10803 -gerrit commit 5b46b408ced5b0916cedcaa176446052dadd699a Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Mon Jul 6 09:07:11 2015 +0000 libpayload: architecture mapping is now done in xcompile This helps the build system find i386 and mips compilers. Change-Id: I17d18019b556190f860d288e66f368f8d29ca24d Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- payloads/libpayload/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index 92efd73..2b9bbcb 100644 --- a/payloads/libpayload/Makefile +++ b/payloads/libpayload/Makefile @@ -110,12 +110,12 @@ ARCHDIR-$(CONFIG_LP_ARCH_X86) := x86 ARCH-y := $(ARCHDIR-y) -# If architecture folder name is different from GCC binutils architecture name, +# If architecture folder name is different from xcompile architecture name, # override here. ARCH-$(CONFIG_LP_ARCH_ARM) := arm ARCH-$(CONFIG_LP_ARCH_ARM64) := arm64 -ARCH-$(CONFIG_LP_ARCH_X86) := i386 -ARCH-$(CONFIG_LP_ARCH_MIPS) := mipsel +ARCH-$(CONFIG_LP_ARCH_X86) := x86_32 +ARCH-$(CONFIG_LP_ARCH_MIPS) := mips CC := $(CC_$(ARCH-y)) AS := $(AS_$(ARCH-y))

1 0

New patch to review for coreboot: libpayload: drop LIBGCC_FILE_NAME variable
by Patrick Georgi 06 Jul '15

06 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10802 -gerrit commit ebe73ba9b84e55c0f8517d22276082a280952fe1 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Mon Jul 6 09:06:27 2015 +0000 libpayload: drop LIBGCC_FILE_NAME variable It's unused. If we need something like that, .xcompile provides it, and in a cross-platform and clang-aware way. Change-Id: Ic1bdc2e3e252d612a5b99ad4e8caebc5158a485f Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- payloads/libpayload/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index 252075f..92efd73 100644 --- a/payloads/libpayload/Makefile +++ b/payloads/libpayload/Makefile @@ -129,9 +129,6 @@ AR := $(AR_$(ARCH-y)) CFLAGS += $(CFLAGS_$(ARCH-y)) -LIBGCC_FILE_NAME := $(shell test -r `$(CC) -print-libgcc-file-name` && \ - $(CC) -print-libgcc-file-name) - # Three cases where we don't need fully populated $(obj) lists: # 1. when no .config exists # 2. when make config (in any flavour) is run @@ -283,7 +280,6 @@ printall: @echo alldirs:=$(alldirs) @echo allsrcs=$(allsrcs) @echo DEPENDENCIES=$(DEPENDENCIES) - @echo LIBGCC_FILE_NAME=$(LIBGCC_FILE_NAME) @$(foreach class,$(special-classes),echo $(class):='$($(class))'; ) endif

1 0

New patch to review for coreboot: libpayload: defer including .xcompile
by Patrick Georgi 06 Jul '15

06 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10801 -gerrit commit 2e7d1f3f6be7643dc38f26bb6a281cc4b17ce9e8 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Mon Jul 6 09:05:48 2015 +0000 libpayload: defer including .xcompile It needs to come after DOTCONFIG so that the compiler decision can be made. Change-Id: I5c6730ac58ab8731f07bb7c5161b2d0a59588e28 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- payloads/libpayload/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index 1c3cd8d..252075f 100644 --- a/payloads/libpayload/Makefile +++ b/payloads/libpayload/Makefile @@ -34,8 +34,13 @@ ifeq ($(INNER_SCANBUILD),y) CC_real:=$(CC) endif -$(if $(wildcard .xcompile),,$(eval $(shell bash util/xcompile/xcompile > .xcompile))) -include .xcompile +# in addition to the dependency below, create the file if it doesn't exist +# to silence stupid warnings about a file that would be generated anyway. +$(if $(wildcard .xcompile),,$(eval $(shell util/xcompile/xcompile $(XGCCPATH) > .xcompile))) + +.xcompile: util/xcompile/xcompile + $< $(XGCCPATH) > $@.tmp + \mv -f $@.tmp $@ 2> /dev/null ifeq ($(INNER_SCANBUILD),y) CC:=$(CC_real) @@ -96,6 +101,8 @@ include $(srck)/Makefile include $(HAVE_DOTCONFIG) +include .xcompile + ARCHDIR-$(CONFIG_LP_ARCH_ARM) := arm ARCHDIR-$(CONFIG_LP_ARCH_ARM64) := arm64 ARCHDIR-$(CONFIG_LP_ARCH_MIPS) := mips

1 0

New patch to review for coreboot: libpayload: Add compiler switch
by Patrick Georgi 06 Jul '15

06 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10800 -gerrit commit 4273fc8230918026492ecfb4baada4df6023d878 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Mon Jul 6 09:04:42 2015 +0000 libpayload: Add compiler switch clang is totally untested, but it mirrors coreboot now. Change-Id: I0e13ff8bba2007159a4a795ca07d187504b606b2 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- payloads/libpayload/Kconfig | 23 +++++++++++++++++++++++ payloads/libpayload/util/xcompile/xcompile | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/payloads/libpayload/Kconfig b/payloads/libpayload/Kconfig index 77d4f6b..9f02ec9 100644 --- a/payloads/libpayload/Kconfig +++ b/payloads/libpayload/Kconfig @@ -55,6 +55,29 @@ config DEVELOPER Prompt for developer options. These options are only interesting for libpayload developers. +choice + prompt "Compiler to use" + default COMPILER_GCC + help + This option allows you to select the compiler used for building + coreboot. + +config COMPILER_GCC + bool "GCC" + help + Use the GNU Compiler Collection (GCC) to build coreboot. + + For details see http://gcc.gnu.org. + +config COMPILER_LLVM_CLANG + bool "LLVM/clang" + help + Use LLVM/clang to build coreboot. + + For details see http://clang.llvm.org. + +endchoice + config REMOTEGDB bool "Remote GDB stub" default n diff --git a/payloads/libpayload/util/xcompile/xcompile b/payloads/libpayload/util/xcompile/xcompile index 1af02ad..b6759a9 100755 --- a/payloads/libpayload/util/xcompile/xcompile +++ b/payloads/libpayload/util/xcompile/xcompile @@ -182,7 +182,7 @@ report_arch_toolchain() { # elf${TWIDTH}-${TBFDARCH} toolchain (${GCC}) ARCH_SUPPORTED+=${TARCH} SUBARCH_SUPPORTED+=${TSUPP-${TARCH}} -ifeq (\$(CONFIG_COMPILER_GCC),y) +ifeq (\$(CONFIG_LP_COMPILER_GCC),y) CC_${TARCH}:=${GCC} CFLAGS_${TARCH}:=${CFLAGS_GCC} COMPILER_RT_${TARCH}:=${CC_RT_GCC}

1 0

New patch to review for coreboot: libpayload: mark util/xcompile/xcompile executable
by Patrick Georgi 06 Jul '15

06 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10799 -gerrit commit bad429bb18169ff213327dc486f3dbfe360a01a4 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Mon Jul 6 09:02:51 2015 +0000 libpayload: mark util/xcompile/xcompile executable Change-Id: I97088df1550f580d4648c7cccbd81c696fcfe2dc Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- payloads/libpayload/util/xcompile/xcompile | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/payloads/libpayload/util/xcompile/xcompile b/payloads/libpayload/util/xcompile/xcompile old mode 100644 new mode 100755

1 0

Patch merged into coreboot/master: veyron*: Kill SKIP_DISPLAY_INIT_HACK
by gerrit＠coreboot.org 06 Jul '15

06 Jul '15

the following patch was just integrated into master: commit 1f440f60fbc99050ef24fe94b539564c93e56678 Author: David Hendricks <dhendrix(a)chromium.org> Date: Thu Jun 25 17:10:00 2015 -0700 veyron*: Kill SKIP_DISPLAY_INIT_HACK Now that we have functioning display code for all platforms, we can just get rid of this ugly hack used on non-Chromebook veyrons. BUG=none BRANCH=none TEST=built for Brain, Rialto, Mickey, Romy Change-Id: Ibe248c7cc74940811345c249d66992d74fe85fe5 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> Original-Commit-Id: 9c627b087ba9fc07b4ec4a6d55d2e0203bdd4ff5 Original-Change-Id: I946eddb4e8ce1dbaa20212a2bb417e71a31b2ba3 Original-Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/282049 Original-Reviewed-by: Julius Werner <jwerner(a)chromium.org> Reviewed-on: http://review.coreboot.org/10785 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Reviewed-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> See http://review.coreboot.org/10785 for details. -gerrit

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit July 2015