coreboot-gerrit November 2014

coreboot-gerrit@coreboot.org

1 participants
1441 discussions

Patch merged into coreboot/master: 5f96749 intel/sandybridge: make sure to stay in HLT until reboot
by gerrit＠coreboot.org 30 Nov '14

30 Nov '14

the following patch was just integrated into master: commit 5f967492e351ea6bc473a6d192fe4e2aafc00b1e Author: Patrick Georgi <pgeorgi(a)google.com> Date: Mon Nov 24 22:15:09 2014 +0100 intel/sandybridge: make sure to stay in HLT until reboot It also tells the compiler that we never leave here. Change-Id: I824569efd46b577588387b29fc7781abf8c42385 Found-by: Coverity Scan Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> Reviewed-on: http://review.coreboot.org/7579 Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> See http://review.coreboot.org/7579 for details. -gerrit

1 0

Patch set updated for coreboot: 2fed195 ec/compal/ene932: Fix TODO by sharing kbc func's with kbc driver
by Edward O'Callaghan 30 Nov '14

30 Nov '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/7615 -gerrit commit 2fed19508c33055465b02ede60bfad1645109866 Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Sun Nov 30 16:24:11 2014 +1100 ec/compal/ene932: Fix TODO by sharing kbc func's with kbc driver Change-Id: I711d697f3d254d0f447eb3d46bc0f36e16332688 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/drivers/pc80/Makefile.inc | 1 + src/drivers/pc80/keyboard.c | 10 +++++--- src/ec/compal/ene932/Makefile.inc | 1 - src/ec/compal/ene932/ec.c | 49 --------------------------------------- src/ec/compal/ene932/ec.h | 4 ---- src/include/pc80/keyboard.h | 5 ++++ src/lib/Makefile.inc | 1 + 7 files changed, 14 insertions(+), 57 deletions(-) diff --git a/src/drivers/pc80/Makefile.inc b/src/drivers/pc80/Makefile.inc index fe6d11f..975ce12 100644 --- a/src/drivers/pc80/Makefile.inc +++ b/src/drivers/pc80/Makefile.inc @@ -18,3 +18,4 @@ cmos.default-file = $(CONFIG_CMOS_DEFAULT_FILE):nvramtool cmos.default-type = 0xaa smm-y += mc146818rtc.c +smm-y += keyboard.c diff --git a/src/drivers/pc80/keyboard.c b/src/drivers/pc80/keyboard.c index 06eae46..7aaa73b 100644 --- a/src/drivers/pc80/keyboard.c +++ b/src/drivers/pc80/keyboard.c @@ -65,7 +65,7 @@ /* Wait 400ms for keyboard controller answers */ #define KBC_TIMEOUT_IN_MS 400 -static int kbc_input_buffer_empty(void) +int kbc_input_buffer_empty(void) { u32 timeout; for (timeout = KBC_TIMEOUT_IN_MS; @@ -78,7 +78,7 @@ static int kbc_input_buffer_empty(void) return !!timeout; } -static int kbc_output_buffer_full(void) +int kbc_output_buffer_full(void) { u32 timeout; for (timeout = KBC_TIMEOUT_IN_MS; @@ -91,7 +91,7 @@ static int kbc_output_buffer_full(void) return !!timeout; } -static int kbc_cleanup_buffers(void) +int kbc_cleanup_buffers(void) { u32 timeout; for (timeout = KBC_TIMEOUT_IN_MS; @@ -110,6 +110,8 @@ static int kbc_cleanup_buffers(void) return !!timeout; } +#if !defined(__SMM__) + static enum cb_err kbc_self_test(void) { u8 self_test; @@ -328,3 +330,5 @@ void set_kbc_ps2_mode(void) kbc_cleanup_buffers(); } + +#endif /* !defined(__SMM__) */ diff --git a/src/ec/compal/ene932/Makefile.inc b/src/ec/compal/ene932/Makefile.inc index fb898be..0accda3 100644 --- a/src/ec/compal/ene932/Makefile.inc +++ b/src/ec/compal/ene932/Makefile.inc @@ -1,3 +1,2 @@ ramstage-y += ec.c smm-y += ec.c -smm-y += ../../../lib/delay.c diff --git a/src/ec/compal/ene932/ec.c b/src/ec/compal/ene932/ec.c index 91c979e..f68da81 100644 --- a/src/ec/compal/ene932/ec.c +++ b/src/ec/compal/ene932/ec.c @@ -31,55 +31,6 @@ #include "ec.h" #include "chip.h" -/* kbc helper functions from drivers/pc80/keyboard.c. TODO: share functions. */ -static int kbc_input_buffer_empty(void) -{ - u32 timeout; - for(timeout = KBC_TIMEOUT_IN_MS; timeout && (inb(KBD_STATUS) & KBD_IBF); - timeout--) { - mdelay(1); - } - - if (!timeout) { - printk(BIOS_WARNING, - "Unexpected Keyboard controller input buffer full\n"); - } - return !!timeout; -} - - -static int kbc_output_buffer_full(void) -{ - u32 timeout; - for(timeout = KBC_TIMEOUT_IN_MS; timeout && ((inb(KBD_STATUS) - & KBD_OBF) == 0); timeout--) { - mdelay(1); - } - - if (!timeout) { - printk(BIOS_INFO, "Keyboard controller output buffer result timeout\n"); - } - return !!timeout; -} - -int kbc_cleanup_buffers(void) -{ - u32 timeout; - for(timeout = KBC_TIMEOUT_IN_MS; timeout && (inb(KBD_STATUS) - & (KBD_OBF | KBD_IBF)); timeout--) { - mdelay(1); - inb(KBD_DATA); - } - - if (!timeout) { - printk(BIOS_ERR, "Couldn't cleanup the keyboard controller buffers\n"); - printk(BIOS_ERR, "Status (0x%x): 0x%x, Buffer (0x%x): 0x%x\n", - KBD_STATUS, inb(KBD_STATUS), KBD_DATA, inb(KBD_DATA)); - } - - return !!timeout; -} - /* The ENE 60/64 EC registers are the same command/status IB/OB KBC pair. * Check status from 64 port before each command. diff --git a/src/ec/compal/ene932/ec.h b/src/ec/compal/ene932/ec.h index a1f4544..7ccc579 100644 --- a/src/ec/compal/ene932/ec.h +++ b/src/ec/compal/ene932/ec.h @@ -47,12 +47,8 @@ #define KBD_OBF (1 << 0) // 1: output buffer full (data ready for host) -/* Wait 400ms for keyboard controller answers */ -#define KBC_TIMEOUT_IN_MS 400 - u8 ec_kbc_read_ob(void); void ec_kbc_write_cmd(u8 cmd); void ec_kbc_write_ib(u8 data); -int kbc_cleanup_buffers(void); #endif /* _EC_COMPAL_ENE932_EC_H */ diff --git a/src/include/pc80/keyboard.h b/src/include/pc80/keyboard.h index 16cb959..8ec69e8 100644 --- a/src/include/pc80/keyboard.h +++ b/src/include/pc80/keyboard.h @@ -4,4 +4,9 @@ void pc_keyboard_init(void); void set_kbc_ps2_mode(void); +/* Use in some Embedded Controller drivers */ +int kbc_input_buffer_empty(void); +int kbc_output_buffer_full(void); +int kbc_cleanup_buffers(void); + #endif /* PC80_KEYBOARD_H */ diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 55e0d6d..9cf7ed2 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -88,6 +88,7 @@ ramstage-$(CONFIG_REG_SCRIPT) += reg_script.c romstage-$(CONFIG_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM) += ramstage_cache.c +smm-y += delay.c smm-y += cbfs.c cbfs_core.c memcmp.c smm-$(CONFIG_COMPILER_GCC) += gcc.c

