coreboot-gerrit May 2014

coreboot-gerrit@coreboot.org

1 participants
1066 discussions

Patch merged into coreboot/master: 49592da Board-status: Add second vendor line
by gerrit＠coreboot.org 19 May '14

19 May '14

the following patch was just integrated into master: commit 49592da27fb365fc07621fe305fde2d6bf309bb0 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Thu May 15 10:06:25 2014 +0300 Board-status: Add second vendor line Change-Id: I8a962f323cbc6347f266a188a07f870ce174d339 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Reviewed-on: http://review.coreboot.org/5751 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick(a)georgi-clan.de> See http://review.coreboot.org/5751 for details. -gerrit

1 0

Patch merged into coreboot/master: ee96c2c LiPPERT: Add aliases for board_status wiki
by gerrit＠coreboot.org 19 May '14

19 May '14

the following patch was just integrated into master: commit ee96c2ccbbc1d669ab9261cf871af377f118f62b Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Fri May 9 10:28:15 2014 +0300 LiPPERT: Add aliases for board_status wiki While at it, fix frontrunner-af board URL. Change-Id: I3b631830d679abc20f8a72411f2402689d9f9aac Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Reviewed-on: http://review.coreboot.org/5706 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Reviewed-by: Jens Rottmann <JRottmann(a)LiPPERTembedded.de> See http://review.coreboot.org/5706 for details. -gerrit

1 0

Patch merged into coreboot/master: 246234f abuild: Only build boards with Kconfig
by gerrit＠coreboot.org 19 May '14

19 May '14

the following patch was just integrated into master: commit 246234fecb439cc7c9cee6616fe1b33c4d37a582 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Sat May 17 21:50:06 2014 +0200 abuild: Only build boards with Kconfig We have dupes in the tree for aliases, board variants and the like, for board-status reporting purposes. But we don't need to build all of them. Change-Id: Ic1c6415568800350bdc0db97471e3875d9eac98c Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> Reviewed-on: http://review.coreboot.org/5776 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> See http://review.coreboot.org/5776 for details. -gerrit

1 0

Patch set updated for coreboot: f0d64a6 amd/agesa: Implicit assigment between enum without cast
by Edward O'Callaghan 19 May '14

19 May '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5760 -gerrit commit f0d64a6d6251a63df103babb3a86c293babaefaa Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Thu May 15 21:23:51 2014 +1000 amd/agesa: Implicit assigment between enum without cast Change-Id: I31632948ce69b2d1ff63b6c920016ed6fdf9e2f8 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/vendorcode/amd/agesa/f10/Proc/Mem/NB/mnmct.c | 2 +- src/vendorcode/amd/agesa/f12/Proc/Mem/NB/mnmct.c | 2 +- src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnmct.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vendorcode/amd/agesa/f10/Proc/Mem/NB/mnmct.c b/src/vendorcode/amd/agesa/f10/Proc/Mem/NB/mnmct.c index 2ad6e12..942fe1f 100644 --- a/src/vendorcode/amd/agesa/f10/Proc/Mem/NB/mnmct.c +++ b/src/vendorcode/amd/agesa/f10/Proc/Mem/NB/mnmct.c @@ -206,7 +206,7 @@ MemNSyncTargetSpeedNb ( ASSERT ((NBPtr->ChannelPtr->TechType == DDR3_TECHNOLOGY) ? ((MEMORY_BUS_SPEED)ChnlTmgMod[1] >= DDR667_FREQUENCY) : ((MEMORY_BUS_SPEED)ChnlTmgMod[1] <= DDR1066_FREQUENCY)); - MemClkFreq = ChnlTmgMod[1]; + MemClkFreq = (MEMORY_BUS_SPEED) ChnlTmgMod[1]; } } diff --git a/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/mnmct.c b/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/mnmct.c index eac35b7..3664dc5 100644 --- a/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/mnmct.c +++ b/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/mnmct.c @@ -178,7 +178,7 @@ MemNSyncTargetSpeedNb ( // ASSERT ((NBPtr->ChannelPtr->TechType == DDR3_TECHNOLOGY) ? // (ChnlTmgMod[1] >= DDR667_FREQUENCY) : // (ChnlTmgMod[1] <= DDR1066_FREQUENCY)); - MemClkFreq = ChnlTmgMod[1]; + MemClkFreq = (MEMORY_BUS_SPEED) ChnlTmgMod[1]; } } diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnmct.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnmct.c index 613aadd..9ff66f2 100644 --- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnmct.c +++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnmct.c @@ -186,7 +186,7 @@ MemNSyncTargetSpeedNb ( ASSERT ((NBPtr->ChannelPtr->TechType == DDR3_TECHNOLOGY) ? ((MEMORY_BUS_SPEED)(ChnlTmgMod[1]) >= DDR667_FREQUENCY) : ((MEMORY_BUS_SPEED)(ChnlTmgMod[1]) <= DDR1066_FREQUENCY)); - MemClkFreq = ChnlTmgMod[1]; + MemClkFreq = (MEMORY_BUS_SPEED) ChnlTmgMod[1]; } }

