June 2013 - coreboot-gerrit - mail.coreboot.org

Patch set updated for coreboot: 1362ccd lenovo/t60 lenovo/x60: Override SMBIOS vendor name to all upper case
by Paul Menzel June 2, 2013

June 2, 2013

Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1557 -gerrit commit 1362ccdfcc788895a39deb65473246cbe099fa1b Author: Peter Stuge <peter(a)stuge.se> Date: Thu Oct 4 21:25:18 2012 +0200 lenovo/t60 lenovo/x60: Override SMBIOS vendor name to all upper case This allows the Linux thinkpad_acpi.ko module to understand that a ThinkPad is a ThinkPad also when it runs coreboot. Change-Id: I85c948b9a772ac878708d72012e522e87c49c2b2 Signed-off-by: Peter Stuge <peter(a)stuge.se> --- src/mainboard/lenovo/t60/Kconfig | 4 ++++ src/mainboard/lenovo/x60/Kconfig | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig index 062a459..6f86394 100644 --- a/src/mainboard/lenovo/t60/Kconfig +++ b/src/mainboard/lenovo/t60/Kconfig @@ -40,6 +40,10 @@ config MAINBOARD_PART_NUMBER string default "ThinkPad T60 / T60p" +config MAINBOARD_SMBIOS_VENDOR + string + default "LENOVO" + config MMCONF_BASE_ADDRESS hex default 0xf0000000 diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig index e77fac6..928fbf7 100644 --- a/src/mainboard/lenovo/x60/Kconfig +++ b/src/mainboard/lenovo/x60/Kconfig @@ -42,6 +42,10 @@ config MAINBOARD_PART_NUMBER string default "ThinkPad X60 / X60s" +config MAINBOARD_SMBIOS_VENDOR + string + default "LENOVO" + config MMCONF_BASE_ADDRESS hex default 0xf0000000

1 0

Patch merged into coreboot/master: 29a4355 Provide sane Kconfig default for cmos.default.
by gerrit＠coreboot.org June 2, 2013

June 2, 2013

the following patch was just integrated into master: commit 29a435597345e1e05a449f2e864c8e3746538c45 Author: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> Date: Tue May 28 13:46:12 2013 +0200 Provide sane Kconfig default for cmos.default. Without that fix we have with CONFIG_USE_OPTION_TABLE: OPTION cmos_layout.bin build/util/nvramtool/nvramtool -y /home/gnutoo/x86/coreboot-alix/src/mainboard/pcengines/alix1c/cmos.layout -L build/cmos_layout.bin make: *** No rule to make target `nvramtool', needed by `build/coreboot.pre1'. Stop. rm build/util/sconfig/sconfig.tab.c build/cbfs/fallback/bootblock.elf build/util/sconfig/lex.yy.c That log was captured with make V=1 but the error also appear with make. Tested on the PC Engines ALIX.1C with the following commit (Change-Id: Ia87b090) [1]: PC Engines ALIX.1C: Add CMOS defaults. [1] http://review.coreboot.org/#/c/3323/ Change-Id: I548005a58f430ed7b6da5249a24bbdcae440a1e9 Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> Reviewed-on: http://review.coreboot.org/3223 Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Reviewed-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Tested-by: build bot (Jenkins) See http://review.coreboot.org/3223 for details. -gerrit

1 0

Patch set updated for coreboot: a0959b9 Provide sane Kconfig default for cmos.default.
by Paul Menzel June 2, 2013

June 2, 2013

Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3223 -gerrit commit a0959b9dc629f5e8386b90afcada6fe275fae6cc Author: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> Date: Tue May 28 13:46:12 2013 +0200 Provide sane Kconfig default for cmos.default. Without that fix we have with CONFIG_USE_OPTION_TABLE: OPTION cmos_layout.bin build/util/nvramtool/nvramtool -y /home/gnutoo/x86/coreboot-alix/src/mainboard/pcengines/alix1c/cmos.layout -L build/cmos_layout.bin make: *** No rule to make target `nvramtool', needed by `build/coreboot.pre1'. Stop. rm build/util/sconfig/sconfig.tab.c build/cbfs/fallback/bootblock.elf build/util/sconfig/lex.yy.c That log was captured with make V=1 but the error also appear with make. Tested on the PC Engines ALIX.1C with the following commit (Change-Id: Ia87b090) [1]: PC Engines ALIX.1C: Add CMOS defaults. [1] http://review.coreboot.org/#/c/3323/ Change-Id: I548005a58f430ed7b6da5249a24bbdcae440a1e9 Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> --- src/arch/x86/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index 5f46145..c7b2434 100644 --- a/src/arch/x86/Kconfig +++ b/src/arch/x86/Kconfig @@ -81,6 +81,7 @@ config HAVE_CMOS_DEFAULT config CMOS_DEFAULT_FILE string + default "src/mainboard/$(MAINBOARDDIR)/cmos.default" depends on HAVE_CMOS_DEFAULT config BOOTBLOCK_SOUTHBRIDGE_INIT