1 0

Patch set updated for coreboot: ee7553f ec/compal/ene932: Fix TODO by sharing kbc func's with kbc driver
by Edward O'Callaghan 30 Nov '14

30 Nov '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/7615 -gerrit commit ee7553f05b3375b6814e3d5000d09ba4c7f7b409 Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Sun Nov 30 16:24:11 2014 +1100 ec/compal/ene932: Fix TODO by sharing kbc func's with kbc driver Change-Id: I711d697f3d254d0f447eb3d46bc0f36e16332688 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/drivers/pc80/Makefile.inc | 1 + src/drivers/pc80/keyboard.c | 10 ++++++--- src/ec/compal/ene932/ec.c | 49 ------------------------------------------- src/ec/compal/ene932/ec.h | 4 ---- src/include/pc80/keyboard.h | 5 +++++ 5 files changed, 13 insertions(+), 56 deletions(-) diff --git a/src/drivers/pc80/Makefile.inc b/src/drivers/pc80/Makefile.inc index fe6d11f..975ce12 100644 --- a/src/drivers/pc80/Makefile.inc +++ b/src/drivers/pc80/Makefile.inc @@ -18,3 +18,4 @@ cmos.default-file = $(CONFIG_CMOS_DEFAULT_FILE):nvramtool cmos.default-type = 0xaa smm-y += mc146818rtc.c +smm-y += keyboard.c diff --git a/src/drivers/pc80/keyboard.c b/src/drivers/pc80/keyboard.c index 06eae46..7aaa73b 100644 --- a/src/drivers/pc80/keyboard.c +++ b/src/drivers/pc80/keyboard.c @@ -65,7 +65,7 @@ /* Wait 400ms for keyboard controller answers */ #define KBC_TIMEOUT_IN_MS 400 -static int kbc_input_buffer_empty(void) +int kbc_input_buffer_empty(void) { u32 timeout; for (timeout = KBC_TIMEOUT_IN_MS; @@ -78,7 +78,7 @@ static int kbc_input_buffer_empty(void) return !!timeout; } -static int kbc_output_buffer_full(void) +int kbc_output_buffer_full(void) { u32 timeout; for (timeout = KBC_TIMEOUT_IN_MS; @@ -91,7 +91,7 @@ static int kbc_output_buffer_full(void) return !!timeout; } -static int kbc_cleanup_buffers(void) +int kbc_cleanup_buffers(void) { u32 timeout; for (timeout = KBC_TIMEOUT_IN_MS; @@ -110,6 +110,8 @@ static int kbc_cleanup_buffers(void) return !!timeout; } +#if !defined(__SMM__) + static enum cb_err kbc_self_test(void) { u8 self_test; @@ -328,3 +330,5 @@ void set_kbc_ps2_mode(void) kbc_cleanup_buffers(); } + +#endif /* !defined(__SMM__) */ diff --git a/src/ec/compal/ene932/ec.c b/src/ec/compal/ene932/ec.c index 91c979e..f68da81 100644 --- a/src/ec/compal/ene932/ec.c +++ b/src/ec/compal/ene932/ec.c @@ -31,55 +31,6 @@ #include "ec.h" #include "chip.h" -/* kbc helper functions from drivers/pc80/keyboard.c. TODO: share functions. */ -static int kbc_input_buffer_empty(void) -{ - u32 timeout; - for(timeout = KBC_TIMEOUT_IN_MS; timeout && (inb(KBD_STATUS) & KBD_IBF); - timeout--) { - mdelay(1); - } - - if (!timeout) { - printk(BIOS_WARNING, - "Unexpected Keyboard controller input buffer full\n"); - } - return !!timeout; -} - - -static int kbc_output_buffer_full(void) -{ - u32 timeout; - for(timeout = KBC_TIMEOUT_IN_MS; timeout && ((inb(KBD_STATUS) - & KBD_OBF) == 0); timeout--) { - mdelay(1); - } - - if (!timeout) { - printk(BIOS_INFO, "Keyboard controller output buffer result timeout\n"); - } - return !!timeout; -} - -int kbc_cleanup_buffers(void) -{ - u32 timeout; - for(timeout = KBC_TIMEOUT_IN_MS; timeout && (inb(KBD_STATUS) - & (KBD_OBF | KBD_IBF)); timeout--) { - mdelay(1); - inb(KBD_DATA); - } - - if (!timeout) { - printk(BIOS_ERR, "Couldn't cleanup the keyboard controller buffers\n"); - printk(BIOS_ERR, "Status (0x%x): 0x%x, Buffer (0x%x): 0x%x\n", - KBD_STATUS, inb(KBD_STATUS), KBD_DATA, inb(KBD_DATA)); - } - - return !!timeout; -} - /* The ENE 60/64 EC registers are the same command/status IB/OB KBC pair. * Check status from 64 port before each command. diff --git a/src/ec/compal/ene932/ec.h b/src/ec/compal/ene932/ec.h index a1f4544..7ccc579 100644 --- a/src/ec/compal/ene932/ec.h +++ b/src/ec/compal/ene932/ec.h @@ -47,12 +47,8 @@ #define KBD_OBF (1 << 0) // 1: output buffer full (data ready for host) -/* Wait 400ms for keyboard controller answers */ -#define KBC_TIMEOUT_IN_MS 400 - u8 ec_kbc_read_ob(void); void ec_kbc_write_cmd(u8 cmd); void ec_kbc_write_ib(u8 data); -int kbc_cleanup_buffers(void); #endif /* _EC_COMPAL_ENE932_EC_H */ diff --git a/src/include/pc80/keyboard.h b/src/include/pc80/keyboard.h index 16cb959..8ec69e8 100644 --- a/src/include/pc80/keyboard.h +++ b/src/include/pc80/keyboard.h @@ -4,4 +4,9 @@ void pc_keyboard_init(void); void set_kbc_ps2_mode(void); +/* Use in some Embedded Controller drivers */ +int kbc_input_buffer_empty(void); +int kbc_output_buffer_full(void); +int kbc_cleanup_buffers(void); + #endif /* PC80_KEYBOARD_H */