1 0

Patch set updated for coreboot: efab921 vendorcode/amd/agesa: Logic typo in GfxPowerPlayLocateTdp
by Edward O'Callaghan 19 May '14

19 May '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5752 -gerrit commit efab9217078d9d19989506647c4b1284cb195c63 Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Thu May 15 19:37:24 2014 +1000 vendorcode/amd/agesa: Logic typo in GfxPowerPlayLocateTdp The function GfxPowerPlayLocateTdp() sets MinDeltaSclk to a maximum sentinel value and checks DeltaSclk in a loop to minimize MinDeltaSclk. However, MinDeltaSclk incorrectly self-assigns. Change-Id: Id01c792057681516bba411adec268769a3549aa8 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- .../f12/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c | 2 +- .../f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c | 12 ++++++------ .../Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c index 6642c8a..7ecb6fa 100644 --- a/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c +++ b/src/vendorcode/amd/agesa/f12/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c @@ -211,7 +211,7 @@ GfxPowerPlayLocateTdp ( DpmSclk = GfxFmCalculateClock (PpFuses->SclkDpmDid[Index], StdHeader); DeltaSclk = (DpmSclk > Sclk) ? (DpmSclk - Sclk) : (Sclk - DpmSclk); if (DeltaSclk < MinDeltaSclk) { - MinDeltaSclk = MinDeltaSclk; + MinDeltaSclk = DeltaSclk; DpmIndex = Index; } } diff --git a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c index feb6123..5f06eb6 100644 --- a/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c +++ b/src/vendorcode/amd/agesa/f14/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c @@ -17,7 +17,7 @@ * * Copyright (c) 2011, Advanced Micro Devices, Inc. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * Redistributions of source code must retain the above copyright @@ -25,10 +25,10 @@ * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * * Neither the name of Advanced Micro Devices, Inc. nor the names of - * its contributors may be used to endorse or promote products derived + * * Neither the name of Advanced Micro Devices, Inc. nor the names of + * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -39,7 +39,7 @@ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * * *************************************************************************** * */ @@ -204,7 +204,7 @@ GfxPowerPlayLocateTdp ( DpmSclk = GfxFmCalculateClock (PpFuses->SclkDpmDid[Index], StdHeader); DeltaSclk = (DpmSclk > Sclk) ? (DpmSclk - Sclk) : (Sclk - DpmSclk); if (DeltaSclk < MinDeltaSclk) { - MinDeltaSclk = MinDeltaSclk; + MinDeltaSclk = DeltaSclk; DpmIndex = Index; } } diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c index 0c3e7a1..1bbb397 100644 --- a/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c +++ b/src/vendorcode/amd/agesa/f15tn/Proc/GNB/Modules/GnbGfxInitLibV1/GfxPowerPlayTable.c @@ -147,7 +147,7 @@ GfxPowerPlayLocateTdp ( DpmSclk = GfxFmCalculateClock (PpFuses->SclkDpmDid[Index], StdHeader); DeltaSclk = (DpmSclk > Sclk) ? (DpmSclk - Sclk) : (Sclk - DpmSclk); if (DeltaSclk < MinDeltaSclk) { - MinDeltaSclk = MinDeltaSclk; + MinDeltaSclk = DeltaSclk; DpmIndex = Index; } }

1 0

Patch set updated for coreboot: ec63604 build system: re-enable clang use
by Patrick Georgi 19 May '14

