coreboot-gerrit December 2014

coreboot-gerrit@coreboot.org

1 participants
1346 discussions

Patch set updated for coreboot: 262a837 fsp_baytrail: update for UPD_DEVICE_CHECK macro
by Martin Roth 03 Dec '14

03 Dec '14

Martin Roth (gaumless(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7498 -gerrit commit 262a83743beec753a82d1647e0a6c5769e9afb8e Author: Martin Roth <martin.roth(a)se-eng.com> Date: Sun Nov 16 20:53:14 2014 -0700 fsp_baytrail: update for UPD_DEVICE_CHECK macro - Update chipset_fsp_util.c to use the UPD_DEVICE_CHECK macro. This makes the code more standardized and easier to read. - Add some debug printing that was removed in the transition. Change-Id: Iea24dd9ca53f39791bc6371291a3fa7a6fc5ed0f Signed-off-by: Martin Roth <martin.roth(a)se-eng.com> --- src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c | 184 ++++++---------------- 1 file changed, 52 insertions(+), 132 deletions(-) diff --git a/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c b/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c index bec3c07..623a7ca 100644 --- a/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c +++ b/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c @@ -65,6 +65,19 @@ const PCH_AZALIA_CONFIG mAzaliaConfig = { typedef struct soc_intel_fsp_baytrail_config config_t; +static const char *acpi_pci_mode_strings[] = { + "Disabled", + "Enabled in PCI Mode", + "Enabled in ACPI Mode" +}; + +static const char *emmc_mode_strings[] = { + "Disabled", + "Auto", + "eMMC 4.1", + "eMMC 4.5" +}; + /** * Update the UPD data based on values from devicetree.cb * @@ -132,6 +145,25 @@ static void ConfigureDefaultUpdData(FSP_INFO_HEADER *FspInfo, UPD_DATA_REGION *U continue; switch (dev->path.pci.devfn) { + UPD_DEVICE_CHECK(SDIO_DEV_FUNC, PcdEnableSdio, "Sdio:\t\t\t"); + UPD_DEVICE_CHECK(SD_DEV_FUNC, PcdEnableSdcard, "Sdcard:\t\t\t"); + UPD_DEVICE_CHECK(SIO_DMA1_DEV_FUNC, PcdEnableDma0, "SIO Dma 0:\t\t"); + UPD_DEVICE_CHECK(I2C1_DEV_FUNC, PcdEnableI2C0, "SIO I2C0:\t\t"); + UPD_DEVICE_CHECK(I2C2_DEV_FUNC, PcdEnableI2C1, "SIO I2C1:\t\t"); + UPD_DEVICE_CHECK(I2C3_DEV_FUNC, PcdEnableI2C2, "SIO I2C2:\t\t"); + UPD_DEVICE_CHECK(I2C4_DEV_FUNC, PcdEnableI2C3, "SIO I2C3:\t\t"); + UPD_DEVICE_CHECK(I2C5_DEV_FUNC, PcdEnableI2C4, "SIO I2C4:\t\t"); + UPD_DEVICE_CHECK(I2C6_DEV_FUNC, PcdEnableI2C5, "SIO I2C5:\t\t"); + UPD_DEVICE_CHECK(I2C7_DEV_FUNC, PcdEnableI2C6, "SIO I2C6:\t\t"); + UPD_DEVICE_CHECK(SIO_DMA2_DEV_FUNC, PcdEnableDma1, "SIO Dma1:\t\t"); + UPD_DEVICE_CHECK(PWM1_DEV_FUNC, PcdEnablePwm0, "Pwm0:\t\t\t"); + UPD_DEVICE_CHECK(PWM2_DEV_FUNC, PcdEnablePwm1, "Pwm1:\t\t\t"); + UPD_DEVICE_CHECK(HSUART1_DEV_FUNC, PcdEnableHsuart0, "Hsuart0:\t\t"); + UPD_DEVICE_CHECK(HSUART2_DEV_FUNC, PcdEnableHsuart1, "Hsuart1:\t\t"); + UPD_DEVICE_CHECK(SPI_DEV_FUNC, PcdEnableSpi, "Spi:\t\t\t"); + UPD_DEVICE_CHECK(SATA_DEV_FUNC, PcdEnableSata, "SATA:\t\t\t"); + UPD_DEVICE_CHECK(HDA_DEV_FUNC, PcdEnableAzalia, "Azalia:\t\t\t"); + case MIPI_DEV_FUNC: /* Camera / Image Signal Processing */ if (FspInfo->ImageRevision >= FSP_GOLD3_REV_ID) { UpdData->ISPEnable = dev->enabled; @@ -150,151 +182,39 @@ static void ConfigureDefaultUpdData(FSP_INFO_HEADER *FspInfo, UPD_DATA_REGION *U (config->PcdeMMCBootMode == EMMC_FOLLOWS_DEVICETREE)) UpdData->PcdeMMCBootMode = EMMC_4_1 - EMMC_DISABLED; break; - case SDIO_DEV_FUNC: - UpdData->PcdEnableSdio = dev->enabled; - printk(BIOS_DEBUG, "Sdio:\t\t\t%s\n", - UpdData->PcdEnableSdio?"Enabled":"Disabled"); - break; - case SD_DEV_FUNC: - UpdData->PcdEnableSdcard = dev->enabled; - printk(BIOS_DEBUG, "Sdcard:\t\t\t%s\n", - UpdData->PcdEnableSdcard?"Enabled":"Disabled"); - break; - case SATA_DEV_FUNC: - UpdData->PcdEnableSata = dev->enabled; - printk(BIOS_DEBUG, "Sata:\t\t\t%s\n", - UpdData->PcdEnableSata?"Enabled":"Disabled"); - if (UpdData->PcdEnableSata) - printk(BIOS_DEBUG, "SATA Mode:\t\t%s\n", - UpdData->PcdSataMode?"AHCI":"IDE"); - break; - case XHCI_DEV_FUNC: - UpdData->PcdEnableXhci = dev->enabled; - break; - case LPE_DEV_FUNC: - if (dev->enabled && config->LpeAcpiModeEnable == - LPE_ACPI_MODE_ENABLED) - UpdData->PcdEnableLpe = LPE_ACPI_MODE_ENABLED; - else - UpdData->PcdEnableLpe = dev->enabled; - printk(BIOS_DEBUG, "Lpe:\t\t\t%s\n", - UpdData->PcdEnableLpe?"Enabled":"Disabled"); - printk(BIOS_DEBUG, "Lpe mode:\t\t%s\n", - UpdData->PcdEnableLpe == LPE_ACPI_MODE_ENABLED? - "ACPI":"PCI"); - break; case MMC45_DEV_FUNC: /* MMC 4.5*/ if ((dev->enabled) && (config->PcdeMMCBootMode == EMMC_FOLLOWS_DEVICETREE)) UpdData->PcdeMMCBootMode = EMMC_4_5 - EMMC_DISABLED; break; - case SIO_DMA1_DEV_FUNC: - UpdData->PcdEnableDma0 = dev->enabled; - printk(BIOS_DEBUG, "SIO Dma 0:\t\t%s\n", - UpdData->PcdEnableDma0?"Enabled":"Disabled"); - break; - case I2C1_DEV_FUNC: - UpdData->PcdEnableI2C0 = dev->enabled; - printk(BIOS_DEBUG, "SIO I2C0:\t\t%s\n", - UpdData->PcdEnableI2C0?"Enabled":"Disabled"); - break; - case I2C2_DEV_FUNC: - UpdData->PcdEnableI2C1 = dev->enabled; - printk(BIOS_DEBUG, "SIO I2C1:\t\t%s\n", - UpdData->PcdEnableI2C1?"Enabled":"Disabled"); - break; - case I2C3_DEV_FUNC: - UpdData->PcdEnableI2C2 = dev->enabled; - printk(BIOS_DEBUG, "SIO I2C2:\t\t%s\n", - UpdData->PcdEnableI2C2?"Enabled":"Disabled"); - break; - case I2C4_DEV_FUNC: - UpdData->PcdEnableI2C3 = dev->enabled; - printk(BIOS_DEBUG, "SIO I2C3:\t\t%s\n", - UpdData->PcdEnableI2C3?"Enabled":"Disabled"); - break; - case I2C5_DEV_FUNC: - UpdData->PcdEnableI2C4 = dev->enabled; - printk(BIOS_DEBUG, "SIO I2C4:\t\t%s\n", - UpdData->PcdEnableI2C4?"Enabled":"Disabled"); - break; - case I2C6_DEV_FUNC: - UpdData->PcdEnableI2C5 = dev->enabled; - printk(BIOS_DEBUG, "SIO I2C5:\t\t%s\n", - UpdData->PcdEnableI2C5?"Enabled":"Disabled"); - break; - case I2C7_DEV_FUNC: - UpdData->PcdEnableI2C6 = dev->enabled; - printk(BIOS_DEBUG, "SIO I2C6:\t\t%s\n", - UpdData->PcdEnableI2C6?"Enabled":"Disabled"); - break; - case TXE_DEV_FUNC: /* TXE */ - break; - case HDA_DEV_FUNC: - if (config->AzaliaAutoEnable) { - UpdData->PcdEnableAzalia = 2; - printk(BIOS_DEBUG, "Azalia:\t\t\tAuto\n"); - } else { - UpdData->PcdEnableAzalia = dev->enabled; - printk(BIOS_DEBUG, "Azalia:\t\t\t%s\n", - UpdData->PcdEnableAzalia?"Enabled":"Disabled"); - } - break; - case PCIE_PORT1_DEV_FUNC: - case PCIE_PORT2_DEV_FUNC: - case PCIE_PORT3_DEV_FUNC: - case PCIE_PORT4_DEV_FUNC: + case XHCI_DEV_FUNC: + UpdData->PcdEnableXhci = dev->enabled; break; case EHCI_DEV_FUNC: UpdData->PcdEnableXhci = !(dev->enabled); break; - case SIO_DMA2_DEV_FUNC: - UpdData->PcdEnableDma1 = dev->enabled; - printk(BIOS_DEBUG, "SIO Dma1:\t\t%s\n", - UpdData->PcdEnableDma1?"Enabled":"Disabled"); - break; - case PWM1_DEV_FUNC: - UpdData->PcdEnablePwm0 = dev->enabled; - printk(BIOS_DEBUG, "Pwm0\t\t\t%s\n", - UpdData->PcdEnablePwm0?"Enabled":"Disabled"); - break; - case PWM2_DEV_FUNC: - UpdData->PcdEnablePwm1 = dev->enabled; - printk(BIOS_DEBUG, "Pwm1:\t\t\t%s\n", - UpdData->PcdEnablePwm1?"Enabled":"Disabled"); - break; - case HSUART1_DEV_FUNC: - UpdData->PcdEnableHsuart0 = dev->enabled; - printk(BIOS_DEBUG, "Hsuart0:\t\t%s\n", - UpdData->PcdEnableHsuart0?"Enabled":"Disabled"); - break; - case HSUART2_DEV_FUNC: - UpdData->PcdEnableHsuart1 = dev->enabled; - printk(BIOS_DEBUG, "Hsuart1:\t\t%s\n", - UpdData->PcdEnableHsuart1?"Enabled":"Disabled"); - break; - case SPI_DEV_FUNC: - UpdData->PcdEnableSpi = dev->enabled; - printk(BIOS_DEBUG, "Spi:\t\t\t%s\n", - UpdData->PcdEnableSpi?"Enabled":"Disabled"); - break; - case LPC_DEV_FUNC: /* LPC */ - break; - case SMBUS_DEV_FUNC: + + case LPE_DEV_FUNC: + if (dev->enabled) + UpdData->PcdEnableLpe = config->LpeAcpiModeEnable; + else + UpdData->PcdEnableLpe = 0; break; } } - if(UpdData->PcdeMMCBootMode == EMMC_AUTO - EMMC_DISABLED) { - printk(BIOS_DEBUG, "eMMC Mode:\t\tAuto"); - } else { - printk(BIOS_DEBUG, "eMMC 4.1:\t\t%s\n", - UpdData->PcdeMMCBootMode == EMMC_4_1 - EMMC_DISABLED? - "Enabled":"Disabled"); - printk(BIOS_DEBUG, "eMMC 4.5:\t\t%s\n", - UpdData->PcdeMMCBootMode == EMMC_4_5 - EMMC_DISABLED? - "Enabled":"Disabled"); - } + if (UpdData->PcdEnableLpe < sizeof(acpi_pci_mode_strings) / sizeof (char *)) + printk(BIOS_DEBUG, "Lpe:\t\t\t%s\n", + acpi_pci_mode_strings[UpdData->PcdEnableLpe]); + + if (UpdData->PcdeMMCBootMode < sizeof(emmc_mode_strings) / sizeof (char *)) + printk(BIOS_DEBUG, "eMMC Mode:\t\t%s", + emmc_mode_strings[UpdData->PcdeMMCBootMode]); + + if (UpdData->PcdEnableSata) + printk(BIOS_DEBUG, "SATA Mode:\t\t%s\n", + UpdData->PcdSataMode?"AHCI":"IDE"); + printk(BIOS_DEBUG, "Xhci:\t\t\t%s\n", UpdData->PcdEnableXhci?"Enabled":"Disabled");

1 0

Patch merged into coreboot/master: 3f382c7 SPI: Add Macronix part MX25U12835F
by gerrit＠coreboot.org 03 Dec '14

03 Dec '14

the following patch was just integrated into master: commit 3f382c7c088d8abaecffd7a6def80b2150150938 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Tue Nov 11 15:01:31 2014 +0200 SPI: Add Macronix part MX25U12835F Change-Id: I82482419afdf536a19b99c79131fa5844aaaec07 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Reviewed-on: http://review.coreboot.org/7432 Reviewed-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Tested-by: build bot (Jenkins) See http://review.coreboot.org/7432 for details. -gerrit

1 0

New patch to review for coreboot: 875b9c4 spi/macronix: Add support for MX25L3239E
by Dave Frodin 02 Dec '14

02 Dec '14

Dave Frodin (dave.frodin(a)se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7631 -gerrit commit 875b9c4cfc31fad406fd3b1292d85fd96f9c11c5 Author: Dave Frodin <dave.frodin(a)se-eng.com> Date: Mon Nov 24 10:37:29 2014 -0700 spi/macronix: Add support for MX25L3239E Also update comment for the MX25L3236D part. Change-Id: Ifaeeb71e7672a8db55bbb66e6ce7316e2893478d Signed-off-by: Dave Frodin <dave.frodin(a)se-eng.com> --- src/drivers/spi/macronix.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/drivers/spi/macronix.c b/src/drivers/spi/macronix.c index c9338ed..bb2e0a3 100644 --- a/src/drivers/spi/macronix.c +++ b/src/drivers/spi/macronix.c @@ -93,7 +93,7 @@ static const struct macronix_spi_flash_params macronix_spi_flash_table[] = { .pages_per_sector = 16, .sectors_per_block = 16, .nr_blocks = 64, - .name = "MX25L3235D", /* MX25L3225D/MX25L3235D/MX25L3237D */ + .name = "MX25L3235D", /* MX25L3225D/MX25L3235D/MX25L3236D/MX25L3237D */ }, { .idcode = 0x2017, @@ -135,6 +135,14 @@ static const struct macronix_spi_flash_params macronix_spi_flash_table[] = { .nr_blocks = 128, .name = "MX25L6495F", }, + { + .idcode = 0x2536, + .page_size = 256, + .pages_per_sector = 16, + .sectors_per_block = 16, + .nr_blocks = 64, + .name = "MX25L3239E", + }, }; static int macronix_write(struct spi_flash *flash,

1 0

New patch to review for coreboot: a25ae15 northbridge/amd: Add the audio device to the PCI devices
by Dave Frodin 02 Dec '14

02 Dec '14

Dave Frodin (dave.frodin(a)se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7630 -gerrit commit a25ae1555e949155aa565b97dcf2f9d0c4deace2 Author: Dave Frodin <dave.frodin(a)se-eng.com> Date: Mon Dec 1 15:20:47 2014 -0700 northbridge/amd: Add the audio device to the PCI devices Change-Id: I826f98e450c9a614930a5e83c7c6bfb4ccdc5984 Signed-off-by: Dave Frodin <dave.frodin(a)se-eng.com> --- src/northbridge/amd/agesa/family16kb/pci_devs.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/northbridge/amd/agesa/family16kb/pci_devs.h b/src/northbridge/amd/agesa/family16kb/pci_devs.h index be0f524..c0ed306 100644 --- a/src/northbridge/amd/agesa/family16kb/pci_devs.h +++ b/src/northbridge/amd/agesa/family16kb/pci_devs.h @@ -27,6 +27,10 @@ #define GFX_FUNC 0 #define GFX_DEVFN PCI_DEVFN(GFX_DEV,GFX_FUNC) +/* Internal Audio Controller */ +#define ACTL_FUNC 1 +#define ACTL_DEVFN PCI_DEVFN(GFX_DEV,ACTL_FUNC) + /* PCIe Ports */ #define NB_PCIE_PORT1_DEV 0x1 #define NB_PCIE_PORT2_DEV 0x2

1 0

Patch set updated for coreboot: f93ee69 build system: collect compiler configuration in xcompile
by Patrick Georgi 02 Dec '14

02 Dec '14

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7612 -gerrit commit f93ee69c8fd4419328da4d5f9c5376b3b7eb02dc Author: Patrick Georgi <pgeorgi(a)google.com> Date: Sat Nov 29 14:16:07 2014 +0100 build system: collect compiler configuration in xcompile Move clang specifics and compiler runtime handling to xcompile. Change-Id: I0f12f755420f315127e6d9adc00b1246c6e7131b Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- Makefile | 23 +--------------- src/arch/x86/Makefile.inc | 2 -- toolchain.inc | 15 +++-------- util/xcompile/xcompile | 67 +++++++++++++++++++++++++++++++++++------------ 4 files changed, 55 insertions(+), 52 deletions(-) diff --git a/Makefile b/Makefile index eaba3e4..19d65f4 100644 --- a/Makefile +++ b/Makefile @@ -37,8 +37,6 @@ $(if $(wildcard .xcompile),,$(eval $(shell util/xcompile/xcompile $(XGCCPATH) > .xcompile: util/xcompile/xcompile A=`mktemp $@.XXXXXX`; $< $(XGCCPATH) > $$A && mv $$A $@ 2> /dev/null -include .xcompile - export top := $(CURDIR) export src := src export srck := $(top)/util/kconfig @@ -112,31 +110,12 @@ real-all: config else include $(HAVE_DOTCONFIG) - -ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y) -# FIXME: armv7/aarch64 won't build right now -# NOTE: clang puts compiler-rt under lib/linux/libclang_rt.builtins-i386.a -# this means the triple is i386-linux-elf instead of i386-none-elf -CFLAGS_x86_32 = -no-integrated-as -Qunused-arguments -target i386-linux-elf -m32 -CC_x86_32:=clang -HOSTCC := clang +include .xcompile ifneq ($(CONFIG_MMX),y) CFLAGS_x86_32 += -mno-mmx endif -# FIXME: we end up with conflicting flags with this, not clear on this part. -#ifneq ($(CONFIG_SSE),y) -#CFLAGS_x86_32 += -mno-sse -#endif - -CFLAGS_arm = -no-integrated-as -Qunused-arguments -target arm-eabi -ccc-gcc-name $(CC_arm) -CC_arm:=clang - -CFLAGS_aarch64 = -no-integrated-as -Qunused-arguments -target aarch64-eabi -ccc-gcc-name $(CC_aarch64) -CC_aarch64:=clang -endif - include toolchain.inc strip_quotes = $(subst ",,$(subst \",,$(1))) diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 9e67459..4d23e67 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -29,8 +29,6 @@ subdirs-y += smp ifeq ($(CONFIG_COMPILER_GCC),y) DISASSEMBLY=-Wa,-acdlns -else -DISASSEMBLY=-Wa,--divide endif OPTION_TABLE_H:= diff --git a/toolchain.inc b/toolchain.inc index e6f530a..432e633 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -59,9 +59,9 @@ ARCHDIR-arm := arm ARCHDIR-arm64 := arm64 ARCHDIR-riscv := riscv -CFLAGS_arm := -mno-unaligned-access -ffunction-sections -fdata-sections +CFLAGS_arm += -mno-unaligned-access -ffunction-sections -fdata-sections -CFLAGS_arm64 := -ffunction-sections -fdata-sections +CFLAGS_arm64 += -ffunction-sections -fdata-sections toolchain_to_dir = \ $(foreach arch,$(ARCH_SUPPORTED),\ @@ -93,15 +93,8 @@ STRIP_$(1) := $(STRIP_$(2)) READELF_$(1) := $(READELF_$(2)) CFLAGS_$(1) = $$(CFLAGS_common) $$(CFLAGS_$(2)) CPPFLAGS_$(1) = $$(CPPFLAGS_common) $$(CPPFLAGS_$(2)) -COMPILER_RT_FLAGS_$(1) := -ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y) -COMPILER_RT_$(1) = $(shell $(CC_$(2)) $(CFLAGS_$(2)) -print-librt-file-name 2>/dev/null) -else -COMPILER_RT_$(1) = $(wildcard $(shell $(CC_$(2)) $(CFLAGS_$(2)) -print-libgcc-file-name)) -ifeq ($(2),x86_32) -COMPILER_RT_FLAGS_$(1) := --wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3 -endif -endif +COMPILER_RT_$(1) := $$(COMPILER_RT_$(2)) +COMPILER_RT_FLAGS_$(1) := $$(COMPILER_RT_FLAGS_$(2)) endef # define_class: Allows defining any program as dynamic class and compiler tool diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile index 45dae8c..0dfb70e 100755 --- a/util/xcompile/xcompile +++ b/util/xcompile/xcompile @@ -59,6 +59,7 @@ elif program_exists cc; then else die "no host compiler found" fi +CLANG=clang cat <<EOF # platform agnostic and host tools @@ -98,11 +99,11 @@ testas() { if [ -z "$use_dash_twidth" ]; then ASFLAGS="" - CFLAGS="" + CFLAGS_GCC="" LDFLAGS="" else ASFLAGS="--$twidth" - CFLAGS="-m$twidth" + CFLAGS_GCC="-m$twidth" LDFLAGS="-b $full_arch" fi @@ -111,7 +112,7 @@ testas() { [ -n "$use_dash_twidth" ] && case "$full_arch" in "elf32-i386" ) LDFLAGS="$LDFLAGS -melf_i386" - CFLAGS="$CFLAGS -Wl,-b,elf32-i386 -Wl,-melf_i386" + CFLAGS_GCC="$CFLAGS_GCC -Wl,-b,elf32-i386 -Wl,-melf_i386" ;; esac @@ -122,38 +123,56 @@ detect_special_flags() { local architecture="$1" # GCC 4.6 is much more picky about unused variables. # Turn off it's warnings for now: - testcc "$CC" "$CFLAGS -Wno-unused-but-set-variable " && - CFLAGS="$CFLAGS -Wno-unused-but-set-variable " + testcc "$CC" "$CFLAGS_GCC -Wno-unused-but-set-variable " && + CFLAGS_GCC="$CFLAGS_GCC -Wno-unused-but-set-variable " # Use bfd linker instead of gold if available: - testcc "$CC" "$CFLAGS -fuse-ld=bfd" && - CFLAGS="$CFLAGS -fuse-ld=bfd" && LINKER_SUFFIX='.bfd' + testcc "$CC" "$CFLAGS_GCC -fuse-ld=bfd" && + CFLAGS_GCC="$CFLAGS_GCC -fuse-ld=bfd" && LINKER_SUFFIX='.bfd' - testcc "$CC" "$CFLAGS -fno-stack-protector"&& - CFLAGS="$CFLAGS -fno-stack-protector" - testcc "$CC" "$CFLAGS -Wl,--build-id=none" && - CFLAGS="$CFLAGS -Wl,--build-id=none" + testcc "$CC" "$CFLAGS_GCC -fno-stack-protector"&& + CFLAGS_GCC="$CFLAGS_GCC -fno-stack-protector" + testcc "$CC" "$CFLAGS_GCC -Wl,--build-id=none" && + CFLAGS_GCC="$CFLAGS_GCC -Wl,--build-id=none" case "$architecture" in x86) - testcc "$CC" "$CFLAGS -Wa,--divide" && - CFLAGS="$CFLAGS -Wa,--divide" + testcc "$CC" "$CFLAGS_GCC -Wa,--divide" && + CFLAGS_GCC="$CFLAGS_GCC -Wa,--divide" + testcc "$CLANG" "$CFLAGS_CLANG -no-integrated-as" && + CFLAGS_CLANG="$CFLAGS_CLANG -no-integrated-as" + testcc "$CLANG" "$CFLAGS_CLANG -Wa,--divide" && + CFLAGS_CLANG="$CFLAGS_CLANG -Wa,--divide" # Always build for i686 -- no sse/mmx instructions since SMM # modules are compiled using these flags. Note that this # doesn't prevent a project using xcompile to explicitly # specify -mmsse, etc flags. - CFLAGS="$CFLAGS -march=i686" + CFLAGS_GCC="$CFLAGS_GCC -march=i686" ;; esac } +detect_compiler_runtime() { + CC_RT_CLANG="`${CLANG} ${CFLAGS_CLANG} -print-librt-file-name`" + CC_RT_GCC="`${GCCPREFIX}gcc ${CFLAGS_GCC} -print-libgcc-file-name`" +} + report_arch_toolchain() { cat <<EOF # elf${TWIDTH}-${TBFDARCH} toolchain (${GCCPREFIX}gcc) ARCH_SUPPORTED+=${TARCH} SUBARCH_SUPPORTED+=${TSUPP-${TARCH}} +ifeq (\$(CONFIG_COMPILER_GCC),y) CC_${TARCH}:=${GCCPREFIX}gcc -CFLAGS_${TARCH}:=${CFLAGS} +CFLAGS_${TARCH}:=${CFLAGS_GCC} +COMPILER_RT_${TARCH}:=${CC_RT_GCC} +COMPILER_RT_FLAGS_${TARCH}:=${CC_RT_EXTRA_GCC} +else +CC_${TARCH}:=${CLANG} +CFLAGS_${TARCH}:=${CFLAGS_CLANG} +COMPILER_RT_${TARCH}:=${CC_RT_CLANG} +COMPILER_RT_FLAGS_${TARCH}:=${CC_RT_EXTRA_CLANG} +endif CPP_${TARCH}:=${GCCPREFIX}cpp AS_${TARCH}:=${GCCPREFIX}as ${ASFLAGS} LD_${TARCH}:=${GCCPREFIX}ld${LINKER_SUFFIX} ${LDFLAGS} @@ -177,6 +196,7 @@ arch_config_arm() { TWIDTH="32" TSUPP="arm armv4 armv7" TABI="eabi" + CC_RT_EXTRA_GCC= } arch_config_aarch64() { @@ -185,6 +205,7 @@ arch_config_aarch64() { TCLIST="aarch64" TWIDTH="64" TABI="elf" + CC_RT_EXTRA_GCC= } arch_config_riscv() { @@ -193,6 +214,7 @@ arch_config_riscv() { TCLIST="riscv" TWIDTH="64" TABI="elf" + CC_RT_EXTRA_GCC= } arch_config_x86() { @@ -201,6 +223,7 @@ arch_config_x86() { TCLIST="i386 x86_64" TWIDTH="32" TABI="elf" + CC_RT_EXTRA_GCC="--wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3" } test_architecture() { @@ -234,13 +257,23 @@ test_architecture() { testas "$gccprefixes" "$TWIDTH" "$TBFDARCH" "TRUE" && break done - if [ "$GCCPREFIX" = "invalid" ]; then - echo "Warning: no suitable GCC for $architecture." >&2 + for clang_arch in $TCLIST invalid; do + # NOTE: clang puts compiler-rt under lib/linux/libclang_rt.builtins-i386.a + # this means the triple is i386-linux-elf instead of i386-none-elf + # See: http://llvm.org/bugs/show_bug.cgi?id=21538 + testcc "clang" "-target ${clang_arch}-linux-$TABI -c" && break + done + + if [ "$GCCPREFIX" = "invalid" -a "$clang_arch" = "invalid" ]; then + echo "Warning: no suitable compiler for $architecture." >&2 continue fi CC="${GCCPREFIX}"gcc + CFLAGS_GCC= + CFLAGS_CLANG="-target ${clang_arch}-linux-${TABI} -Qunused-arguments -ccc-gcc-name ${CC} -m${TWIDTH}" detect_special_flags "$architecture" + detect_compiler_runtime "$architecture" report_arch_toolchain }

1 0

Patch set updated for coreboot: b4e1166 build system: collect compiler configuration in xcompile
by Patrick Georgi 02 Dec '14

02 Dec '14

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7612 -gerrit commit b4e11669a93a8efe63f70ff579ac0730fb2e3fde Author: Patrick Georgi <pgeorgi(a)google.com> Date: Sat Nov 29 14:16:07 2014 +0100 build system: collect compiler configuration in xcompile Move clang specifics and compiler runtime handling to xcompile. Change-Id: I0f12f755420f315127e6d9adc00b1246c6e7131b Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- Makefile | 23 +---------------- src/arch/x86/Makefile.inc | 2 -- toolchain.inc | 11 ++------ util/xcompile/xcompile | 66 +++++++++++++++++++++++++++++++++++------------ 4 files changed, 52 insertions(+), 50 deletions(-) diff --git a/Makefile b/Makefile index eaba3e4..19d65f4 100644 --- a/Makefile +++ b/Makefile @@ -37,8 +37,6 @@ $(if $(wildcard .xcompile),,$(eval $(shell util/xcompile/xcompile $(XGCCPATH) > .xcompile: util/xcompile/xcompile A=`mktemp $@.XXXXXX`; $< $(XGCCPATH) > $$A && mv $$A $@ 2> /dev/null -include .xcompile - export top := $(CURDIR) export src := src export srck := $(top)/util/kconfig @@ -112,31 +110,12 @@ real-all: config else include $(HAVE_DOTCONFIG) - -ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y) -# FIXME: armv7/aarch64 won't build right now -# NOTE: clang puts compiler-rt under lib/linux/libclang_rt.builtins-i386.a -# this means the triple is i386-linux-elf instead of i386-none-elf -CFLAGS_x86_32 = -no-integrated-as -Qunused-arguments -target i386-linux-elf -m32 -CC_x86_32:=clang -HOSTCC := clang +include .xcompile ifneq ($(CONFIG_MMX),y) CFLAGS_x86_32 += -mno-mmx endif -# FIXME: we end up with conflicting flags with this, not clear on this part. -#ifneq ($(CONFIG_SSE),y) -#CFLAGS_x86_32 += -mno-sse -#endif - -CFLAGS_arm = -no-integrated-as -Qunused-arguments -target arm-eabi -ccc-gcc-name $(CC_arm) -CC_arm:=clang - -CFLAGS_aarch64 = -no-integrated-as -Qunused-arguments -target aarch64-eabi -ccc-gcc-name $(CC_aarch64) -CC_aarch64:=clang -endif - include toolchain.inc strip_quotes = $(subst ",,$(subst \",,$(1))) diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 9e67459..4d23e67 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -29,8 +29,6 @@ subdirs-y += smp ifeq ($(CONFIG_COMPILER_GCC),y) DISASSEMBLY=-Wa,-acdlns -else -DISASSEMBLY=-Wa,--divide endif OPTION_TABLE_H:= diff --git a/toolchain.inc b/toolchain.inc index e6f530a..ffc197d 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -93,15 +93,8 @@ STRIP_$(1) := $(STRIP_$(2)) READELF_$(1) := $(READELF_$(2)) CFLAGS_$(1) = $$(CFLAGS_common) $$(CFLAGS_$(2)) CPPFLAGS_$(1) = $$(CPPFLAGS_common) $$(CPPFLAGS_$(2)) -COMPILER_RT_FLAGS_$(1) := -ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y) -COMPILER_RT_$(1) = $(shell $(CC_$(2)) $(CFLAGS_$(2)) -print-librt-file-name 2>/dev/null) -else -COMPILER_RT_$(1) = $(wildcard $(shell $(CC_$(2)) $(CFLAGS_$(2)) -print-libgcc-file-name)) -ifeq ($(2),x86_32) -COMPILER_RT_FLAGS_$(1) := --wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3 -endif -endif +COMPILER_RT_$(1) := $$(COMPILER_RT_$(2)) +COMPILER_RT_FLAGS_$(1) := $$(COMPILER_RT_FLAGS_$(2)) endef # define_class: Allows defining any program as dynamic class and compiler tool diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile index 45dae8c..5d3777a 100755 --- a/util/xcompile/xcompile +++ b/util/xcompile/xcompile @@ -59,6 +59,7 @@ elif program_exists cc; then else die "no host compiler found" fi +CLANG=clang cat <<EOF # platform agnostic and host tools @@ -98,11 +99,11 @@ testas() { if [ -z "$use_dash_twidth" ]; then ASFLAGS="" - CFLAGS="" + CFLAGS_GCC="" LDFLAGS="" else ASFLAGS="--$twidth" - CFLAGS="-m$twidth" + CFLAGS_GCC="-m$twidth" LDFLAGS="-b $full_arch" fi @@ -111,7 +112,7 @@ testas() { [ -n "$use_dash_twidth" ] && case "$full_arch" in "elf32-i386" ) LDFLAGS="$LDFLAGS -melf_i386" - CFLAGS="$CFLAGS -Wl,-b,elf32-i386 -Wl,-melf_i386" + CFLAGS_GCC="$CFLAGS_GCC -Wl,-b,elf32-i386 -Wl,-melf_i386" ;; esac @@ -122,38 +123,56 @@ detect_special_flags() { local architecture="$1" # GCC 4.6 is much more picky about unused variables. # Turn off it's warnings for now: - testcc "$CC" "$CFLAGS -Wno-unused-but-set-variable " && - CFLAGS="$CFLAGS -Wno-unused-but-set-variable " + testcc "$CC" "$CFLAGS_GCC -Wno-unused-but-set-variable " && + CFLAGS_GCC="$CFLAGS_GCC -Wno-unused-but-set-variable " # Use bfd linker instead of gold if available: - testcc "$CC" "$CFLAGS -fuse-ld=bfd" && - CFLAGS="$CFLAGS -fuse-ld=bfd" && LINKER_SUFFIX='.bfd' + testcc "$CC" "$CFLAGS_GCC -fuse-ld=bfd" && + CFLAGS_GCC="$CFLAGS_GCC -fuse-ld=bfd" && LINKER_SUFFIX='.bfd' - testcc "$CC" "$CFLAGS -fno-stack-protector"&& - CFLAGS="$CFLAGS -fno-stack-protector" - testcc "$CC" "$CFLAGS -Wl,--build-id=none" && - CFLAGS="$CFLAGS -Wl,--build-id=none" + testcc "$CC" "$CFLAGS_GCC -fno-stack-protector"&& + CFLAGS_GCC="$CFLAGS_GCC -fno-stack-protector" + testcc "$CC" "$CFLAGS_GCC -Wl,--build-id=none" && + CFLAGS_GCC="$CFLAGS_GCC -Wl,--build-id=none" case "$architecture" in x86) - testcc "$CC" "$CFLAGS -Wa,--divide" && - CFLAGS="$CFLAGS -Wa,--divide" + testcc "$CC" "$CFLAGS_GCC -Wa,--divide" && + CFLAGS_GCC="$CFLAGS_GCC -Wa,--divide" + testcc "$CLANG" "$CFLAGS_CLANG -no-integrated-as" && + CFLAGS_CLANG="$CFLAGS_CLANG -no-integrated-as" + testcc "$CLANG" "$CFLAGS_CLANG -Wa,--divide" && + CFLAGS_CLANG="$CFLAGS_CLANG -Wa,--divide" # Always build for i686 -- no sse/mmx instructions since SMM # modules are compiled using these flags. Note that this # doesn't prevent a project using xcompile to explicitly # specify -mmsse, etc flags. - CFLAGS="$CFLAGS -march=i686" + CFLAGS_GCC="$CFLAGS_GCC -march=i686" ;; esac } +detect_compiler_runtime() { + CC_RT_CLANG="`${CLANG} ${CFLAGS_CLANG} -print-librt-file-name`" + CC_RT_GCC="`${GCCPREFIX}gcc ${CFLAGS_GCC} -print-libgcc-file-name`" +} + report_arch_toolchain() { cat <<EOF # elf${TWIDTH}-${TBFDARCH} toolchain (${GCCPREFIX}gcc) ARCH_SUPPORTED+=${TARCH} SUBARCH_SUPPORTED+=${TSUPP-${TARCH}} +ifeq (\$(CONFIG_COMPILER_GCC),y) CC_${TARCH}:=${GCCPREFIX}gcc -CFLAGS_${TARCH}:=${CFLAGS} +CFLAGS_${TARCH}:=${CFLAGS_GCC} +COMPILER_RT_${TARCH}:=${CC_RT_GCC} +COMPILER_RT_FLAGS_${TARCH}:=${CC_RT_EXTRA_GCC} +else +CC_${TARCH}:=${CLANG} +CFLAGS_${TARCH}:=${CFLAGS_CLANG} +COMPILER_RT_${TARCH}:=${CC_RT_CLANG} +COMPILER_RT_FLAGS_${TARCH}:=${CC_RT_EXTRA_CLANG} +endif CPP_${TARCH}:=${GCCPREFIX}cpp AS_${TARCH}:=${GCCPREFIX}as ${ASFLAGS} LD_${TARCH}:=${GCCPREFIX}ld${LINKER_SUFFIX} ${LDFLAGS} @@ -177,6 +196,7 @@ arch_config_arm() { TWIDTH="32" TSUPP="arm armv4 armv7" TABI="eabi" + CC_RT_EXTRA_GCC= } arch_config_aarch64() { @@ -185,6 +205,7 @@ arch_config_aarch64() { TCLIST="aarch64" TWIDTH="64" TABI="elf" + CC_RT_EXTRA_GCC= } arch_config_riscv() { @@ -193,6 +214,7 @@ arch_config_riscv() { TCLIST="riscv" TWIDTH="64" TABI="elf" + CC_RT_EXTRA_GCC= } arch_config_x86() { @@ -201,6 +223,7 @@ arch_config_x86() { TCLIST="i386 x86_64" TWIDTH="32" TABI="elf" + CC_RT_EXTRA_GCC="--wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3" } test_architecture() { @@ -234,13 +257,22 @@ test_architecture() { testas "$gccprefixes" "$TWIDTH" "$TBFDARCH" "TRUE" && break done - if [ "$GCCPREFIX" = "invalid" ]; then - echo "Warning: no suitable GCC for $architecture." >&2 + for clang_arch in $TCLIST invalid; do + # NOTE: clang puts compiler-rt under lib/linux/libclang_rt.builtins-i386.a + # this means the triple is i386-linux-elf instead of i386-none-elf + # See: http://llvm.org/bugs/show_bug.cgi?id=21538 + testcc "clang" "-target ${clang_arch}-linux-$TABI -c" && break + done + + if [ "$GCCPREFIX" = "invalid" -a "$clang_arch" = "invalid" ]; then + echo "Warning: no suitable compiler for $architecture." >&2 continue fi CC="${GCCPREFIX}"gcc + CFLAGS_CLANG="-target ${clang_arch}-linux-${TABI} -Qunused-arguments -ccc-gcc-name ${CC} -m${TWIDTH}" detect_special_flags "$architecture" + detect_compiler_runtime "$architecture" report_arch_toolchain }

1 0

Patch merged into coreboot/master: 893a55e southbridge/amd/agesa/hudson/early_setup.c: Use IS_ENABLED macro
by gerrit＠coreboot.org 02 Dec '14

02 Dec '14

the following patch was just integrated into master: commit 893a55ec8976529f3f41a22ce7a9a0a2ed9501b4 Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Tue Dec 2 17:44:47 2014 +1100 southbridge/amd/agesa/hudson/early_setup.c: Use IS_ENABLED macro Change-Id: I2adb5a8fe2cede988cc6fdef5ff81da86d267175 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Reviewed-on: http://review.coreboot.org/7624 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Reviewed-by: Patrick Georgi <pgeorgi(a)google.com> See http://review.coreboot.org/7624 for details. -gerrit

1 0

Patch set updated for coreboot: 7a53e46 build system: collect compiler configuration in xcompile
by Patrick Georgi 02 Dec '14

02 Dec '14

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7612 -gerrit commit 7a53e46cdda5b1fc65fb7eaab1caf94ba6ad839d Author: Patrick Georgi <pgeorgi(a)google.com> Date: Sat Nov 29 14:16:07 2014 +0100 build system: collect compiler configuration in xcompile Move clang specifics and compiler runtime handling to xcompile. Change-Id: I0f12f755420f315127e6d9adc00b1246c6e7131b Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- Makefile | 23 +---------------- src/arch/x86/Makefile.inc | 2 -- toolchain.inc | 11 ++------ util/xcompile/xcompile | 65 ++++++++++++++++++++++++++++++++++------------- 4 files changed, 51 insertions(+), 50 deletions(-) diff --git a/Makefile b/Makefile index eaba3e4..19d65f4 100644 --- a/Makefile +++ b/Makefile @@ -37,8 +37,6 @@ $(if $(wildcard .xcompile),,$(eval $(shell util/xcompile/xcompile $(XGCCPATH) > .xcompile: util/xcompile/xcompile A=`mktemp $@.XXXXXX`; $< $(XGCCPATH) > $$A && mv $$A $@ 2> /dev/null -include .xcompile - export top := $(CURDIR) export src := src export srck := $(top)/util/kconfig @@ -112,31 +110,12 @@ real-all: config else include $(HAVE_DOTCONFIG) - -ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y) -# FIXME: armv7/aarch64 won't build right now -# NOTE: clang puts compiler-rt under lib/linux/libclang_rt.builtins-i386.a -# this means the triple is i386-linux-elf instead of i386-none-elf -CFLAGS_x86_32 = -no-integrated-as -Qunused-arguments -target i386-linux-elf -m32 -CC_x86_32:=clang -HOSTCC := clang +include .xcompile ifneq ($(CONFIG_MMX),y) CFLAGS_x86_32 += -mno-mmx endif -# FIXME: we end up with conflicting flags with this, not clear on this part. -#ifneq ($(CONFIG_SSE),y) -#CFLAGS_x86_32 += -mno-sse -#endif - -CFLAGS_arm = -no-integrated-as -Qunused-arguments -target arm-eabi -ccc-gcc-name $(CC_arm) -CC_arm:=clang - -CFLAGS_aarch64 = -no-integrated-as -Qunused-arguments -target aarch64-eabi -ccc-gcc-name $(CC_aarch64) -CC_aarch64:=clang -endif - include toolchain.inc strip_quotes = $(subst ",,$(subst \",,$(1))) diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 9e67459..4d23e67 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -29,8 +29,6 @@ subdirs-y += smp ifeq ($(CONFIG_COMPILER_GCC),y) DISASSEMBLY=-Wa,-acdlns -else -DISASSEMBLY=-Wa,--divide endif OPTION_TABLE_H:= diff --git a/toolchain.inc b/toolchain.inc index e6f530a..ffc197d 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -93,15 +93,8 @@ STRIP_$(1) := $(STRIP_$(2)) READELF_$(1) := $(READELF_$(2)) CFLAGS_$(1) = $$(CFLAGS_common) $$(CFLAGS_$(2)) CPPFLAGS_$(1) = $$(CPPFLAGS_common) $$(CPPFLAGS_$(2)) -COMPILER_RT_FLAGS_$(1) := -ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y) -COMPILER_RT_$(1) = $(shell $(CC_$(2)) $(CFLAGS_$(2)) -print-librt-file-name 2>/dev/null) -else -COMPILER_RT_$(1) = $(wildcard $(shell $(CC_$(2)) $(CFLAGS_$(2)) -print-libgcc-file-name)) -ifeq ($(2),x86_32) -COMPILER_RT_FLAGS_$(1) := --wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3 -endif -endif +COMPILER_RT_$(1) := $$(COMPILER_RT_$(2)) +COMPILER_RT_FLAGS_$(1) := $$(COMPILER_RT_FLAGS_$(2)) endef # define_class: Allows defining any program as dynamic class and compiler tool diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile index 45dae8c..aae537f 100755 --- a/util/xcompile/xcompile +++ b/util/xcompile/xcompile @@ -98,11 +98,11 @@ testas() { if [ -z "$use_dash_twidth" ]; then ASFLAGS="" - CFLAGS="" + CFLAGS_GCC="" LDFLAGS="" else ASFLAGS="--$twidth" - CFLAGS="-m$twidth" + CFLAGS_GCC="-m$twidth" LDFLAGS="-b $full_arch" fi @@ -111,7 +111,7 @@ testas() { [ -n "$use_dash_twidth" ] && case "$full_arch" in "elf32-i386" ) LDFLAGS="$LDFLAGS -melf_i386" - CFLAGS="$CFLAGS -Wl,-b,elf32-i386 -Wl,-melf_i386" + CFLAGS_GCC="$CFLAGS -Wl,-b,elf32-i386 -Wl,-melf_i386" ;; esac @@ -122,38 +122,56 @@ detect_special_flags() { local architecture="$1" # GCC 4.6 is much more picky about unused variables. # Turn off it's warnings for now: - testcc "$CC" "$CFLAGS -Wno-unused-but-set-variable " && - CFLAGS="$CFLAGS -Wno-unused-but-set-variable " + testcc "$CC" "$CFLAGS_GCC -Wno-unused-but-set-variable " && + CFLAGS_GCC="$CFLAGS_GCC -Wno-unused-but-set-variable " # Use bfd linker instead of gold if available: - testcc "$CC" "$CFLAGS -fuse-ld=bfd" && - CFLAGS="$CFLAGS -fuse-ld=bfd" && LINKER_SUFFIX='.bfd' + testcc "$CC" "$CFLAGS_GCC -fuse-ld=bfd" && + CFLAGS_GCC="$CFLAGS_GCC -fuse-ld=bfd" && LINKER_SUFFIX='.bfd' - testcc "$CC" "$CFLAGS -fno-stack-protector"&& - CFLAGS="$CFLAGS -fno-stack-protector" - testcc "$CC" "$CFLAGS -Wl,--build-id=none" && - CFLAGS="$CFLAGS -Wl,--build-id=none" + testcc "$CC" "$CFLAGS_GCC -fno-stack-protector"&& + CFLAGS_GCC="$CFLAGS_GCC -fno-stack-protector" + testcc "$CC" "$CFLAGS_GCC -Wl,--build-id=none" && + CFLAGS_GCC="$CFLAGS_GCC -Wl,--build-id=none" case "$architecture" in x86) - testcc "$CC" "$CFLAGS -Wa,--divide" && - CFLAGS="$CFLAGS -Wa,--divide" + testcc "$CC" "$CFLAGS_GCC -Wa,--divide" && + CFLAGS_GCC="$CFLAGS_GCC -Wa,--divide" + testcc "$CLANG" "$CFLAGS_CLANG -no-integrated-as" && + CFLAGS_CLANG="$CFLAGS_CLANG -no-integrated-as" + testcc "$CLANG" "$CFLAGS_CLANG -Wa,--divide" && + CFLAGS_CLANG="$CFLAGS_CLANG -Wa,--divide" # Always build for i686 -- no sse/mmx instructions since SMM # modules are compiled using these flags. Note that this # doesn't prevent a project using xcompile to explicitly # specify -mmsse, etc flags. - CFLAGS="$CFLAGS -march=i686" + CFLAGS_GCC="$CFLAGS_GCC -march=i686" ;; esac } +detect_compiler_runtime() { + CC_RT_CLANG="`${CLANG} ${CFLAGS} -print-librt-file-name`" + CC_RT_GCC="`${GCCPREFIX}gcc ${CFLAGS} -print-libgcc-file-name`" +} + report_arch_toolchain() { cat <<EOF # elf${TWIDTH}-${TBFDARCH} toolchain (${GCCPREFIX}gcc) ARCH_SUPPORTED+=${TARCH} SUBARCH_SUPPORTED+=${TSUPP-${TARCH}} +ifeq (\$(CONFIG_COMPILER_GCC),y) CC_${TARCH}:=${GCCPREFIX}gcc -CFLAGS_${TARCH}:=${CFLAGS} +CFLAGS_${TARCH}:=${CFLAGS_GCC} +COMPILER_RT_${TARCH}:=${CC_RT_GCC} +COMPILER_RT_FLAGS_${TARCH}:=${CC_RT_EXTRA_GCC} +else +CC_${TARCH}:=${CLANG} +CFLAGS_${TARCH}:=${CFLAGS_CLANG} +COMPILER_RT_${TARCH}:=${CC_RT_CLANG} +COMPILER_RT_FLAGS_${TARCH}:=${CC_RT_EXTRA_CLANG} +endif CPP_${TARCH}:=${GCCPREFIX}cpp AS_${TARCH}:=${GCCPREFIX}as ${ASFLAGS} LD_${TARCH}:=${GCCPREFIX}ld${LINKER_SUFFIX} ${LDFLAGS} @@ -177,6 +195,7 @@ arch_config_arm() { TWIDTH="32" TSUPP="arm armv4 armv7" TABI="eabi" + CC_RT_EXTRA_GCC= } arch_config_aarch64() { @@ -185,6 +204,7 @@ arch_config_aarch64() { TCLIST="aarch64" TWIDTH="64" TABI="elf" + CC_RT_EXTRA_GCC= } arch_config_riscv() { @@ -193,6 +213,7 @@ arch_config_riscv() { TCLIST="riscv" TWIDTH="64" TABI="elf" + CC_RT_EXTRA_GCC= } arch_config_x86() { @@ -201,6 +222,7 @@ arch_config_x86() { TCLIST="i386 x86_64" TWIDTH="32" TABI="elf" + CC_RT_EXTRA_GCC="--wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3" } test_architecture() { @@ -234,13 +256,22 @@ test_architecture() { testas "$gccprefixes" "$TWIDTH" "$TBFDARCH" "TRUE" && break done - if [ "$GCCPREFIX" = "invalid" ]; then - echo "Warning: no suitable GCC for $architecture." >&2 + for clang_arch in $TCLIST invalid; do + # NOTE: clang puts compiler-rt under lib/linux/libclang_rt.builtins-i386.a + # this means the triple is i386-linux-elf instead of i386-none-elf + # See: http://llvm.org/bugs/show_bug.cgi?id=21538 + testcc "clang" "-target ${clang_arch}-linux-$TABI -c" && break + done + + if [ "$GCCPREFIX" = "invalid" -a "$clang_arch" = "invalid" ]; then + echo "Warning: no suitable compiler for $architecture." >&2 continue fi CC="${GCCPREFIX}"gcc + CLANG="clang -target ${clang_arch}-linux-${TABI} -Qunused-arguments -ccc-gcc-name ${CC} -m${TWIDTH}" detect_special_flags "$architecture" + detect_compiler_runtime "$architecture" report_arch_toolchain }

1 0

Patch set updated for coreboot: c081e28 x86: Update the check for Forbidden global variables
by Patrick Georgi 02 Dec '14

02 Dec '14

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7306 -gerrit commit c081e28f39a0440c5f850fe8548dbf89c780e9fe Author: Furquan Shaikh <furquan(a)google.com> Date: Thu Oct 30 11:53:38 2014 -0700 x86: Update the check for Forbidden global variables Add a section .illegal_globals to romstage and check that the section does not contain any variables while creating romstage. [pg: Handle individual AGESA special cases in the linker script instead of whitelisting everything remotely AGESA related in the Makefile.] Change-Id: I866681f51a44bc21770d32995c281b556a90c153 Signed-off-by: Furquan Shaikh <furquan(a)google.com> Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- src/arch/x86/Makefile.inc | 5 +++-- src/arch/x86/init/romstage.ld | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 9e67459..a92c55c 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -206,9 +206,10 @@ romstage-libs ?= $(objcbfs)/romstage_null.debug: $$(romstage-objs) $(objgenerated)/romstage_null.ld $$(romstage-libs) @printf " LINK $(subst $(obj)/,,$(@))\n" $(LD_romstage) -nostdlib -nostartfiles -static -o $@ -L$(obj) $(COMPILER_RT_FLAGS_romstage) --start-group $(romstage-objs) $(romstage-libs) $(COMPILER_RT_romstage) --end-group -T $(objgenerated)/romstage_null.ld - $(NM_romstage) $@ | grep -q " [DdBb] "; if [ $$? -eq 0 ]; then \ + $(OBJCOPY_romstage) --only-section .illegal_globals $(@) $(objcbfs)/romstage_null.offenders && \ + $(NM_romstage) $(objcbfs)/romstage_null.offenders | grep -q ""; if [ $$? -eq 0 ]; then \ echo "Forbidden global variables in romstage:"; \ - $(NM_romstage) $@ | grep " [DdBb] "; test "$(CONFIG_CPU_AMD_AGESA)" = y; \ + $(NM_romstage) $(objcbfs)/romstage_null.offenders; false; \ else true; fi $(objcbfs)/romstage.debug: $$(romstage-objs) $(objgenerated)/romstage.ld $$(romstage-libs) diff --git a/src/arch/x86/init/romstage.ld b/src/arch/x86/init/romstage.ld index d6eb511..99bcc8e 100644 --- a/src/arch/x86/init/romstage.ld +++ b/src/arch/x86/init/romstage.ld @@ -65,5 +65,20 @@ SECTIONS preram_cbmem_console = .; } + /* Global variables are not allowed in romstage + * This section is checked during stage creation to ensure + * that there are no global variables present + */ + + . = 0xffffff00; + .illegal_globals . : { + *(EXCLUDE_FILE (*/libagesa.*.a: */buildOpts.romstage.o */agesawrapper.romstage.o */cpu/amd/agesa/*.romstage.o */vendorcode/amd/agesa/* */vendorcode/amd/cimx/*) .data) + *(.data.*) + *(.bss) + *(.bss.*) + *(.sbss) + *(.sbss.*) + } + _bogus = ASSERT((SIZEOF(.car.data) + CONFIG_CONSOLE_PRERAM_BUFFER_SIZE <= CONFIG_DCACHE_RAM_SIZE), "Cache as RAM area is too full"); }

1 0

Patch merged into coreboot/master: 8900739 cubieboard: use new arm bootblock infrastructure
by gerrit＠coreboot.org 02 Dec '14

02 Dec '14

the following patch was just integrated into master: commit 890073915fa6c6a3672e64590b2edffce7331b65 Author: Alexander Couzens <lynxis(a)fe80.eu> Date: Fri Oct 24 23:53:23 2014 +0200 cubieboard: use new arm bootblock infrastructure commit 8b685398 (ARM: Overhaul the ARM Makefile.) change config flags for cpu and mainboard bootblock initialization. Tested on a20/cubieboard2. Change-Id: I2a1019c2881bc7aada15322841204992d0106453 Signed-off-by: Alexander Couzens <lynxis(a)fe80.eu> Reviewed-on: http://review.coreboot.org/7188 Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin(a)google.com> Reviewed-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> See http://review.coreboot.org/7188 for details. -gerrit

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit December 2014