1 0

New patch to review for coreboot: 2134f59 ec/compal/ene932: Fix TODO by sharing kbc func's with kbc driver
by Edward O'Callaghan 30 Nov '14

30 Nov '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/7615 -gerrit commit 2134f5912e96f592f22e997627da8fb45757986a Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Sun Nov 30 16:24:11 2014 +1100 ec/compal/ene932: Fix TODO by sharing kbc func's with kbc driver Change-Id: I711d697f3d254d0f447eb3d46bc0f36e16332688 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/drivers/pc80/keyboard.c | 6 +++--- src/ec/compal/ene932/ec.c | 49 --------------------------------------------- src/include/pc80/keyboard.h | 5 +++++ 3 files changed, 8 insertions(+), 52 deletions(-) diff --git a/src/drivers/pc80/keyboard.c b/src/drivers/pc80/keyboard.c index 06eae46..d1cbd10 100644 --- a/src/drivers/pc80/keyboard.c +++ b/src/drivers/pc80/keyboard.c @@ -65,7 +65,7 @@ /* Wait 400ms for keyboard controller answers */ #define KBC_TIMEOUT_IN_MS 400 -static int kbc_input_buffer_empty(void) +int kbc_input_buffer_empty(void) { u32 timeout; for (timeout = KBC_TIMEOUT_IN_MS; @@ -78,7 +78,7 @@ static int kbc_input_buffer_empty(void) return !!timeout; } -static int kbc_output_buffer_full(void) +int kbc_output_buffer_full(void) { u32 timeout; for (timeout = KBC_TIMEOUT_IN_MS; @@ -91,7 +91,7 @@ static int kbc_output_buffer_full(void) return !!timeout; } -static int kbc_cleanup_buffers(void) +int kbc_cleanup_buffers(void) { u32 timeout; for (timeout = KBC_TIMEOUT_IN_MS; diff --git a/src/ec/compal/ene932/ec.c b/src/ec/compal/ene932/ec.c index 91c979e..f68da81 100644 --- a/src/ec/compal/ene932/ec.c +++ b/src/ec/compal/ene932/ec.c @@ -31,55 +31,6 @@ #include "ec.h" #include "chip.h" -/* kbc helper functions from drivers/pc80/keyboard.c. TODO: share functions. */ -static int kbc_input_buffer_empty(void) -{ - u32 timeout; - for(timeout = KBC_TIMEOUT_IN_MS; timeout && (inb(KBD_STATUS) & KBD_IBF); - timeout--) { - mdelay(1); - } - - if (!timeout) { - printk(BIOS_WARNING, - "Unexpected Keyboard controller input buffer full\n"); - } - return !!timeout; -} - - -static int kbc_output_buffer_full(void) -{ - u32 timeout; - for(timeout = KBC_TIMEOUT_IN_MS; timeout && ((inb(KBD_STATUS) - & KBD_OBF) == 0); timeout--) { - mdelay(1); - } - - if (!timeout) { - printk(BIOS_INFO, "Keyboard controller output buffer result timeout\n"); - } - return !!timeout; -} - -int kbc_cleanup_buffers(void) -{ - u32 timeout; - for(timeout = KBC_TIMEOUT_IN_MS; timeout && (inb(KBD_STATUS) - & (KBD_OBF | KBD_IBF)); timeout--) { - mdelay(1); - inb(KBD_DATA); - } - - if (!timeout) { - printk(BIOS_ERR, "Couldn't cleanup the keyboard controller buffers\n"); - printk(BIOS_ERR, "Status (0x%x): 0x%x, Buffer (0x%x): 0x%x\n", - KBD_STATUS, inb(KBD_STATUS), KBD_DATA, inb(KBD_DATA)); - } - - return !!timeout; -} - /* The ENE 60/64 EC registers are the same command/status IB/OB KBC pair. * Check status from 64 port before each command. diff --git a/src/include/pc80/keyboard.h b/src/include/pc80/keyboard.h index 16cb959..8ec69e8 100644 --- a/src/include/pc80/keyboard.h +++ b/src/include/pc80/keyboard.h @@ -4,4 +4,9 @@ void pc_keyboard_init(void); void set_kbc_ps2_mode(void); +/* Use in some Embedded Controller drivers */ +int kbc_input_buffer_empty(void); +int kbc_output_buffer_full(void); +int kbc_cleanup_buffers(void); + #endif /* PC80_KEYBOARD_H */