19 May '14

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5747 -gerrit commit ec636046d78de497fe001e754e9cb00c4087bfa6 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Wed May 14 21:05:35 2014 +0200 build system: re-enable clang use Change-Id: I6e07fdec449d0b259d77986f65a60aa36d367cc8 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- Makefile | 26 +++++++++++++++++++++++--- Makefile.inc | 2 +- src/arch/x86/Makefile.inc | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index cc2d27c..5006bf6 100644 --- a/Makefile +++ b/Makefile @@ -107,13 +107,33 @@ else include $(HAVE_DOTCONFIG) -include toolchain.inc - ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y) -CC:=clang -m32 -mno-mmx -mno-sse -no-integrated-as +# FIXME: armv7/aarch64 won't build right now +# FIXME: we somehow need to pass --divide to clang's non-integrated as +# unfortunately -Wa,--divide isn't enough because that passes +# --divide to gcc (which clang uses as "assembler"). +CFLAGS_x86_32 = -no-integrated-as -Qunused-arguments -target i386-elf -m32 +CC_x86_32:=clang + +ifneq ($(CONFIG_MMX),y) +CFLAGS_x86_32 += -mno-mmx +endif + +ifneq ($(CONFIG_SSE),y) +CFLAGS_x86_32 += -mno-sse +endif + +CFLAGS_armv7 = -no-integrated-as -Qunused-arguments -target armv7-eabi -ccc-gcc-name $(CC_armv7) +CC_armv7:=clang + +CFLAGS_aarch64 = -no-integrated-as -Qunused-arguments -target aarch64-eabi -ccc-gcc-name $(CC_aarch64) +CC_aarch64:=clang + HOSTCC:=clang endif +include toolchain.inc + strip_quotes = $(subst ",,$(subst \",,$(1))) # The primary target needs to be here before we include the diff --git a/Makefile.inc b/Makefile.inc index 529250d..4621bb7 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -218,7 +218,7 @@ CPPFLAGS_common := -Isrc -Isrc/include -I$(obj) CPPFLAGS_common += -Isrc/device/oprom/include CPPFLAGS_common += -include $(src)/include/kconfig.h -CFLAGS_common = -Os -pipe -g -nostdinc +CFLAGS_common += -Os -pipe -g -nostdinc CFLAGS_common += -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes CFLAGS_common += -Wwrite-strings -Wredundant-decls -Wno-trigraphs CFLAGS_common += -Wstrict-aliasing -Wshadow diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 6c7008c..02fceba 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -30,7 +30,7 @@ subdirs-y += smp ifeq ($(CONFIG_COMPILER_GCC),y) DISASSEMBLY=-Wa,-acdlns $(CFLAGS_x86_32) else -DISASSEMBLY= +DISASSEMBLY=$(CFLAGS_x86_32) endif OPTION_TABLE_H:=

1 0

Patch set updated for coreboot: db7091a build system: re-enable clang use
by Patrick Georgi 19 May '14

19 May '14

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5747 -gerrit commit db7091abf9350fa0e579ec23e041af2d64aaf495 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Wed May 14 21:05:35 2014 +0200 build system: re-enable clang use Change-Id: I6e07fdec449d0b259d77986f65a60aa36d367cc8 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- Makefile | 23 ++++++++++++++++++++--- Makefile.inc | 2 +- src/arch/x86/Makefile.inc | 2 +- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index cc2d27c..4d97c52 100644 --- a/Makefile +++ b/Makefile @@ -107,13 +107,30 @@ else include $(HAVE_DOTCONFIG) -include toolchain.inc - ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y) -CC:=clang -m32 -mno-mmx -mno-sse -no-integrated-as +# FIXME: armv7/aarch64 won't build right now +CFLAGS_x86_32 = -no-integrated-as -Qunused-arguments -target i386-elf -m32 -Wa,--divide +CC_x86_32:=clang + +ifneq ($(CONFIG_MMX),y) +CFLAGS_x86_32 += -mno-mmx +endif + +ifneq ($(CONFIG_SSE),y) +CFLAGS_x86_32 += -mno-sse +endif + +CFLAGS_armv7 = -no-integrated-as -Qunused-arguments -target armv7-eabi -ccc-gcc-name $(CC_armv7) +CC_armv7:=clang + +CFLAGS_aarch64 = -no-integrated-as -Qunused-arguments -target aarch64-eabi -ccc-gcc-name $(CC_aarch64) +CC_aarch64:=clang + HOSTCC:=clang endif +include toolchain.inc + strip_quotes = $(subst ",,$(subst \",,$(1))) # The primary target needs to be here before we include the diff --git a/Makefile.inc b/Makefile.inc index 529250d..4621bb7 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -218,7 +218,7 @@ CPPFLAGS_common := -Isrc -Isrc/include -I$(obj) CPPFLAGS_common += -Isrc/device/oprom/include CPPFLAGS_common += -include $(src)/include/kconfig.h -CFLAGS_common = -Os -pipe -g -nostdinc +CFLAGS_common += -Os -pipe -g -nostdinc CFLAGS_common += -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes CFLAGS_common += -Wwrite-strings -Wredundant-decls -Wno-trigraphs CFLAGS_common += -Wstrict-aliasing -Wshadow diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 6c7008c..02fceba 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -30,7 +30,7 @@ subdirs-y += smp ifeq ($(CONFIG_COMPILER_GCC),y) DISASSEMBLY=-Wa,-acdlns $(CFLAGS_x86_32) else -DISASSEMBLY= +DISASSEMBLY=$(CFLAGS_x86_32) endif OPTION_TABLE_H:=