1 0

Patch set updated for coreboot: ae3e0ec Lenovo X60: permit to compile the x60 code without SMM.
by Paul Menzel June 2, 2013

June 2, 2013

Paul Menzel (paulepanter(a)users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3274 -gerrit commit ae3e0ecfd32ff75a4cadb5f8f7b3adae32f7324f Author: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> Date: Sun Apr 21 19:32:02 2013 +0200 Lenovo X60: permit to compile the x60 code without SMM. Removing or commenting `HAVE_SMI_HANDLER` from the Kconfig file – by default .config –, results in the following build error. CC cbfs/fallback/coreboot_ram.debug build/generated/coreboot_ram.o: In function `i82801gx_lock_smm': src/southbridge/intel/i82801gx/lpc.c:350: undefined reference to `smm_lock' build/generated/coreboot_ram.o: In function `write_acpi_tables': src/mainboard/lenovo/x60/acpi_tables.c:231: undefined reference to `smm_setup_structures' build/generated/coreboot_ram.o: In function `initialize_cpus': src/cpu/x86/lapic/lapic_cpu_init.c:562: undefined reference to `smm_init' build/generated/coreboot_ram.o: In function `acpi_resume': src/arch/x86/boot/acpi.c:633: undefined reference to `smm_setup_structures' collect2: error: ld returned 1 exit status Adding the following guards #if CONFIG_HAVE_SMI_HANDLER […] #endif at the appropriate places, results in a successful build. Change-Id: I33088e89030b5ef55fd83c188beedd76f07d86cb Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> --- src/mainboard/lenovo/x60/acpi_tables.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/mainboard/lenovo/x60/acpi_tables.c b/src/mainboard/lenovo/x60/acpi_tables.c index f6ed4ae..82d6a18 100644 --- a/src/mainboard/lenovo/x60/acpi_tables.c +++ b/src/mainboard/lenovo/x60/acpi_tables.c @@ -35,6 +35,7 @@ extern const unsigned char AmlCode[]; unsigned long acpi_create_slic(unsigned long current); #endif +#if CONFIG_HAVE_SMI_HANDLER #include "southbridge/intel/i82801gx/nvs.h" static void acpi_create_gnvs(global_nvs_t *gnvs) { @@ -54,6 +55,7 @@ static void acpi_create_gnvs(global_nvs_t *gnvs) gnvs->did[3] = 0x80000410; gnvs->did[4] = 0x00000005; } +#endif unsigned long acpi_fill_madt(unsigned long current) { @@ -107,7 +109,9 @@ void smm_setup_structures(void *gnvs, void *tcg, void *smi1); unsigned long write_acpi_tables(unsigned long start) { unsigned long current; +#if CONFIG_HAVE_SMI_HANDLER int i; +#endif acpi_rsdp_t *rsdp; acpi_rsdt_t *rsdt; acpi_xsdt_t *xsdt; @@ -121,8 +125,9 @@ unsigned long write_acpi_tables(unsigned long start) #endif acpi_header_t *ssdt; acpi_header_t *dsdt; +#if CONFIG_HAVE_SMI_HANDLER void *gnvs; - +#endif current = start; /* Align ACPI tables to 16byte */ @@ -185,7 +190,7 @@ unsigned long write_acpi_tables(unsigned long start) memcpy(dsdt, &AmlCode, sizeof(acpi_header_t)); current += dsdt->length; memcpy(dsdt, &AmlCode, dsdt->length); - +#if CONFIG_HAVE_SMI_HANDLER /* Fix up global NVS region for SMI handler. The GNVS region lives * in the (high) table area. The low memory map looks like this: * @@ -237,6 +242,8 @@ unsigned long write_acpi_tables(unsigned long start) printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt, dsdt->length); +#endif + #if CONFIG_HAVE_ACPI_SLIC printk(BIOS_DEBUG, "ACPI: * SLIC\n"); slic = (acpi_header_t *)current;

1 0