1 0

Patch merged into coreboot/master: 4a14505 vendorcode/intel/fsp: Update FSP_VENDORCODE_HEADER_PATH
by gerrit＠coreboot.org 29 Nov '14

29 Nov '14

the following patch was just integrated into master: commit 4a145052a3d6cbe89f779fbc317fff8ca3f76601 Author: FEI WANG <wangfei.jimei(a)gmail.com> Date: Sat May 31 15:59:46 2014 +0100 vendorcode/intel/fsp: Update FSP_VENDORCODE_HEADER_PATH Minor change in Kconfig to remove "/" defined in FSP_VENDORCODE_HEADER_PATH and update the path in Makefile.inc. Change-Id: Ic19ab9560aabe307d45b560f167874383cc920aa Signed-off-by: Fei Wang <wangfei.jimei(a)gmail.com> Signed-off-by: FEI WANG <wangfei.jimei(a)gmail.com> Reviewed-on: http://review.coreboot.org/5894 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth <gaumless(a)gmail.com> Reviewed-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> See http://review.coreboot.org/5894 for details. -gerrit

1 0

Patch merged into coreboot/master: 4a91f64 mainboard/intel/minnowmax: use Baytrail Gold3 FSP
by gerrit＠coreboot.org 29 Nov '14

29 Nov '14