1 0

Patch set updated for coreboot: 05dd024 fix printk types
by Patrick Georgi 19 May '14

19 May '14

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5788 -gerrit commit 05dd0248a8964a1964e2e3ceb0740d6c9d366d3b Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Mon May 19 09:18:11 2014 +0200 fix printk types Some size_ts were considered long int and some compilers are picky about that. Change-Id: I671daa18eb3bfa2a7defc120e77bbb1ef72bd417 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- src/northbridge/intel/i5000/raminit.c | 2 +- src/northbridge/via/vx900/northbridge.c | 6 +++--- src/northbridge/via/vx900/raminit_ddr3.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/northbridge/intel/i5000/raminit.c b/src/northbridge/intel/i5000/raminit.c index 4be7d5d..9c694c7 100644 --- a/src/northbridge/intel/i5000/raminit.c +++ b/src/northbridge/intel/i5000/raminit.c @@ -1519,7 +1519,7 @@ static void i5000_dump_error_registers(void) static void i5000_try_restart(const char *msg) { - printk(BIOS_INFO, msg); + printk(BIOS_INFO, "%s", msg); i5000_dump_error_registers(); outb(0x06, 0xcf9); for(;;) asm volatile("hlt"); diff --git a/src/northbridge/via/vx900/northbridge.c b/src/northbridge/via/vx900/northbridge.c index 25e6045..91d1362 100644 --- a/src/northbridge/via/vx900/northbridge.c +++ b/src/northbridge/via/vx900/northbridge.c @@ -144,7 +144,7 @@ static u64 vx900_remap_above_4g(device_t mcu, u32 tolm) start8 = pci_read_config8(mcu, 0x48 + i); if (reg8 <= start8) continue; - printk(BIOS_DEBUG, "Address %x falls on rank %ld\n", tolm, i); + printk(BIOS_DEBUG, "Address %x falls on rank %zu\n", tolm, i); break; } @@ -153,12 +153,12 @@ static u64 vx900_remap_above_4g(device_t mcu, u32 tolm) end = pci_read_config8(mcu, 0x40 + i); if (end == 0) { - printk(BIOS_DEBUG, "Huh? rank %ld empty?\n", i); + printk(BIOS_DEBUG, "Huh? rank %zu empty?\n", i); continue; } if (end < (tolm >> 26)) { - printk(BIOS_DEBUG, "Huh? rank %ld don't need remap?\n", + printk(BIOS_DEBUG, "Huh? rank %zu don't need remap?\n", i); continue; } diff --git a/src/northbridge/via/vx900/raminit_ddr3.c b/src/northbridge/via/vx900/raminit_ddr3.c index f148ffe..a69d699 100644 --- a/src/northbridge/via/vx900/raminit_ddr3.c +++ b/src/northbridge/via/vx900/raminit_ddr3.c @@ -1509,7 +1509,7 @@ static void vx900_dram_range(ramctr_timing * ctrl, rank_layout * ranks) /* vvvvvvvvvv FIXME: Fix odd rank init vvvvvvvvvv */ if ((i & 1)) { - printk(BIOS_EMERG, "I cannot initialize rank %li\n", i); + printk(BIOS_EMERG, "I cannot initialize rank %zu\n", i); print_emerg("I have to disable it\n"); continue; }

1 0

New patch to review for coreboot: 42226c5 build: use CFLAGS_* in more places where they're needed
by Patrick Georgi 19 May '14

19 May '14

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5789 -gerrit commit 42226c53975d0a1d21c0bec32af61fc98d7c506e Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Mon May 19 09:23:57 2014 +0200 build: use CFLAGS_* in more places where they're needed After moving out -m32 from CC_*, 64bit compilers need CFLAGS_* in more places to handle everything in 32bit as appropriate. Change-Id: I692a46836fc0ba29a3a9eb47b123e3712691b45d Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- src/arch/x86/Makefile.inc | 26 +++++++++++++------------- src/cpu/x86/Makefile.inc | 2 +- src/cpu/x86/smm/Makefile.inc | 12 ++++++------ src/vendorcode/google/chromeos/Makefile.inc | 2 +- toolchain.inc | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 35330f8..d560838 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -28,9 +28,9 @@ subdirs-y += lib subdirs-y += smp ifeq ($(CONFIG_COMPILER_GCC),y) -DISASSEMBLY=-Wa,-acdlns $(CFLAGS_x86_32) +DISASSEMBLY=-Wa,-acdlns else -DISASSEMBLY=$(CFLAGS_x86_32) +DISASSEMBLY= endif OPTION_TABLE_H:= @@ -115,7 +115,7 @@ $(objgenerated)/bootblock_inc.S: $$(bootblock_inc) $(objgenerated)/bootblock.o: $(objgenerated)/bootblock.s @printf " CC $(subst $(obj)/,,$(@))\n" - $(CC_bootblock) $(DISASSEMBLY) -c -o $@ $< > $(basename $(a)).disasm + $(CC_bootblock) $(CFLAGS_x86_32) $(DISASSEMBLY) -c -o $@ $< > $(basename $(a)).disasm $(objgenerated)/bootblock.s: $(objgenerated)/bootblock_inc.S $(obj)/config.h $(obj)/build.h @printf " CC $(subst $(obj)/,,$(@))\n" @@ -123,16 +123,16 @@ $(objgenerated)/bootblock.s: $(objgenerated)/bootblock_inc.S $(obj)/config.h $(o $(objgenerated)/bootblock.inc: $(src)/arch/x86/init/$(subst ",,$(CONFIG_BOOTBLOCK_SOURCE)) $(objutil)/romcc/romcc $(OPTION_TABLE_H) @printf " ROMCC $(subst $(obj)/,,$(@))\n" - $(CC_bootblock) $(CPPFLAGS) $(CPPFLAGS_bootblock) -MM -MT$(objgenerated)/bootblock.inc \ + $(CC_bootblock) $(CPPFLAGS_bootblock) -MM -MT$(objgenerated)/bootblock.inc \ $< > $(objgenerated)/bootblock.inc.d - $(ROMCC) -c -S $(bootblock_romccflags) -I. $(CPPFLAGS) $(CPPFLAGS_bootblock) $< -o $@ + $(ROMCC) -c -S $(bootblock_romccflags) -I. $(CPPFLAGS_bootblock) $< -o $@ $(objcbfs)/bootblock.debug: $(objgenerated)/bootblock.o $(objgenerated)/bootblock.ld @printf " LINK $(subst $(obj)/,,$(@))\n" ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y) $(LD_bootblock) -m elf_i386 -static -o $@ -L$(obj) $< -T $(objgenerated)/bootblock.ld else - $(CC_bootblock) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(objgenerated)/bootblock.ld $< + $(CC_bootblock) $(CFLAGS_bootblock) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(objgenerated)/bootblock.ld $< endif @@ -188,12 +188,12 @@ $(objcbfs)/romstage_%.elf: $(objcbfs)/romstage_%.debug $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(objutil)/romcc/romcc $(OPTION_TABLE_H) $(obj)/build.h $(obj)/config.h printf " ROMCC romstage.inc\n" - $(ROMCC) -c -S $(ROMCCFLAGS) -D__PRE_RAM__ -I. $(CPPFLAGS) $(CPPFLAGS_romstage) $< -o $@ + $(ROMCC) -c -S $(ROMCCFLAGS) -D__PRE_RAM__ -I. $(CPPFLAGS_romstage) $< -o $@ else $(obj)/mainboard/$(MAINBOARDDIR)/romstage.pre.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(OPTION_TABLE_H) $(obj)/build.h $(obj)/config.h @printf " CC romstage.inc\n" - $(CC_romstage) -MMD $(CFLAGS_romstage) $(CPPFLAGS_romstage) -D__PRE_RAM__ -I$(src) -I. -I$(obj) -c -S $< -o $@ + $(CC_romstage) $(CPPFLAGS_romstage) $(CFLAGS_romstage) -MMD -D__PRE_RAM__ -I$(src) -I. -I$(obj) -c -S $< -o $@ $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(obj)/mainboard/$(MAINBOARDDIR)/romstage.pre.inc @printf " POST romstage.inc\n" @@ -211,7 +211,7 @@ $(objcbfs)/romstage_null.debug: $$(romstage-objs) $(objgenerated)/romstage_null. ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y) $(LD_romstage) -nostdlib -nostartfiles -static -o $@ -L$(obj) --wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3 --start-group $(romstage-objs) $(romstage-libs) $(LIBGCC_FILE_NAME_romstage) --end-group -T $(objgenerated)/romstage_null.ld else - $(CC_romstage) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(objgenerated)/romstage_null.ld -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(romstage-objs) $(romstage-libs) $(LIBGCC_FILE_NAME_romstage) -Wl,--end-group + $(CC_romstage) $(CFLAGS_romstage) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(objgenerated)/romstage_null.ld -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(romstage-objs) $(romstage-libs) $(LIBGCC_FILE_NAME_romstage) -Wl,--end-group endif $(NM_romstage) $@ | grep -q " [DdBb] "; if [ $$? -eq 0 ]; then \ echo "Forbidden global variables in romstage:"; \ @@ -223,7 +223,7 @@ $(objcbfs)/romstage_xip.debug: $$(romstage-objs) $(objgenerated)/romstage_xip.ld ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y) $(LD_romstage) -nostdlib -nostartfiles -static -o $@ -L$(obj) --wrap __divdi3 --wrap __udivdi3 --wrap __moddi3 --wrap __umoddi3 --start-group $(romstage-objs) $(romstage-libs) $(LIBGCC_FILE_NAME_romstage) --end-group -T $(objgenerated)/romstage_xip.ld else - $(CC_romstage) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(objgenerated)/romstage_xip.ld -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(romstage-objs) $(romstage-libs) $(LIBGCC_FILE_NAME_romstage) -Wl,--end-group + $(CC_romstage) $(CFLAGS_romstage) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(objgenerated)/romstage_xip.ld -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(romstage-objs) $(romstage-libs) $(LIBGCC_FILE_NAME_romstage) -Wl,--end-group endif $(objgenerated)/romstage_null.ld: $$(ldscripts) $(obj)/ldoptions @@ -252,11 +252,11 @@ $(objgenerated)/crt0.romstage.S: $$(crt0s) $(objgenerated)/crt0.romstage.o: $(objgenerated)/crt0.s @printf " CC $(subst $(obj)/,,$(@))\n" - $(CC_romstage) $(DISASSEMBLY) -c -o $@ $< > $(basename $(a)).disasm + $(CC_romstage) $(CFLAGS_x86_32) $(DISASSEMBLY) -c -o $@ $< > $(basename $(a)).disasm $(objgenerated)/crt0.s: $(objgenerated)/crt0.romstage.S $(obj)/config.h $(obj)/build.h @printf " CC $(subst $(obj)/,,$(@))\n" - $(CC_romstage) $(CPPFLAGS) $(CPPFLAGS_x86_32) -MMD -x assembler-with-cpp -E -I$(src)/include -I$(src)/arch/x86/include -I$(obj) -include $(obj)/config.h -include $(obj)/build.h -I. -I$(src) $< -o $@ + $(CC_romstage) $(CPPFLAGS_romstage) -MMD -x assembler-with-cpp -E -I$(src)/include -I$(src)/arch/x86/include -I$(obj) -include $(obj)/config.h -include $(obj)/build.h -I. -I$(src) $< -o $@ endif # CONFIG_ARCH_ROMSTAGE_X86_32 @@ -324,7 +324,7 @@ $(objcbfs)/ramstage.debug: $(objgenerated)/ramstage.o $(src)/arch/x86/ramstage.l ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y) $(LD_ramstage) -m elf_i386 -o $@ -L$(obj) $< -T $(src)/arch/x86/ramstage.ld else - $(CC_ramstage) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(src)/arch/x86/ramstage.ld $< + $(CC_ramstage) $(CFLAGS_ramstage) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(src)/arch/x86/ramstage.ld $< endif endif diff --git a/src/cpu/x86/Makefile.inc b/src/cpu/x86/Makefile.inc index bc6a116..b27fac0 100644 --- a/src/cpu/x86/Makefile.inc +++ b/src/cpu/x86/Makefile.inc @@ -16,7 +16,7 @@ endif rmodules-$(CONFIG_PARALLEL_MP) += sipi_vector.S $(SIPI_DOTO): $(dir $(SIPI_ELF))sipi_vector.rmodules.o - $(CC_ramstage) $(LDFLAGS) -nostdlib -r -o $@ $^ + $(CC_ramstage) $(CFLAGS_ramstage) -nostdlib -r -o $@ $^ $(eval $(call rmodule_link,$(SIPI_ELF), $(SIPI_ELF:.elf=.o), 0)) diff --git a/src/cpu/x86/smm/Makefile.inc b/src/cpu/x86/smm/Makefile.inc index cec738a..ff4023b 100644 --- a/src/cpu/x86/smm/Makefile.inc +++ b/src/cpu/x86/smm/Makefile.inc @@ -36,7 +36,7 @@ ramstage-srcs += $(obj)/cpu/x86/smm/smmstub # SMM Stub Module. The stub is used as a trampoline for relocation and normal # SMM handling. $(obj)/cpu/x86/smm/smmstub.o: $$(smmstub-objs) - $(CC_smmstub) $(LDFLAGS) -nostdlib -r -o $@ $^ + $(CC_smmstub) $(CFLAGS_smmstub) -nostdlib -r -o $@ $^ # Link the SMM stub module with a 0-byte heap. $(eval $(call rmodule_link,$(obj)/cpu/x86/smm/smmstub.elf, $(obj)/cpu/x86/smm/smmstub.o, 0)) @@ -51,7 +51,7 @@ $(obj)/cpu/x86/smm/smmstub.ramstage.o: $(obj)/cpu/x86/smm/smmstub # C-based SMM handler. $(obj)/cpu/x86/smm/smm.o: $$(smm-objs) $(LIBGCC_FILE_NAME_smm) - $(CC_smm) $(LDFLAGS) -nostdlib -r -o $@ -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(smm-objs) $(LIBGCC_FILE_NAME_smm) -Wl,--end-group + $(CC_smm) $(CFLAGS_smm) -nostdlib -r -o $@ -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(smm-objs) $(LIBGCC_FILE_NAME_smm) -Wl,--end-group $(eval $(call rmodule_link,$(obj)/cpu/x86/smm/smm.elf, $(obj)/cpu/x86/smm/smm.o, $(CONFIG_SMM_MODULE_HEAP_SIZE))) @@ -73,21 +73,21 @@ endif # Use TSEG specific entry point and linker script ifeq ($(CONFIG_SMM_TSEG),y) smm-y += smmhandler_tseg.S -SMM_LDFLAGS := $(LDFLAGS) -pie +SMM_LDFLAGS := -pie SMM_LDSCRIPT := smm_tseg.ld else smm-y += smmhandler.S -SMM_LDFLAGS := $(LDFLAGFS) +SMM_LDFLAGS := SMM_LDSCRIPT := smm.ld endif smm-y += smihandler.c $(obj)/cpu/x86/smm/smm.o: $$(smm-objs) $(LIBGCC_FILE_NAME_smm) - $(CC_smm) $(LDFLAGS) -nostdlib -r -o $@ -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(smm-objs) $(LIBGCC_FILE_NAME_smm) -Wl,--end-group + $(CC_smm) $(CFLAGS_smm) -nostdlib -r -o $@ -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(smm-objs) $(LIBGCC_FILE_NAME_smm) -Wl,--end-group $(obj)/cpu/x86/smm/smm_wrap: $(obj)/cpu/x86/smm/smm.o $(src)/cpu/x86/smm/$(SMM_LDSCRIPT) $(obj)/ldoptions - $(CC_smm) $(SMM_LDFLAGS) -nostdlib -nostartfiles -static -o $(obj)/cpu/x86/smm/smm.elf -T $(src)/cpu/x86/smm/$(SMM_LDSCRIPT) $(obj)/cpu/x86/smm/smm.o + $(CC_smm) $(CFLAGS_smm) $(SMM_LDFLAGS) -nostdlib -nostartfiles -static -o $(obj)/cpu/x86/smm/smm.elf -T $(src)/cpu/x86/smm/$(SMM_LDSCRIPT) $(obj)/cpu/x86/smm/smm.o $(NM_smm) -n $(obj)/cpu/x86/smm/smm.elf | sort > $(obj)/cpu/x86/smm/smm.map $(OBJCOPY_smm) -O binary $(obj)/cpu/x86/smm/smm.elf $(obj)/cpu/x86/smm/smm diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc index a875303..56c976d 100644 --- a/src/vendorcode/google/chromeos/Makefile.inc +++ b/src/vendorcode/google/chromeos/Makefile.inc @@ -66,7 +66,7 @@ VBOOT_CFLAGS += $(patsubst -I%,-I../%,$(filter-out -include $(src)/include/kconf VBOOT_CFLAGS += -DVBOOT_DEBUG $(VBOOT_STUB_DOTO): $(VBOOT_STUB_DEPS) - $(CC_romstage) $(LDFLAGS) -nostdlib -r -o $@ $^ + $(CC_romstage) $(CFLAGS_romstage) -nostdlib -r -o $@ $^ # Link the vbootstub module with a 64KiB-byte heap. $(eval $(call rmodule_link,$(VBOOT_STUB_ELF), $(VBOOT_STUB_DOTO), 0x10000)) diff --git a/toolchain.inc b/toolchain.inc index 568097e..2375f17 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -97,7 +97,7 @@ STRIP_$(1) := $(STRIP_$(2)) READELF_$(1) := $(READELF_$(2)) CFLAGS_$(1) = $$(CFLAGS_common) $$(CFLAGS_$(2)) CPPFLAGS_$(1) = $$(CPPFLAGS_common) $$(CPPFLAGS_$(2)) -LIBGCC_FILE_NAME_$(1) = $(wildcard $(shell $(CC_$(2)) -print-libgcc-file-name)) +LIBGCC_FILE_NAME_$(1) = $(wildcard $(shell $(CC_$(2)) $(CFLAGS_$(2)) -print-libgcc-file-name)) endef # initialize standard toolchain (CC,AS and others) for give stage

1 0

New patch to review for coreboot: 79b0d98 fix printk types
by Patrick Georgi 19 May '14

19 May '14

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5788 -gerrit commit 79b0d989b0fdf65da7f5bd89a24348e8b9aec397 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Mon May 19 09:18:11 2014 +0200 fix printk types Some size_ts were considered long int and some compilers are picky about that. Change-Id: I671daa18eb3bfa2a7defc120e77bbb1ef72bd417 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- src/northbridge/intel/i5000/raminit.c | 2 +- src/northbridge/via/vx900/northbridge.c | 8 ++++---- src/northbridge/via/vx900/raminit_ddr3.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/northbridge/intel/i5000/raminit.c b/src/northbridge/intel/i5000/raminit.c index 4be7d5d..9c694c7 100644 --- a/src/northbridge/intel/i5000/raminit.c +++ b/src/northbridge/intel/i5000/raminit.c @@ -1519,7 +1519,7 @@ static void i5000_dump_error_registers(void) static void i5000_try_restart(const char *msg) { - printk(BIOS_INFO, msg); + printk(BIOS_INFO, "%s", msg); i5000_dump_error_registers(); outb(0x06, 0xcf9); for(;;) asm volatile("hlt"); diff --git a/src/northbridge/via/vx900/northbridge.c b/src/northbridge/via/vx900/northbridge.c index 25e6045..f383c3a 100644 --- a/src/northbridge/via/vx900/northbridge.c +++ b/src/northbridge/via/vx900/northbridge.c @@ -144,7 +144,7 @@ static u64 vx900_remap_above_4g(device_t mcu, u32 tolm) start8 = pci_read_config8(mcu, 0x48 + i); if (reg8 <= start8) continue; - printk(BIOS_DEBUG, "Address %x falls on rank %ld\n", tolm, i); + printk(BIOS_DEBUG, "Address %x falls on rank %zu\n", tolm, i); break; } @@ -153,17 +153,17 @@ static u64 vx900_remap_above_4g(device_t mcu, u32 tolm) end = pci_read_config8(mcu, 0x40 + i); if (end == 0) { - printk(BIOS_DEBUG, "Huh? rank %ld empty?\n", i); + printk(BIOS_DEBUG, "Huh? rank %zu empty?\n", i); continue; } if (end < (tolm >> 26)) { - printk(BIOS_DEBUG, "Huh? rank %ld don't need remap?\n", + printk(BIOS_DEBUG, "Huh? rank %zu don't need remap?\n", i); continue; } - printk(BIOS_DEBUG, "Physical rank %u is mapped to\n" + printk(BIOS_DEBUG, "Physical rank %zu is mapped to\n" " Start address: 0x%.10llx (%dMB)\n" " End address: 0x%.10llx (%dMB)\n", (int)i, diff --git a/src/northbridge/via/vx900/raminit_ddr3.c b/src/northbridge/via/vx900/raminit_ddr3.c index f148ffe..a69d699 100644 --- a/src/northbridge/via/vx900/raminit_ddr3.c +++ b/src/northbridge/via/vx900/raminit_ddr3.c @@ -1509,7 +1509,7 @@ static void vx900_dram_range(ramctr_timing * ctrl, rank_layout * ranks) /* vvvvvvvvvv FIXME: Fix odd rank init vvvvvvvvvv */ if ((i & 1)) { - printk(BIOS_EMERG, "I cannot initialize rank %li\n", i); + printk(BIOS_EMERG, "I cannot initialize rank %zu\n", i); print_emerg("I have to disable it\n"); continue; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit May 2014