the following patch was just integrated into master: commit 4a91f6443121396b2339b06831249453055e3e24 Author: York Yang <york.yang(a)intel.com> Date: Tue Nov 25 15:54:08 2014 -0700 mainboard/intel/minnowmax: use Baytrail Gold3 FSP Baytrail Gold3 FSP support memory down configuration. Update Minnow Max to use Gold3 FSP. Set memory down data in devicetree.cb, instead of use different FSP image. Change-Id: Ic03da2d2a1cee5144b9a013d3dd9f982ff043123 Signed-off-by: York Yang <york.yang(a)intel.com> Reviewed-on: http://review.coreboot.org/7581 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> Reviewed-by: Martin Roth <gaumless(a)gmail.com> See http://review.coreboot.org/7581 for details. -gerrit

1 0

New patch to review for coreboot: 5dfa419 buildgcc: support DESTDIR for libelf
by Patrick Georgi 29 Nov '14

29 Nov '14

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7613 -gerrit commit 5dfa4193a1bccb60e6e37715075b3312d90f7486 Author: Patrick Georgi <pgeorgi(a)google.com> Date: Sat Nov 29 14:43:35 2014 +0100 buildgcc: support DESTDIR for libelf The libelf build system doesn't support the DESTDIR variable. Work around by mangling prefix when installing. Change-Id: I3a56eb2bf919bcb9b586b945dce26a02dbaff931 Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- util/crossgcc/buildgcc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 42ae04d..7f2643f 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -437,7 +437,7 @@ printf "Building libelf ${LIBELF_VERSION} ... " ../${LIBELF_DIR}/configure --disable-shared --prefix=$TARGETDIR \ --infodir=$TARGETDIR/info CFLAGS="$HOSTCFLAGS" || touch .failed $MAKE $JOBS || touch .failed - $MAKE install DESTDIR=$DESTDIR || touch .failed + $MAKE install prefix=$DESTDIR/$TARGETDIR || touch .failed normalize_dirs

1 0

New patch to review for coreboot: 156251b build system: collect compiler configuration in xcompile
by Patrick Georgi 29 Nov '14

29 Nov '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 156251bfa32dc7146e92b1fc3ad2c6c58ceaf54c 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 | 60 +++++++++++++++++++++++++++++++++-------------- 4 files changed, 46 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 cc4ce8d..e0bf95d 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 4d2fe0b..b75bceb 100644 --- a/toolchain.inc +++ b/toolchain.inc @@ -92,15 +92,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..9774b2c 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,54 @@ 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 -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 +193,7 @@ arch_config_arm() { TWIDTH="32" TSUPP="arm armv4 armv7" TABI="eabi" + CC_RT_EXTRA_GCC= } arch_config_aarch64() { @@ -185,6 +202,7 @@ arch_config_aarch64() { TCLIST="aarch64" TWIDTH="64" TABI="elf" + CC_RT_EXTRA_GCC= } arch_config_riscv() { @@ -193,6 +211,7 @@ arch_config_riscv() { TCLIST="riscv" TWIDTH="64" TABI="elf" + CC_RT_EXTRA_GCC= } arch_config_x86() { @@ -201,6 +220,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 +254,19 @@ 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 + testcc "clang" "-target ${clang_arch}-$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}-${TABI} -no-integrated-as -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: 5f19eb6 ec: Use DEVICE_NOOP macro formalism over static stub func
by gerrit＠coreboot.org 29 Nov '14

29 Nov '14

the following patch was just integrated into master: commit 5f19eb6f402e3fa5c095d275f6483cf61edfb59b Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Sat Nov 29 00:03:03 2014 +1100 ec: Use DEVICE_NOOP macro formalism over static stub func The in source comment: /* This function avoids an error on serial console. */ refers to the resource allocator needing to find a non-NULL function pointer else complaints of "... missing read_resources" will be spewed. Unfortunately/fortunately (depending on the time of day) compiler optimisers have gotten a bit better at optimising away no-op functions leading to the very message these stubs attempted to avoid. By using the DEVICE_NOOP formalism that is static inlined 'suggests' (not enforces) to the compiler to keep these symbols around. Change-Id: I182019627b6954a4020f9f70e9c829ce3135f63c Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Reviewed-on: http://review.coreboot.org/7598 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi(a)google.com> See http://review.coreboot.org/7598 for details. -gerrit

1 0

New patch to review for coreboot: 9395939 build system: remove ROMSTAGE_ELF variable
by Patrick Georgi 29 Nov '14

29 Nov '14

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7611 -gerrit commit 939593903951b4fa2f53cd38419bd721df73e58c Author: Patrick Georgi <pgeorgi(a)google.com> Date: Sat Nov 29 11:51:25 2014 +0100 build system: remove ROMSTAGE_ELF variable No need to keep that just because x86 has one extra linking step. Change-Id: Iffdbf64e0613f89070ed0dfb009379f5ca0bd3c1 Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- Makefile.inc | 17 ++--------------- src/arch/x86/Makefile.inc | 10 +++++----- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 79392f4..a33eaf3 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -602,24 +602,11 @@ cbfs-files-$(CONFIG_BOOTSPLASH) += bootsplash.jpg bootsplash.jpg-file := $(call strip_quotes,$(CONFIG_BOOTSPLASH_FILE)) bootsplash.jpg-type := bootsplash -ifeq ($(CONFIG_ARCH_ROMSTAGE_ARM),y) -ROMSTAGE_ELF := romstage.elf -endif -ifeq ($(CONFIG_ARCH_ROMSTAGE_ARM64),y) -ROMSTAGE_ELF := romstage.elf -endif -ifeq ($(CONFIG_ARCH_ROMSTAGE_RISCV),y) -ROMSTAGE_ELF := romstage.elf -endif -ifeq ($(CONFIG_ARCH_ROMSTAGE_X86_32),y) -ROMSTAGE_ELF := romstage_xip.elf -endif - -$(obj)/coreboot.pre: $(objcbfs)/$(ROMSTAGE_ELF) $(obj)/coreboot.pre1 $(CBFSTOOL) +$(obj)/coreboot.pre: $(objcbfs)/romstage.elf $(obj)/coreboot.pre1 $(CBFSTOOL) @printf " CBFS $(subst $(obj)/,,$(@))\n" cp $(obj)/coreboot.pre1 $@.tmp $(CBFSTOOL) $@.tmp add-stage \ - -f $(objcbfs)/$(ROMSTAGE_ELF) \ + -f $(objcbfs)/romstage.elf \ -n $(CONFIG_CBFS_PREFIX)/romstage -c none \ $(CBFSTOOL_PRE_OPTS) mv $@.tmp $@ diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index e66752e..2eaeeff 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -176,11 +176,11 @@ else ROMCCFLAGS := -mcpu=i386 -O2 # !MMX, !SSE endif -$(objcbfs)/romstage_%.bin: $(objcbfs)/romstage_%.elf +$(objcbfs)/romstage%.bin: $(objcbfs)/romstage%.elf @printf " OBJCOPY $(subst $(obj)/,,$(@))\n" $(OBJCOPY_romstage) -O binary $< $@ -$(objcbfs)/romstage_%.elf: $(objcbfs)/romstage_%.debug +$(objcbfs)/romstage%.elf: $(objcbfs)/romstage%.debug @printf " OBJCOPY $(subst $(obj)/,,$(@))\n" cp $< $@.tmp $(OBJCOPY_romstage) --strip-debug $@.tmp @@ -215,9 +215,9 @@ $(objcbfs)/romstage_null.debug: $$(romstage-objs) $(objgenerated)/romstage_null. $(NM_romstage) $@ | grep " [DdBb] "; test "$(CONFIG_CPU_AMD_AGESA)" = y; \ else true; fi -$(objcbfs)/romstage_xip.debug: $$(romstage-objs) $(objgenerated)/romstage_xip.ld $$(romstage-libs) +$(objcbfs)/romstage.debug: $$(romstage-objs) $(objgenerated)/romstage.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_xip.ld + $(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.ld $(objgenerated)/romstage_null.ld: $$(ldscripts) $(obj)/ldoptions @printf " GEN $(subst $(obj)/,,$(@))\n" @@ -226,7 +226,7 @@ $(objgenerated)/romstage_null.ld: $$(ldscripts) $(obj)/ldoptions printf '$(foreach ldscript,ldoptions $(ldscripts),INCLUDE "$(ldscript:$(obj)/%=%)"\n)' >> $@.tmp mv $@.tmp $@ -$(objgenerated)/romstage_xip.ld: $(objgenerated)/romstage_null.ld $(objcbfs)/base_xip.txt +$(objgenerated)/romstage.ld: $(objgenerated)/romstage_null.ld $(objcbfs)/base_xip.txt @printf " GEN $(subst $(obj)/,,$(@))\n" rm -f $@ sed -e 's/^/ROMSTAGE_BASE = /g' -e 's/$$/;/g' $(objcbfs)/base_xip.txt > $@.tmp

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit November 2014