March 2010 - coreboot - mail.coreboot.org

build service results for r5313
by coreboot information March 29, 2010

March 29, 2010

Dear coreboot readers! This is the automatic build system of coreboot. The developer "stepan" checked in revision 5313 to the coreboot repository. This caused the following changes: Change Log: This patch drops the coreboot CMOS checksum ranges from Kconfig because the information is already specified in cmos.layout. coreboot is changed to use that version instead. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Ronald G. Minnich <rminnich(a)gmai.com> Build Log: Compilation of emulation:qemu-x86 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5313&device=qemu-x86&vendo… Compilation of intel:mtarvon has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5313&device=mtarvon&vendor… Compilation of intel:truxton has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5313&device=truxton&vendor… If something broke during this checkin please be a pain in stepan's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

[commit] r5313 - in trunk: src src/arch/i386 src/arch/i386/boot src/include/pc80 src/lib src/mainboard/amd/dbm690t src/mainboard/amd/mahogany src/mainboard/amd/mahogany_fam10 src/mainboard/amd/pist...
by repository service March 29, 2010

March 29, 2010

Author: stepan Date: Mon Mar 29 19:14:28 2010 New Revision: 5313 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5313 Log: This patch drops the coreboot CMOS checksum ranges from Kconfig because the information is already specified in cmos.layout. coreboot is changed to use that version instead. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Ronald G. Minnich <rminnich(a)gmai.com> Modified: trunk/src/Kconfig trunk/src/arch/i386/Makefile.inc trunk/src/arch/i386/boot/coreboot_table.c trunk/src/include/pc80/mc146818rtc.h trunk/src/lib/Makefile.inc trunk/src/mainboard/amd/dbm690t/Kconfig trunk/src/mainboard/amd/mahogany/Kconfig trunk/src/mainboard/amd/mahogany_fam10/Kconfig trunk/src/mainboard/amd/pistachio/Kconfig trunk/src/mainboard/amd/serengeti_cheetah/Kconfig trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig trunk/src/mainboard/arima/hdama/Kconfig trunk/src/mainboard/asus/a8n_e/Kconfig trunk/src/mainboard/asus/a8v-e_se/Kconfig trunk/src/mainboard/asus/m2v-mx_se/Kconfig trunk/src/mainboard/broadcom/blast/Kconfig trunk/src/mainboard/dell/s1850/Kconfig trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig trunk/src/mainboard/gigabyte/m57sli/Kconfig trunk/src/mainboard/hp/dl145_g3/Kconfig trunk/src/mainboard/ibm/e325/Kconfig trunk/src/mainboard/ibm/e326/Kconfig trunk/src/mainboard/intel/d945gclf/Kconfig trunk/src/mainboard/intel/eagleheights/Kconfig trunk/src/mainboard/intel/jarrell/Kconfig trunk/src/mainboard/intel/mtarvon/Kconfig trunk/src/mainboard/intel/truxton/Kconfig trunk/src/mainboard/intel/xe7501devkit/Kconfig trunk/src/mainboard/iwill/dk8_htx/Kconfig trunk/src/mainboard/iwill/dk8s2/Kconfig trunk/src/mainboard/iwill/dk8x/Kconfig trunk/src/mainboard/kontron/986lcd-m/Kconfig trunk/src/mainboard/kontron/kt690/Kconfig trunk/src/mainboard/msi/ms7135/Kconfig trunk/src/mainboard/msi/ms7260/Kconfig trunk/src/mainboard/msi/ms9185/Kconfig trunk/src/mainboard/msi/ms9282/Kconfig trunk/src/mainboard/msi/ms9652_fam10/Kconfig trunk/src/mainboard/newisys/khepri/Kconfig trunk/src/mainboard/nvidia/l1_2pvv/Kconfig trunk/src/mainboard/roda/rk886ex/Kconfig trunk/src/mainboard/sunw/ultra40/Kconfig trunk/src/mainboard/supermicro/h8dme/Kconfig trunk/src/mainboard/supermicro/h8dmr/Kconfig trunk/src/mainboard/supermicro/h8dmr_fam10/Kconfig trunk/src/mainboard/supermicro/h8qme_fam10/Kconfig trunk/src/mainboard/supermicro/x6dai_g/Kconfig trunk/src/mainboard/supermicro/x6dhe_g/Kconfig trunk/src/mainboard/supermicro/x6dhe_g2/Kconfig trunk/src/mainboard/supermicro/x6dhr_ig/Kconfig trunk/src/mainboard/supermicro/x6dhr_ig2/Kconfig trunk/src/mainboard/technexion/tim5690/Kconfig trunk/src/mainboard/technexion/tim8690/Kconfig trunk/src/mainboard/tyan/s2735/Kconfig trunk/src/mainboard/tyan/s2850/Kconfig trunk/src/mainboard/tyan/s2875/Kconfig trunk/src/mainboard/tyan/s2880/Kconfig trunk/src/mainboard/tyan/s2881/Kconfig trunk/src/mainboard/tyan/s2882/Kconfig trunk/src/mainboard/tyan/s2885/Kconfig trunk/src/mainboard/tyan/s2891/Kconfig trunk/src/mainboard/tyan/s2892/Kconfig trunk/src/mainboard/tyan/s2895/Kconfig trunk/src/mainboard/tyan/s2912/Kconfig trunk/src/mainboard/tyan/s2912_fam10/Kconfig trunk/src/mainboard/tyan/s4880/Kconfig trunk/src/mainboard/tyan/s4882/Kconfig trunk/src/pc80/mc146818rtc.c trunk/src/pc80/mc146818rtc_early.c trunk/util/options/build_opt_tbl.c Modified: trunk/src/Kconfig ============================================================================== --- trunk/src/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -214,18 +214,6 @@ hex default 0x20000 -config LB_CKS_RANGE_START - int - default 49 - -config LB_CKS_RANGE_END - int - default 125 - -config LB_CKS_LOC - int - default 126 - config LOGICAL_CPUS bool default y Modified: trunk/src/arch/i386/Makefile.inc ============================================================================== --- trunk/src/arch/i386/Makefile.inc Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/arch/i386/Makefile.inc Mon Mar 29 19:14:28 2010 (r5313) @@ -59,9 +59,9 @@ @printf " OPTION $(subst $(obj)/,,$(@))\n" $(obj)/build_opt_tbl --config $(top)/src/mainboard/$(MAINBOARDDIR)/cmos.layout --header $(obj)/option_table.h --option $(obj)/option_table.c -$(obj)/build_opt_tbl: $(top)/util/options/build_opt_tbl.c $(top)/src/include/pc80/mc146818rtc.h $(top)/src/include/boot/coreboot_tables.h $(obj)/config.h +$(obj)/build_opt_tbl: $(top)/util/options/build_opt_tbl.c $(top)/src/include/pc80/mc146818rtc.h $(top)/src/include/boot/coreboot_tables.h @printf " HOSTCC $(subst $(obj)/,,$(@))\n" - $(HOSTCC) $(HOSTCFLAGS) -include $(obj)/config.h $< -o $@ + $(HOSTCC) $(HOSTCFLAGS) $< -o $@ ####################################################################### # Build the coreboot_ram (stage 2) Modified: trunk/src/arch/i386/boot/coreboot_table.c ============================================================================== --- trunk/src/arch/i386/boot/coreboot_table.c Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/arch/i386/boot/coreboot_table.c Mon Mar 29 19:14:28 2010 (r5313) @@ -2,7 +2,7 @@ * This file is part of the coreboot project. * * Copyright (C) 2003-2004 Eric Biederman - * Copyright (C) 2005-2009 coresystems GmbH + * Copyright (C) 2005-2010 coresystems GmbH * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -29,6 +29,9 @@ #include <version.h> #include <device/device.h> #include <stdlib.h> +#if (CONFIG_HAVE_OPTION_TABLE == 1) +#include <pc80/mc146818rtc.h> +#endif static struct lb_header *lb_table_init(unsigned long addr) { @@ -196,9 +199,9 @@ cmos_checksum->size = (sizeof(*cmos_checksum)); - cmos_checksum->range_start = CONFIG_LB_CKS_RANGE_START * 8; - cmos_checksum->range_end = ( CONFIG_LB_CKS_RANGE_END * 8 ) + 7; - cmos_checksum->location = CONFIG_LB_CKS_LOC * 8; + cmos_checksum->range_start = LB_CKS_RANGE_START * 8; + cmos_checksum->range_end = ( LB_CKS_RANGE_END * 8 ) + 7; + cmos_checksum->location = LB_CKS_LOC * 8; cmos_checksum->type = CHECKSUM_PCBIOS; return cmos_checksum; Modified: trunk/src/include/pc80/mc146818rtc.h ============================================================================== --- trunk/src/include/pc80/mc146818rtc.h Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/include/pc80/mc146818rtc.h Mon Mar 29 19:14:28 2010 (r5313) @@ -81,15 +81,9 @@ #define PC_CKS_RANGE_END 45 #define PC_CKS_LOC 46 -/* Linux bios checksum is built only over bytes 49..125 */ -#ifndef CONFIG_LB_CKS_RANGE_START -#define CONFIG_LB_CKS_RANGE_START 49 -#endif -#ifndef CONFIG_LB_CKS_RANGE_END -#define CONFIG_LB_CKS_RANGE_END 125 -#endif -#ifndef CONFIG_LB_CKS_LOC -#define CONFIG_LB_CKS_LOC 126 +/* coreboot cmos checksum is usually only built over bytes 49..125 */ +#ifdef AUTOCONF_INCLUDED +#include <option_table.h> #endif #if !defined(ASSEMBLY) @@ -97,7 +91,8 @@ #if CONFIG_USE_OPTION_TABLE == 1 int get_option(void *dest, const char *name); #else -static inline int get_option(void *dest, const char *name) { return -2; } +static inline int get_option(void *dest __attribute__((unused)), + const char *name __attribute__((unused))) { return -2; } #endif #endif Modified: trunk/src/lib/Makefile.inc ============================================================================== --- trunk/src/lib/Makefile.inc Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/lib/Makefile.inc Mon Mar 29 19:14:28 2010 (r5313) @@ -30,4 +30,4 @@ smmobj-y += memcpy.o -$(obj)/lib/version.o :: $(obj)/build.h +$(obj)/lib/version.o : $(obj)/build.h Modified: trunk/src/mainboard/amd/dbm690t/Kconfig ============================================================================== --- trunk/src/mainboard/amd/dbm690t/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/amd/dbm690t/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -49,16 +49,6 @@ default 0x0 depends on BOARD_AMD_DBM690T -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_AMD_DBM690T - -config LB_CKS_LOC - int - default 123 - depends on BOARD_AMD_DBM690T - config MAINBOARD_PART_NUMBER string default "DBM690T" Modified: trunk/src/mainboard/amd/mahogany/Kconfig ============================================================================== --- trunk/src/mainboard/amd/mahogany/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/amd/mahogany/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -51,16 +51,6 @@ default 0x0 depends on BOARD_AMD_MAHOGANY -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_AMD_MAHOGANY - -config LB_CKS_LOC - int - default 123 - depends on BOARD_AMD_MAHOGANY - config MAINBOARD_PART_NUMBER string default "MAHOGANY" Modified: trunk/src/mainboard/amd/mahogany_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/amd/mahogany_fam10/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/amd/mahogany_fam10/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -35,16 +35,6 @@ default 0x0 depends on BOARD_AMD_MAHOGANY_FAM10 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_AMD_MAHOGANY_FAM10 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_AMD_MAHOGANY_FAM10 - config MAINBOARD_PART_NUMBER string default "Mahogany (Fam10)" Modified: trunk/src/mainboard/amd/pistachio/Kconfig ============================================================================== --- trunk/src/mainboard/amd/pistachio/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/amd/pistachio/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -43,16 +43,6 @@ default 0x0 depends on BOARD_AMD_PISTACHIO -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_AMD_PISTACHIO - -config LB_CKS_LOC - int - default 123 - depends on BOARD_AMD_PISTACHIO - config MAINBOARD_PART_NUMBER string default "Pistachio" Modified: trunk/src/mainboard/amd/serengeti_cheetah/Kconfig ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/amd/serengeti_cheetah/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -46,16 +46,6 @@ default 0x8 depends on BOARD_AMD_SERENGETI_CHEETAH -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_AMD_SERENGETI_CHEETAH - -config LB_CKS_LOC - int - default 123 - depends on BOARD_AMD_SERENGETI_CHEETAH - config MAINBOARD_PART_NUMBER string default "Serengeti Cheetah" Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -33,16 +33,6 @@ default 0x0 depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 - config MAINBOARD_PART_NUMBER string default "Serengeti Cheetah (Fam10)" Modified: trunk/src/mainboard/arima/hdama/Kconfig ============================================================================== --- trunk/src/mainboard/arima/hdama/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/arima/hdama/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -35,16 +35,6 @@ default 0x0 depends on BOARD_ARIMA_HDAMA -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_ARIMA_HDAMA - -config LB_CKS_LOC - int - default 123 - depends on BOARD_ARIMA_HDAMA - config MAINBOARD_PART_NUMBER string default "HDAMA" Modified: trunk/src/mainboard/asus/a8n_e/Kconfig ============================================================================== --- trunk/src/mainboard/asus/a8n_e/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/asus/a8n_e/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -49,16 +49,6 @@ default n depends on BOARD_ASUS_A8N_E -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_ASUS_A8N_E - -config LB_CKS_LOC - int - default 123 - depends on BOARD_ASUS_A8N_E - config MAINBOARD_PART_NUMBER string default "A8N-E" Modified: trunk/src/mainboard/asus/a8v-e_se/Kconfig ============================================================================== --- trunk/src/mainboard/asus/a8v-e_se/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/asus/a8v-e_se/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -49,16 +49,6 @@ default n depends on BOARD_ASUS_A8V_E_SE -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_ASUS_A8V_E_SE - -config LB_CKS_LOC - int - default 123 - depends on BOARD_ASUS_A8V_E_SE - config MAINBOARD_PART_NUMBER string default "A8V-E SE" Modified: trunk/src/mainboard/asus/m2v-mx_se/Kconfig ============================================================================== --- trunk/src/mainboard/asus/m2v-mx_se/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/asus/m2v-mx_se/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -82,16 +82,6 @@ default 0x40000 depends on BOARD_ASUS_M2V_MX_SE -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_ASUS_M2V_MX_SE - -config LB_CKS_LOC - int - default 123 - depends on BOARD_ASUS_M2V_MX_SE - config HT_CHAIN_UNITID_BASE hex default 0x0 Modified: trunk/src/mainboard/broadcom/blast/Kconfig ============================================================================== --- trunk/src/mainboard/broadcom/blast/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/broadcom/blast/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -46,16 +46,6 @@ default 1 depends on BOARD_BROADCOM_BLAST -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_BROADCOM_BLAST - -config LB_CKS_LOC - int - default 123 - depends on BOARD_BROADCOM_BLAST - config MAINBOARD_PART_NUMBER string default "Blast" Modified: trunk/src/mainboard/dell/s1850/Kconfig ============================================================================== --- trunk/src/mainboard/dell/s1850/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/dell/s1850/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -20,16 +20,6 @@ default dell/s1850 depends on BOARD_DELL_S1850 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_DELL_S1850 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_DELL_S1850 - config MAINBOARD_PART_NUMBER string default "PowerEdge 1850" Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig ============================================================================== --- trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -50,21 +50,6 @@ default 2 depends on BOARD_GIGABYTE_GA_2761GXDK -config LB_CKS_RANGE_START - int - default 49 - depends on BOARD_GIGABYTE_GA_2761GXDK - -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_GIGABYTE_GA_2761GXDK - -config LB_CKS_LOC - int - default 123 - depends on BOARD_GIGABYTE_GA_2761GXDK - config MAINBOARD_PART_NUMBER string default "GA-2761GXDK" Modified: trunk/src/mainboard/gigabyte/m57sli/Kconfig ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/gigabyte/m57sli/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -53,21 +53,6 @@ default 2 depends on BOARD_GIGABYTE_M57SLI -config LB_CKS_RANGE_START - int - default 49 - depends on BOARD_GIGABYTE_M57SLI - -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_GIGABYTE_M57SLI - -config LB_CKS_LOC - int - default 123 - depends on BOARD_GIGABYTE_M57SLI - config MAINBOARD_PART_NUMBER string default "GA-M57SLI-S4" Modified: trunk/src/mainboard/hp/dl145_g3/Kconfig ============================================================================== --- trunk/src/mainboard/hp/dl145_g3/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/hp/dl145_g3/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -52,16 +52,6 @@ default n depends on BOARD_HP_DL145_G3 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_HP_DL145_G3 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_HP_DL145_G3 - config MAINBOARD_PART_NUMBER string default "ProLiant DL145 G3" Modified: trunk/src/mainboard/ibm/e325/Kconfig ============================================================================== --- trunk/src/mainboard/ibm/e325/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/ibm/e325/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -41,16 +41,6 @@ default 0x0 depends on BOARD_IBM_E325 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_IBM_E325 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_IBM_E325 - config MAINBOARD_PART_NUMBER string default "eServer 325" Modified: trunk/src/mainboard/ibm/e326/Kconfig ============================================================================== --- trunk/src/mainboard/ibm/e326/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/ibm/e326/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -41,16 +41,6 @@ default 0x0 depends on BOARD_IBM_E326 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_IBM_E326 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_IBM_E326 - config MAINBOARD_PART_NUMBER string default "eServer 326" Modified: trunk/src/mainboard/intel/d945gclf/Kconfig ============================================================================== --- trunk/src/mainboard/intel/d945gclf/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/intel/d945gclf/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -61,16 +61,6 @@ default 0x8000 depends on BOARD_INTEL_D945GCLF -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_INTEL_D945GCLF - -config LB_CKS_LOC - int - default 123 - depends on BOARD_INTEL_D945GCLF - config MAINBOARD_PART_NUMBER string default "D945GCLF" Modified: trunk/src/mainboard/intel/eagleheights/Kconfig ============================================================================== --- trunk/src/mainboard/intel/eagleheights/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/intel/eagleheights/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -38,16 +38,6 @@ default 0x8000 depends on BOARD_INTEL_EAGLEHEIGHTS -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_INTEL_EAGLEHEIGHTS - -config LB_CKS_LOC - int - default 123 - depends on BOARD_INTEL_EAGLEHEIGHTS - config MAINBOARD_PART_NUMBER string default "EagleHeights" Modified: trunk/src/mainboard/intel/jarrell/Kconfig ============================================================================== --- trunk/src/mainboard/intel/jarrell/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/intel/jarrell/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -21,16 +21,6 @@ default intel/jarrell depends on BOARD_INTEL_JARRELL -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_INTEL_JARRELL - -config LB_CKS_LOC - int - default 123 - depends on BOARD_INTEL_JARRELL - config MAINBOARD_PART_NUMBER string default "Jarrell" Modified: trunk/src/mainboard/intel/mtarvon/Kconfig ============================================================================== --- trunk/src/mainboard/intel/mtarvon/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/intel/mtarvon/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -17,16 +17,6 @@ default intel/mtarvon depends on BOARD_INTEL_MTARVON -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_INTEL_MTARVON - -config LB_CKS_LOC - int - default 123 - depends on BOARD_INTEL_MTARVON - config MAINBOARD_PART_NUMBER string default "3100 devkit (Mt. Arvon)" Modified: trunk/src/mainboard/intel/truxton/Kconfig ============================================================================== --- trunk/src/mainboard/intel/truxton/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/intel/truxton/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -18,16 +18,6 @@ default intel/truxton depends on BOARD_INTEL_TRUXTON -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_INTEL_TRUXTON - -config LB_CKS_LOC - int - default 123 - depends on BOARD_INTEL_TRUXTON - config MAINBOARD_PART_NUMBER string default "Truxton" Modified: trunk/src/mainboard/intel/xe7501devkit/Kconfig ============================================================================== --- trunk/src/mainboard/intel/xe7501devkit/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/intel/xe7501devkit/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -21,21 +21,6 @@ default intel/xe7501devkit depends on BOARD_INTEL_XE7501DEVKIT -config LB_CKS_RANGE_START - int - default 128 - depends on BOARD_INTEL_XE7501DEVKIT - -config LB_CKS_RANGE_END - int - default 130 - depends on BOARD_INTEL_XE7501DEVKIT - -config LB_CKS_LOC - int - default 131 - depends on BOARD_INTEL_XE7501DEVKIT - config MAINBOARD_PART_NUMBER string default "XE7501devkit" Modified: trunk/src/mainboard/iwill/dk8_htx/Kconfig ============================================================================== --- trunk/src/mainboard/iwill/dk8_htx/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/iwill/dk8_htx/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -45,16 +45,6 @@ default 0x10 depends on BOARD_IWILL_DK8_HTX -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_IWILL_DK8_HTX - -config LB_CKS_LOC - int - default 123 - depends on BOARD_IWILL_DK8_HTX - config MAINBOARD_PART_NUMBER string default "DK8-HTX" Modified: trunk/src/mainboard/iwill/dk8s2/Kconfig ============================================================================== --- trunk/src/mainboard/iwill/dk8s2/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/iwill/dk8s2/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -42,16 +42,6 @@ default 0x0 depends on BOARD_IWILL_DK8S2 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_IWILL_DK8S2 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_IWILL_DK8S2 - config MAINBOARD_PART_NUMBER string default "DK8S2" Modified: trunk/src/mainboard/iwill/dk8x/Kconfig ============================================================================== --- trunk/src/mainboard/iwill/dk8x/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/iwill/dk8x/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -41,16 +41,6 @@ default 0x0 depends on BOARD_IWILL_DK8X -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_IWILL_DK8X - -config LB_CKS_LOC - int - default 123 - depends on BOARD_IWILL_DK8X - config MAINBOARD_PART_NUMBER string default "DK8X" Modified: trunk/src/mainboard/kontron/986lcd-m/Kconfig ============================================================================== --- trunk/src/mainboard/kontron/986lcd-m/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/kontron/986lcd-m/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -38,16 +38,6 @@ default 0x8000 depends on BOARD_KONTRON_986LCD_M -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_KONTRON_986LCD_M - -config LB_CKS_LOC - int - default 123 - depends on BOARD_KONTRON_986LCD_M - config MAINBOARD_PART_NUMBER string default "986LCD-M" Modified: trunk/src/mainboard/kontron/kt690/Kconfig ============================================================================== --- trunk/src/mainboard/kontron/kt690/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/kontron/kt690/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -35,26 +35,11 @@ default 0x6900 depends on BOARD_KONTRON_KT690 -config LB_CKS_RANGE_START - int - default 49 - depends on BOARD_KONTRON_KT690 - config APIC_ID_OFFSET hex default 0x0 depends on BOARD_KONTRON_KT690 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_KONTRON_KT690 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_KONTRON_KT690 - config MAINBOARD_PART_NUMBER string default "KT690/mITX" Modified: trunk/src/mainboard/msi/ms7135/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms7135/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/msi/ms7135/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -34,16 +34,6 @@ default 2 depends on BOARD_MSI_MS7135 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_MSI_MS7135 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_MSI_MS7135 - config MAINBOARD_PART_NUMBER string default "MS-7135" Modified: trunk/src/mainboard/msi/ms7260/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms7260/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/msi/ms7260/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -51,21 +51,6 @@ default 2 depends on BOARD_MSI_MS7260 -config LB_CKS_RANGE_START - int - default 49 - depends on BOARD_MSI_MS7260 - -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_MSI_MS7260 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_MSI_MS7260 - config MAINBOARD_PART_NUMBER string default "MS-7260" Modified: trunk/src/mainboard/msi/ms9185/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms9185/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/msi/ms9185/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -47,16 +47,6 @@ default 2 depends on BOARD_MSI_MS9185 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_MSI_MS9185 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_MSI_MS9185 - config MAINBOARD_PART_NUMBER string default "MS-9185" Modified: trunk/src/mainboard/msi/ms9282/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms9282/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/msi/ms9282/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -45,21 +45,6 @@ default 1 depends on BOARD_MSI_MS9282 -config LB_CKS_RANGE_START - int - default 49 - depends on BOARD_MSI_MS9282 - -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_MSI_MS9282 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_MSI_MS9282 - config MAINBOARD_PART_NUMBER string default "MS-9282" Modified: trunk/src/mainboard/msi/ms9652_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms9652_fam10/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/msi/ms9652_fam10/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -92,21 +92,6 @@ default n depends on BOARD_MSI_MS9652_FAM10 -config LB_CKS_RANGE_START - int - default 49 - depends on BOARD_MSI_MS9652_FAM10 - -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_MSI_MS9652_FAM10 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_MSI_MS9652_FAM10 - config MAINBOARD_PART_NUMBER string default "MS-9652" Modified: trunk/src/mainboard/newisys/khepri/Kconfig ============================================================================== --- trunk/src/mainboard/newisys/khepri/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/newisys/khepri/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -45,16 +45,6 @@ default 0 depends on BOARD_NEWISYS_KHEPRI -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_NEWISYS_KHEPRI - -config LB_CKS_LOC - int - default 123 - depends on BOARD_NEWISYS_KHEPRI - config MAINBOARD_PART_NUMBER string default "Khepri" Modified: trunk/src/mainboard/nvidia/l1_2pvv/Kconfig ============================================================================== --- trunk/src/mainboard/nvidia/l1_2pvv/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/nvidia/l1_2pvv/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -51,21 +51,6 @@ default 2 depends on BOARD_NVIDIA_L1_2PVV -config LB_CKS_RANGE_START - int - default 49 - depends on BOARD_NVIDIA_L1_2PVV - -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_NVIDIA_L1_2PVV - -config LB_CKS_LOC - int - default 123 - depends on BOARD_NVIDIA_L1_2PVV - config MAINBOARD_PART_NUMBER string default "l1_2pvv" Modified: trunk/src/mainboard/roda/rk886ex/Kconfig ============================================================================== --- trunk/src/mainboard/roda/rk886ex/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/roda/rk886ex/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -35,16 +35,6 @@ default 0x8000 depends on BOARD_RODA_RK886EX -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_RODA_RK886EX - -config LB_CKS_LOC - int - default 123 - depends on BOARD_RODA_RK886EX - config MAINBOARD_PART_NUMBER string default "RK886EX" Modified: trunk/src/mainboard/sunw/ultra40/Kconfig ============================================================================== --- trunk/src/mainboard/sunw/ultra40/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/sunw/ultra40/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -49,16 +49,6 @@ default n depends on BOARD_SUNW_ULTRA40 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_SUNW_ULTRA40 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_SUNW_ULTRA40 - config MAINBOARD_PART_NUMBER string default "Ultra 40" Modified: trunk/src/mainboard/supermicro/h8dme/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/h8dme/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/supermicro/h8dme/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -56,16 +56,6 @@ default n depends on BOARD_SUPERMICRO_H8DME -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_SUPERMICRO_H8DME - -config LB_CKS_LOC - int - default 123 - depends on BOARD_SUPERMICRO_H8DME - config MAINBOARD_PART_NUMBER string default "H8DME-2" Modified: trunk/src/mainboard/supermicro/h8dmr/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/supermicro/h8dmr/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -55,16 +55,6 @@ default n depends on BOARD_SUPERMICRO_H8DMR -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_SUPERMICRO_H8DMR - -config LB_CKS_LOC - int - default 123 - depends on BOARD_SUPERMICRO_H8DMR - config MAINBOARD_PART_NUMBER string default "H8DMR-i2" Modified: trunk/src/mainboard/supermicro/h8dmr_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr_fam10/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/supermicro/h8dmr_fam10/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -73,16 +73,6 @@ default n depends on BOARD_SUPERMICRO_H8DMR_FAM10 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_SUPERMICRO_H8DMR_FAM10 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_SUPERMICRO_H8DMR_FAM10 - config MAINBOARD_PART_NUMBER string default "H8DMR-i2 (Fam10)" Modified: trunk/src/mainboard/supermicro/h8qme_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/h8qme_fam10/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/supermicro/h8qme_fam10/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -74,16 +74,6 @@ default n depends on BOARD_SUPERMICRO_H8QME_FAM10 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_SUPERMICRO_H8QME_FAM10 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_SUPERMICRO_H8QME_FAM10 - config MAINBOARD_PART_NUMBER string default "H8QME-2+ (Fam10)" Modified: trunk/src/mainboard/supermicro/x6dai_g/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/x6dai_g/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/supermicro/x6dai_g/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -17,16 +17,6 @@ default supermicro/x6dai_g depends on BOARD_SUPERMICRO_X6DAI_G -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_SUPERMICRO_X6DAI_G - -config LB_CKS_LOC - int - default 123 - depends on BOARD_SUPERMICRO_X6DAI_G - config MAINBOARD_PART_NUMBER string default "X6DAi-G" Modified: trunk/src/mainboard/supermicro/x6dhe_g/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/x6dhe_g/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/supermicro/x6dhe_g/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -19,16 +19,6 @@ default supermicro/x6dhe_g depends on BOARD_SUPERMICRO_X6DHE_G -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_SUPERMICRO_X6DHE_G - -config LB_CKS_LOC - int - default 123 - depends on BOARD_SUPERMICRO_X6DHE_G - config MAINBOARD_PART_NUMBER string default "X6DHE-G" Modified: trunk/src/mainboard/supermicro/x6dhe_g2/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/x6dhe_g2/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/supermicro/x6dhe_g2/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -20,16 +20,6 @@ default supermicro/x6dhe_g2 depends on BOARD_SUPERMICRO_X6DHE_G2 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_SUPERMICRO_X6DHE_G2 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_SUPERMICRO_X6DHE_G2 - config MAINBOARD_PART_NUMBER string default "X6DHE-G2" Modified: trunk/src/mainboard/supermicro/x6dhr_ig/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/x6dhr_ig/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/supermicro/x6dhr_ig/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -19,16 +19,6 @@ default supermicro/x6dhr_ig depends on BOARD_SUPERMICRO_X6DHR_IG -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_SUPERMICRO_X6DHR_IG - -config LB_CKS_LOC - int - default 123 - depends on BOARD_SUPERMICRO_X6DHR_IG - config MAINBOARD_PART_NUMBER string default "X6DHR-iG" Modified: trunk/src/mainboard/supermicro/x6dhr_ig2/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/x6dhr_ig2/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/supermicro/x6dhr_ig2/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -19,16 +19,6 @@ default supermicro/x6dhr_ig2 depends on BOARD_SUPERMICRO_X6DHR_IG2 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_SUPERMICRO_X6DHR_IG2 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_SUPERMICRO_X6DHR_IG2 - config MAINBOARD_PART_NUMBER string default "X6DHR-iG2" Modified: trunk/src/mainboard/technexion/tim5690/Kconfig ============================================================================== --- trunk/src/mainboard/technexion/tim5690/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/technexion/tim5690/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -45,16 +45,6 @@ default 0x0 depends on BOARD_TECHNEXION_TIM5690 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_TECHNEXION_TIM5690 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_TECHNEXION_TIM5690 - config MAINBOARD_PART_NUMBER string default "TIM-5690" Modified: trunk/src/mainboard/technexion/tim8690/Kconfig ============================================================================== --- trunk/src/mainboard/technexion/tim8690/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/technexion/tim8690/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -44,16 +44,6 @@ default 0x0 depends on BOARD_TECHNEXION_TIM8690 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_TECHNEXION_TIM8690 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_TECHNEXION_TIM8690 - config MAINBOARD_PART_NUMBER string default "TIM-8690" Modified: trunk/src/mainboard/tyan/s2735/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2735/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/tyan/s2735/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -31,21 +31,6 @@ default 0x1000 depends on BOARD_TYAN_S2735 -config LB_CKS_RANGE_START - int - default 49 - depends on BOARD_TYAN_S2735 - -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_TYAN_S2735 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_TYAN_S2735 - config MAINBOARD_PART_NUMBER string default "S2735" Modified: trunk/src/mainboard/tyan/s2850/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2850/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/tyan/s2850/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -16,16 +16,6 @@ default tyan/s2850 depends on BOARD_TYAN_S2850 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_TYAN_S2850 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_TYAN_S2850 - config MAINBOARD_PART_NUMBER string default "S2850" Modified: trunk/src/mainboard/tyan/s2875/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2875/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/tyan/s2875/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -17,16 +17,6 @@ default tyan/s2875 depends on BOARD_TYAN_S2875 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_TYAN_S2875 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_TYAN_S2875 - config MAINBOARD_PART_NUMBER string default "S2875" Modified: trunk/src/mainboard/tyan/s2880/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2880/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/tyan/s2880/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -28,16 +28,6 @@ default 0 depends on BOARD_TYAN_S2880 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_TYAN_S2880 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_TYAN_S2880 - config MAINBOARD_PART_NUMBER string default "S2880" Modified: trunk/src/mainboard/tyan/s2881/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2881/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/tyan/s2881/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -29,16 +29,6 @@ default 2 depends on BOARD_TYAN_S2881 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_TYAN_S2881 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_TYAN_S2881 - config MAINBOARD_PART_NUMBER string default "S2881" Modified: trunk/src/mainboard/tyan/s2882/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2882/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/tyan/s2882/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -28,16 +28,6 @@ default 0 depends on BOARD_TYAN_S2882 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_TYAN_S2882 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_TYAN_S2882 - config MAINBOARD_PART_NUMBER string default "S2882" Modified: trunk/src/mainboard/tyan/s2885/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2885/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/tyan/s2885/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -29,16 +29,6 @@ default 2 depends on BOARD_TYAN_S2885 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_TYAN_S2885 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_TYAN_S2885 - config MAINBOARD_PART_NUMBER string default "S2885" Modified: trunk/src/mainboard/tyan/s2891/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2891/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/tyan/s2891/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -31,16 +31,6 @@ default 2 depends on BOARD_TYAN_S2891 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_TYAN_S2891 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_TYAN_S2891 - config MAINBOARD_PART_NUMBER string default "S2891" Modified: trunk/src/mainboard/tyan/s2892/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2892/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/tyan/s2892/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -30,16 +30,6 @@ default 2 depends on BOARD_TYAN_S2892 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_TYAN_S2892 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_TYAN_S2892 - config MAINBOARD_PART_NUMBER string default "S2892" Modified: trunk/src/mainboard/tyan/s2895/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2895/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/tyan/s2895/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -30,16 +30,6 @@ default 2 depends on BOARD_TYAN_S2895 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_TYAN_S2895 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_TYAN_S2895 - config MAINBOARD_PART_NUMBER string default "S2895" Modified: trunk/src/mainboard/tyan/s2912/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2912/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/tyan/s2912/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -51,21 +51,6 @@ default 2 depends on BOARD_TYAN_S2912 -config LB_CKS_RANGE_START - int - default 49 - depends on BOARD_TYAN_S2912 - -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_TYAN_S2912 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_TYAN_S2912 - config MAINBOARD_PART_NUMBER string default "S2912" Modified: trunk/src/mainboard/tyan/s2912_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2912_fam10/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/tyan/s2912_fam10/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -53,21 +53,6 @@ default 2 depends on BOARD_TYAN_S2912_FAM10 -config LB_CKS_RANGE_START - int - default 49 - depends on BOARD_TYAN_S2912_FAM10 - -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_TYAN_S2912_FAM10 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_TYAN_S2912_FAM10 - config MAINBOARD_PART_NUMBER string default "S2912 (Fam10)" Modified: trunk/src/mainboard/tyan/s4880/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s4880/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/tyan/s4880/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -45,16 +45,6 @@ default 0 depends on BOARD_TYAN_S4880 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_TYAN_S4880 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_TYAN_S4880 - config MAINBOARD_PART_NUMBER string default "S4880" Modified: trunk/src/mainboard/tyan/s4882/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s4882/Kconfig Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/mainboard/tyan/s4882/Kconfig Mon Mar 29 19:14:28 2010 (r5313) @@ -45,16 +45,6 @@ default 0 depends on BOARD_TYAN_S4882 -config LB_CKS_RANGE_END - int - default 122 - depends on BOARD_TYAN_S4882 - -config LB_CKS_LOC - int - default 123 - depends on BOARD_TYAN_S4882 - config MAINBOARD_PART_NUMBER string default "S4882" Modified: trunk/src/pc80/mc146818rtc.c ============================================================================== --- trunk/src/pc80/mc146818rtc.c Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/pc80/mc146818rtc.c Mon Mar 29 19:14:28 2010 (r5313) @@ -185,8 +185,8 @@ #if CONFIG_HAVE_OPTION_TABLE /* See if there is a LB CMOS checksum error */ - checksum_invalid = !rtc_checksum_valid(CONFIG_LB_CKS_RANGE_START, - CONFIG_LB_CKS_RANGE_END,CONFIG_LB_CKS_LOC); + checksum_invalid = !rtc_checksum_valid(LB_CKS_RANGE_START, + LB_CKS_RANGE_END,LB_CKS_LOC); if(checksum_invalid) printk(BIOS_DEBUG, "Invalid CMOS LB checksum\n"); @@ -263,8 +263,8 @@ if(get_cmos_value(ce->bit, ce->length, dest)) return(-3); - if(!rtc_checksum_valid(CONFIG_LB_CKS_RANGE_START, - CONFIG_LB_CKS_RANGE_END,CONFIG_LB_CKS_LOC)) + if(!rtc_checksum_valid(LB_CKS_RANGE_START, + LB_CKS_RANGE_END,LB_CKS_LOC)) return(-4); return(0); } Modified: trunk/src/pc80/mc146818rtc_early.c ============================================================================== --- trunk/src/pc80/mc146818rtc_early.c Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/src/pc80/mc146818rtc_early.c Mon Mar 29 19:14:28 2010 (r5313) @@ -44,14 +44,14 @@ unsigned long sum, old_sum; sum = 0; /* Comput the cmos checksum */ - for(addr = CONFIG_LB_CKS_RANGE_START; addr <= CONFIG_LB_CKS_RANGE_END; addr++) { + for(addr = LB_CKS_RANGE_START; addr <= LB_CKS_RANGE_END; addr++) { sum += cmos_read(addr); } sum = (sum & 0xffff) ^ 0xffff; /* Read the stored checksum */ - old_sum = cmos_read(CONFIG_LB_CKS_LOC) << 8; - old_sum |= cmos_read(CONFIG_LB_CKS_LOC+1); + old_sum = cmos_read(LB_CKS_LOC) << 8; + old_sum |= cmos_read(LB_CKS_LOC+1); return sum == old_sum; } Modified: trunk/util/options/build_opt_tbl.c ============================================================================== --- trunk/util/options/build_opt_tbl.c Mon Mar 29 18:23:42 2010 (r5312) +++ trunk/util/options/build_opt_tbl.c Mon Mar 29 19:14:28 2010 (r5313) @@ -1,3 +1,23 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2003 Eric Biederman (ebiederm(a)xmission.com) + * Copyright (C) 2007-2010 coresystems GmbH + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + */ + #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -16,14 +36,14 @@ #define TMPFILE_TEMPLATE "/build_opt_tbl_XXXXXX" static unsigned char cmos_table[4096]; -void test_for_entry_overlaps(void *entry_start, void *entry_end); /* This array is used to isolate bits that are to be changed in a byte */ static unsigned char clip[9]={0,1,3,7,0x0f,0x1f,0x3f,0x7f,0xff}; #ifdef WIN32 #include <fcntl.h> -char* mkstemp(char* name) { +char *mkstemp(char* name) +{ static char val='0'; char *c=name; while (*c!='X') c++; @@ -35,13 +55,15 @@ #define UNLINK_IF_NECESSARY(x) #endif -/* This routine loops through the entried and tests if any of the fields overlap - input entry_start = the memory pointer to the start of the entries. - entry_end = the byte past the entries. - output none - if there is an overlap, the routine exits, other wise it returns. -*/ -void test_for_entry_overlaps(void *entry_start, void *entry_end) +/** + * This routine loops through the entried and tests if any of the fields + * overlap. + * If there is an overlap, the routine exits, otherwise it returns. + * + * @param entry_start memory pointer to the start of the entries. + * @param entry_end memory pointer to the byte past the entries. + */ +static void test_for_entry_overlaps(void *entry_start, void *entry_end) { int ptr; char *cptr; @@ -63,7 +85,7 @@ for(cptr = entry_start; cptr < (char *)entry_end; cptr += ce->size) { ce=(struct cmos_entries *)cptr; /* test if entry goes past the end of the buffer */ - if((ce->bit+ce->length)>buffer_bit_size) { + if((int)(ce->bit+ce->length) > buffer_bit_size) { printf("Error - Entry %s start bit + length must be less than %d\n", ce->name,buffer_bit_size); exit(1); @@ -94,7 +116,7 @@ } } else { /* test if bits overlap byte boundaries */ - if(ce->length>(8-offset)) { + if((int)ce->length > (8-offset)) { printf("Error - Entry %s length overlaps a byte boundry\n", ce->name); exit(1); @@ -113,7 +135,7 @@ } /* This routine displays the usage options */ -void display_usage(char *name) +static void display_usage(char *name) { printf("Usage: %s [--config filename]\n", name); printf(" [--option filename]\n"); @@ -124,7 +146,6 @@ exit(1); } - static void skip_spaces(char *line, char **ptr) { if (!isspace(**ptr)) { @@ -136,6 +157,7 @@ } return; } + static unsigned long get_number(char *line, char **ptr, int base) { unsigned long value; @@ -210,19 +232,22 @@ return result; } - -/* This routine builds the cmos definition table from the cmos layout file - input The input comes from the configuration file which contains two parts - entries and enumerations. Each section is started with the key words - entries and enumerations. Records then follow in their respective - formats. - output The output of this program is the cmos definitions table. It is stored - in the cmos_table array. If this module is called, and the global - table_file has been implimented by the user, the table is also written - to the specified file. - This program exits on and error. It returns a 1 on successful - completion -*/ +/** + * This routine builds the cmos definition table from the cmos layout file + * + * The input comes from the configuration file which contains two parts + * entries and enumerations. Each section is started with the key words + * entries and enumerations. Records then follow in their respective + * formats. + * + * The output of this program is the cmos definitions table. It is stored + * in the cmos_table array. If this module is called, and the global + * table_file has been implimented by the user, the table is also written + * to the specified file. + * + * This program exits with a return code of 1 on error. It returns 0 on + * successful completion + */ int main(int argc, char **argv) { int i; @@ -230,18 +255,17 @@ char *option=0; char *header=0; FILE *fp; - int tmpfile; - char tmpfilename[TMPFILE_LEN]; + int tempfile; + char tempfilename[TMPFILE_LEN]; struct cmos_option_table *ct; struct cmos_entries *ce; struct cmos_enums *c_enums, *c_enums_start; - struct cmos_checksum *cs; + struct cmos_checksum *cs, *new_cs; char line[INPUT_LINE_MAX]; unsigned char uc; int entry_mode=0; int enum_mode=0; int checksum_mode=0; - long ptr; int cnt; char *cptr; void *entry_start, *entry_end; @@ -314,19 +338,23 @@ for(;;){ /* this section loops through the entry records */ if(fgets(line,INPUT_LINE_MAX,fp)==NULL) break; /* end if no more input */ + // FIXME mode should be a single enum. if(!entry_mode) { /* skip input until the entries key word */ if (strstr(line,"entries") != 0) { entry_mode=1; + enum_mode=0; + checksum_mode=0; continue; } - } - else{ /* Test if we are done with entries and starting enumerations */ + } else { /* Test if we are done with entries and starting enumerations */ if (strstr(line,"enumerations") != 0){ entry_mode=0; enum_mode=1; + checksum_mode=0; break; } if (strstr(line, "checksums") != 0) { + entry_mode=0; enum_mode=0; checksum_mode=1; break; @@ -379,6 +407,7 @@ test_for_entry_overlaps(entry_start, entry_end); for(;enum_mode;){ /* loop to build the enumerations section */ + long ptr; if(fgets(line,INPUT_LINE_MAX,fp)==NULL) break; /* go till end of input */ @@ -420,8 +449,7 @@ ct->size=ct->header_length+enum_length+entries_length; /* Get the checksum records */ - cs=(struct cmos_checksum *)(cmos_table+(ct->size)); - cptr = (char*)cs; + new_cs = (struct cmos_checksum *)(cmos_table+(ct->size)); for(;checksum_mode;) { /* This section finds the checksums */ char *ptr; if(fgets(line, INPUT_LINE_MAX,fp)==NULL) @@ -432,6 +460,9 @@ if (line[strspn(line, " ")]=='\n') continue; if (memcmp(line, "checksum", 8) != 0) continue; + /* We actually found a new cmos checksum entry */ + cs = new_cs; + /* get the information */ ptr = line + 8; skip_spaces(line, &ptr); @@ -476,10 +507,10 @@ cs->tag = LB_TAG_OPTION_CHECKSUM; cs->size = sizeof(*cs); cs->type = CHECKSUM_PCBIOS; + cptr = (char *)cs; cptr += cs->size; - cs = (struct cmos_checksum *)cptr; - + new_cs = (struct cmos_checksum *)cptr; } ct->size += (cptr - (char *)(cmos_table + ct->size)); fclose(fp); @@ -487,17 +518,17 @@ /* See if we want to output a C source file */ if(option) { int err=0; - strncpy(tmpfilename, dirname(strdup(option)), TMPFILE_LEN); - strncat(tmpfilename, TMPFILE_TEMPLATE, TMPFILE_LEN); - tmpfile = mkstemp(tmpfilename); - if(tmpfile == -1) { + strncpy(tempfilename, dirname(strdup(option)), TMPFILE_LEN); + strncat(tempfilename, TMPFILE_TEMPLATE, TMPFILE_LEN); + tempfile = mkstemp(tempfilename); + if(tempfile == -1) { perror("Error - Could not create temporary file"); exit(1); } - if((fp=fdopen(tmpfile,"w"))==NULL){ + if((fp=fdopen(tempfile,"w"))==NULL){ perror("Error - Could not open temporary file"); - unlink(tmpfilename); + unlink(tempfilename); exit(1); } @@ -505,11 +536,11 @@ if(!fwrite("unsigned char option_table[] = {",1,32,fp)) { perror("Error - Could not write image file"); fclose(fp); - unlink(tmpfilename); + unlink(tempfilename); exit(1); } /* write the array values */ - for(i=0;i<(ct->size-1);i++) { + for(i=0; i<(int)(ct->size-1); i++) { if(!(i%10) && !err) err=!fwrite("\n\t",1,2,fp); sprintf(buf,"0x%02x,",cmos_table[i]); if(!err) err=!fwrite(buf,1,5,fp); @@ -520,16 +551,16 @@ if(!fwrite("};\n",1,3,fp)) { perror("Error - Could not write image file"); fclose(fp); - unlink(tmpfilename); + unlink(tempfilename); exit(1); } fclose(fp); UNLINK_IF_NECESSARY(option); - if (rename(tmpfilename, option)) { + if (rename(tempfilename, option)) { fprintf(stderr, "Error - Could not write %s: ", option); perror(NULL); - unlink(tmpfilename); + unlink(tempfilename); exit(1); } } @@ -539,18 +570,18 @@ struct cmos_option_table *hdr; struct lb_record *ptr, *end; - strncpy(tmpfilename, dirname(strdup(option)), TMPFILE_LEN); - strncat(tmpfilename, TMPFILE_TEMPLATE, TMPFILE_LEN); - tmpfile = mkstemp(tmpfilename); - if(tmpfile == -1) { + strncpy(tempfilename, dirname(strdup(option)), TMPFILE_LEN); + strncat(tempfilename, TMPFILE_TEMPLATE, TMPFILE_LEN); + tempfile = mkstemp(tempfilename); + if(tempfile == -1) { perror("Error - Could not create temporary file"); exit(1); } - fp = fdopen(tmpfile, "w"); + fp = fdopen(tempfile, "w"); if (!fp) { perror("Error - Could not open temporary file"); - unlink(tmpfilename); + unlink(tempfilename); exit(1); } @@ -569,7 +600,7 @@ fprintf(stderr, "Invalid identifier: %s\n", ce->name); fclose(fp); - unlink(tmpfilename); + unlink(tempfilename); exit(1); } fprintf(fp, "#define CMOS_VSTART_%s %d\n", @@ -577,17 +608,21 @@ fprintf(fp, "#define CMOS_VLEN_%s %d\n", ce->name, ce->length); } + fprintf(fp, "\n#define LB_CKS_RANGE_START %d\n", cs->range_start / 8); + fprintf(fp, "#define LB_CKS_RANGE_END %d\n", cs->range_end / 8); + fprintf(fp, "#define LB_CKS_LOC %d\n", cs->location / 8); fclose(fp); UNLINK_IF_NECESSARY(header); - if (rename(tmpfilename, header)) { + if (rename(tempfilename, header)) { fprintf(stderr, "Error - Could not write %s: ", header); perror(NULL); - unlink(tmpfilename); + unlink(tempfilename); exit(1); } } - return(0); + + return 0; }

1 0

[PATCH] drop cmos checksum range from Kconfig
by Stefan Reinauer March 29, 2010

March 29, 2010

See patch -- coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br. Tel.: +49 761 7668825 • Fax: +49 761 7664613 Email: info(a)coresystems.de • http://www.coresystems.de/ Registergericht: Amtsgericht Freiburg • HRB 7656 Geschäftsführer: Stefan Reinauer • Ust-IdNr.: DE245674866

2 1

[commit] r5312 - trunk/util/abuild
by repository service March 29, 2010

March 29, 2010

Author: stepan Date: Mon Mar 29 18:23:42 2010 New Revision: 5312 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5312 Log: abuild: fail with dignity if mainboard does not exist. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/util/abuild/abuild Modified: trunk/util/abuild/abuild ============================================================================== --- trunk/util/abuild/abuild Mon Mar 29 16:45:36 2010 (r5311) +++ trunk/util/abuild/abuild Mon Mar 29 18:23:42 2010 (r5312) @@ -590,6 +590,11 @@ VENDOR=`printf $target|cut -f1 -d/` MAINBOARD=`printf $target|cut -f2 -d/` CONFIG=`printf $target|cut -f3 -d/` + if [ ! -r $ROOT/src/mainboard/$target ]; then + printf "No such target: $target\n" + xml '</abuild>' + exit 1 + fi build_target $VENDOR $MAINBOARD $CONFIG test_target $VENDOR $MAINBOARD else

1 0

[commit] r5311 - in trunk/src: cpu/amd/dualcore cpu/amd/model_10xxx cpu/amd/model_fxx cpu/amd/quadcore include/cpu/amd mainboard/amd/dbm690t mainboard/amd/mahogany mainboard/amd/mahogany_fam10 main...
by repository service March 29, 2010

March 29, 2010

Author: stepan Date: Mon Mar 29 16:45:36 2010 New Revision: 5311 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5311 Log: dualcore.h and quadcore.h are almost exactly the same. Only have multicore.h for both of them. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Added: trunk/src/include/cpu/amd/multicore.h - copied, changed from r5310, trunk/src/include/cpu/amd/quadcore.h Deleted: trunk/src/include/cpu/amd/dualcore.h trunk/src/include/cpu/amd/quadcore.h Modified: trunk/src/cpu/amd/dualcore/amd_sibling.c trunk/src/cpu/amd/dualcore/dualcore_id.c trunk/src/cpu/amd/model_10xxx/model_10xxx_init.c trunk/src/cpu/amd/model_fxx/model_fxx_init.c trunk/src/cpu/amd/quadcore/quadcore_id.c trunk/src/mainboard/amd/dbm690t/get_bus_conf.c trunk/src/mainboard/amd/mahogany/get_bus_conf.c trunk/src/mainboard/amd/mahogany_fam10/get_bus_conf.c trunk/src/mainboard/amd/pistachio/get_bus_conf.c trunk/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c trunk/src/mainboard/amd/serengeti_cheetah/mptable.c trunk/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c trunk/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c trunk/src/mainboard/asus/a8n_e/get_bus_conf.c trunk/src/mainboard/broadcom/blast/get_bus_conf.c trunk/src/mainboard/broadcom/blast/mptable.c trunk/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c trunk/src/mainboard/gigabyte/m57sli/get_bus_conf.c trunk/src/mainboard/hp/dl145_g3/get_bus_conf.c trunk/src/mainboard/hp/dl145_g3/mptable.c trunk/src/mainboard/iwill/dk8_htx/get_bus_conf.c trunk/src/mainboard/iwill/dk8_htx/mptable.c trunk/src/mainboard/kontron/kt690/get_bus_conf.c trunk/src/mainboard/msi/ms7135/get_bus_conf.c trunk/src/mainboard/msi/ms7260/get_bus_conf.c trunk/src/mainboard/msi/ms9185/get_bus_conf.c trunk/src/mainboard/msi/ms9185/mptable.c trunk/src/mainboard/msi/ms9282/get_bus_conf.c trunk/src/mainboard/msi/ms9652_fam10/get_bus_conf.c trunk/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c trunk/src/mainboard/sunw/ultra40/get_bus_conf.c trunk/src/mainboard/supermicro/h8dme/get_bus_conf.c trunk/src/mainboard/supermicro/h8dmr/get_bus_conf.c trunk/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c trunk/src/mainboard/technexion/tim5690/get_bus_conf.c trunk/src/mainboard/technexion/tim8690/get_bus_conf.c trunk/src/mainboard/tyan/s2850/mptable.c trunk/src/mainboard/tyan/s2875/mptable.c trunk/src/mainboard/tyan/s2880/mptable.c trunk/src/mainboard/tyan/s2881/get_bus_conf.c trunk/src/mainboard/tyan/s2882/mptable.c trunk/src/mainboard/tyan/s2885/get_bus_conf.c trunk/src/mainboard/tyan/s2891/get_bus_conf.c trunk/src/mainboard/tyan/s2892/get_bus_conf.c trunk/src/mainboard/tyan/s2895/get_bus_conf.c trunk/src/mainboard/tyan/s2912/get_bus_conf.c trunk/src/mainboard/tyan/s2912_fam10/get_bus_conf.c trunk/src/mainboard/tyan/s4880/mptable.c trunk/src/mainboard/tyan/s4882/mptable.c trunk/src/northbridge/amd/amdfam10/northbridge.c trunk/src/northbridge/amd/amdk8/northbridge.c Modified: trunk/src/cpu/amd/dualcore/amd_sibling.c ============================================================================== --- trunk/src/cpu/amd/dualcore/amd_sibling.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/cpu/amd/dualcore/amd_sibling.c Mon Mar 29 16:45:36 2010 (r5311) @@ -3,7 +3,7 @@ #include <console/console.h> #include <cpu/cpu.h> #include <cpu/x86/lapic.h> -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #include <device/device.h> #include <device/pci.h> #include <pc80/mc146818rtc.h> Modified: trunk/src/cpu/amd/dualcore/dualcore_id.c ============================================================================== --- trunk/src/cpu/amd/dualcore/dualcore_id.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/cpu/amd/dualcore/dualcore_id.c Mon Mar 29 16:45:36 2010 (r5311) @@ -1,7 +1,7 @@ /* 2004.12 yhlu add dual core support */ #include <arch/cpu.h> -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #ifdef __PRE_RAM__ #include <cpu/amd/model_fxx_msr.h> #endif Modified: trunk/src/cpu/amd/model_10xxx/model_10xxx_init.c ============================================================================== --- trunk/src/cpu/amd/model_10xxx/model_10xxx_init.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/cpu/amd/model_10xxx/model_10xxx_init.c Mon Mar 29 16:45:36 2010 (r5311) @@ -34,7 +34,7 @@ #include <cpu/cpu.h> #include <cpu/x86/cache.h> #include <cpu/x86/mtrr.h> -#include <cpu/amd/quadcore.h> +#include <cpu/amd/multicore.h> #include <cpu/amd/model_10xxx_msr.h> extern device_t get_node_pci(u32 nodeid, u32 fn); Modified: trunk/src/cpu/amd/model_fxx/model_fxx_init.c ============================================================================== --- trunk/src/cpu/amd/model_fxx/model_fxx_init.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/cpu/amd/model_fxx/model_fxx_init.c Mon Mar 29 16:45:36 2010 (r5311) @@ -26,7 +26,7 @@ #include <cpu/x86/cache.h> #include <cpu/x86/mtrr.h> -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #include <cpu/amd/model_fxx_msr.h> Modified: trunk/src/cpu/amd/quadcore/quadcore_id.c ============================================================================== --- trunk/src/cpu/amd/quadcore/quadcore_id.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/cpu/amd/quadcore/quadcore_id.c Mon Mar 29 16:45:36 2010 (r5311) @@ -19,7 +19,7 @@ #include <arch/cpu.h> -#include <cpu/amd/quadcore.h> +#include <cpu/amd/multicore.h> #ifdef __PRE_RAM__ #include <cpu/amd/model_10xxx_msr.h> #endif Copied and modified: trunk/src/include/cpu/amd/multicore.h (from r5310, trunk/src/include/cpu/amd/quadcore.h) ============================================================================== --- trunk/src/include/cpu/amd/quadcore.h Mon Mar 29 15:04:13 2010 (r5310, copy source) +++ trunk/src/include/cpu/amd/multicore.h Mon Mar 29 16:45:36 2010 (r5311) @@ -21,7 +21,7 @@ #define CPU_AMD_QUADCORE_H #if defined(__GNUC__) -unsigned int read_nb_cfg_54(void); +u32 read_nb_cfg_54(void); #endif struct node_core_id { Modified: trunk/src/mainboard/amd/dbm690t/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/amd/dbm690t/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/amd/dbm690t/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -24,7 +24,7 @@ #include <stdint.h> #include <stdlib.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/amd/mahogany/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/amd/mahogany/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/amd/mahogany/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -24,7 +24,7 @@ #include <stdint.h> #include <stdlib.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/amd/mahogany_fam10/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/amd/mahogany_fam10/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/amd/mahogany_fam10/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -24,7 +24,7 @@ #include <stdint.h> #include <stdlib.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdfam10_sysconf.h> Modified: trunk/src/mainboard/amd/pistachio/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/amd/pistachio/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/amd/pistachio/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -24,7 +24,7 @@ #include <stdint.h> #include <stdlib.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/amd/serengeti_cheetah/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/amd/serengeti_cheetah/mptable.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah/mptable.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/amd/serengeti_cheetah/mptable.c Mon Mar 29 16:45:36 2010 (r5311) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -23,7 +23,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdfam10_sysconf.h> Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c Mon Mar 29 16:45:36 2010 (r5311) @@ -23,7 +23,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdfam10_sysconf.h> Modified: trunk/src/mainboard/asus/a8n_e/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/asus/a8n_e/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/asus/a8n_e/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -28,7 +28,7 @@ #include <stdint.h> #include <stdlib.h> #if CONFIG_LOGICAL_CPUS == 1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> #include <stdlib.h> Modified: trunk/src/mainboard/broadcom/blast/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/broadcom/blast/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/broadcom/blast/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/broadcom/blast/mptable.c ============================================================================== --- trunk/src/mainboard/broadcom/blast/mptable.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/broadcom/blast/mptable.c Mon Mar 29 16:45:36 2010 (r5311) @@ -5,7 +5,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -27,7 +27,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/gigabyte/m57sli/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/gigabyte/m57sli/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -25,7 +25,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/hp/dl145_g3/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/hp/dl145_g3/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/hp/dl145_g3/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -27,7 +27,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/hp/dl145_g3/mptable.c ============================================================================== --- trunk/src/mainboard/hp/dl145_g3/mptable.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/hp/dl145_g3/mptable.c Mon Mar 29 16:45:36 2010 (r5311) @@ -34,7 +34,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/iwill/dk8_htx/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/iwill/dk8_htx/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/iwill/dk8_htx/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/iwill/dk8_htx/mptable.c ============================================================================== --- trunk/src/mainboard/iwill/dk8_htx/mptable.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/iwill/dk8_htx/mptable.c Mon Mar 29 16:45:36 2010 (r5311) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/kontron/kt690/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/kontron/kt690/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/kontron/kt690/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -24,7 +24,7 @@ #include <stdint.h> #include <stdlib.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/msi/ms7135/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/msi/ms7135/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/msi/ms7135/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -28,7 +28,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS == 1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/msi/ms7260/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/msi/ms7260/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/msi/ms7260/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -25,7 +25,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> #include <stdlib.h> Modified: trunk/src/mainboard/msi/ms9185/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/msi/ms9185/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/msi/ms9185/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -27,7 +27,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/msi/ms9185/mptable.c ============================================================================== --- trunk/src/mainboard/msi/ms9185/mptable.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/msi/ms9185/mptable.c Mon Mar 29 16:45:36 2010 (r5311) @@ -31,7 +31,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/msi/ms9282/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/msi/ms9282/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/msi/ms9282/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -28,7 +28,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/msi/ms9652_fam10/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/msi/ms9652_fam10/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/msi/ms9652_fam10/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -25,7 +25,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/quadcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdfam10_sysconf.h> Modified: trunk/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -25,7 +25,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/sunw/ultra40/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/sunw/ultra40/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/sunw/ultra40/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <stdlib.h> Modified: trunk/src/mainboard/supermicro/h8dme/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dme/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/supermicro/h8dme/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -25,7 +25,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/supermicro/h8dmr/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/supermicro/h8dmr/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -25,7 +25,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -25,7 +25,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdfam10_sysconf.h> Modified: trunk/src/mainboard/technexion/tim5690/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/technexion/tim5690/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/technexion/tim5690/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -24,7 +24,7 @@ #include <stdint.h> #include <stdlib.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/technexion/tim8690/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/technexion/tim8690/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/technexion/tim8690/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -24,7 +24,7 @@ #include <stdint.h> #include <stdlib.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/tyan/s2850/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s2850/mptable.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/tyan/s2850/mptable.c Mon Mar 29 16:45:36 2010 (r5311) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif Modified: trunk/src/mainboard/tyan/s2875/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s2875/mptable.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/tyan/s2875/mptable.c Mon Mar 29 16:45:36 2010 (r5311) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif static unsigned node_link_to_bus(unsigned node, unsigned link) Modified: trunk/src/mainboard/tyan/s2880/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s2880/mptable.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/tyan/s2880/mptable.c Mon Mar 29 16:45:36 2010 (r5311) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif Modified: trunk/src/mainboard/tyan/s2881/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/tyan/s2881/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/tyan/s2881/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/tyan/s2882/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s2882/mptable.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/tyan/s2882/mptable.c Mon Mar 29 16:45:36 2010 (r5311) @@ -5,7 +5,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif Modified: trunk/src/mainboard/tyan/s2885/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/tyan/s2885/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/tyan/s2885/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/tyan/s2891/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/tyan/s2891/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/tyan/s2891/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/tyan/s2892/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/tyan/s2892/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/tyan/s2892/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/tyan/s2895/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/tyan/s2895/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/tyan/s2895/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/tyan/s2912/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/tyan/s2912/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/tyan/s2912/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -25,7 +25,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdk8_sysconf.h> Modified: trunk/src/mainboard/tyan/s2912_fam10/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/tyan/s2912_fam10/get_bus_conf.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/tyan/s2912_fam10/get_bus_conf.c Mon Mar 29 16:45:36 2010 (r5311) @@ -25,7 +25,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif #include <cpu/amd/amdfam10_sysconf.h> Modified: trunk/src/mainboard/tyan/s4880/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s4880/mptable.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/tyan/s4880/mptable.c Mon Mar 29 16:45:36 2010 (r5311) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif static unsigned node_link_to_bus(unsigned node, unsigned link) Modified: trunk/src/mainboard/tyan/s4882/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s4882/mptable.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/mainboard/tyan/s4882/mptable.c Mon Mar 29 16:45:36 2010 (r5311) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #endif Modified: trunk/src/northbridge/amd/amdfam10/northbridge.c ============================================================================== --- trunk/src/northbridge/amd/amdfam10/northbridge.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/northbridge/amd/amdfam10/northbridge.c Mon Mar 29 16:45:36 2010 (r5311) @@ -32,7 +32,7 @@ #include <cpu/x86/lapic.h> #if CONFIG_LOGICAL_CPUS==1 -#include <cpu/amd/quadcore.h> +#include <cpu/amd/multicore.h> #include <pc80/mc146818rtc.h> #endif Modified: trunk/src/northbridge/amd/amdk8/northbridge.c ============================================================================== --- trunk/src/northbridge/amd/amdk8/northbridge.c Mon Mar 29 15:04:13 2010 (r5310) +++ trunk/src/northbridge/amd/amdk8/northbridge.c Mon Mar 29 16:45:36 2010 (r5311) @@ -19,7 +19,7 @@ #include <cpu/x86/lapic.h> -#include <cpu/amd/dualcore.h> +#include <cpu/amd/multicore.h> #if CONFIG_LOGICAL_CPUS==1 #include <pc80/mc146818rtc.h> #endif

1 0

[commit] r5310 - in trunk: . src/arch/i386 src/arch/i386/lib src/lib
by repository service March 29, 2010

March 29, 2010

Author: stepan Date: Mon Mar 29 15:04:13 2010 New Revision: 5310 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5310 Log: This patch fixes build.h dependencies in coreboot again. -include was dropped, the files in question do an #include <build.h> already. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Modified: trunk/Makefile trunk/src/arch/i386/Makefile.bootblock.inc trunk/src/arch/i386/Makefile.inc trunk/src/arch/i386/lib/Makefile.inc trunk/src/lib/Makefile.inc trunk/src/lib/version.c Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sun Mar 28 23:31:30 2010 (r5309) +++ trunk/Makefile Mon Mar 29 15:04:13 2010 (r5310) @@ -136,7 +136,7 @@ chmod +x .ccwrap scan-build $(CONFIG_SCANBUILD_REPORT_LOCATION) -analyze-headers --use-cc=$(top)/.ccwrap --use-c++=$(top)/.ccwrap $(MAKE) INNER_SCANBUILD=y else -all: $(obj)/config.h $(obj)/build.h coreboot +all: $(obj)/config.h coreboot endif # must come rather early @@ -222,7 +222,7 @@ # $3 .o infix ("" ".initobj", ...) # $4 additional compiler flags de$(EMPTY)fine $(1)_$(2)_template -$(obj)/$$(1)%$(3).o: src/$$(1)%.$(2) | $(obj)/build.h $(obj)/config.h +$(obj)/$$(1)%$(3).o: src/$$(1)%.$(2) $(obj)/config.h printf " CC $$$$(subst $$$$(obj)/,,$$$$(@))\n" $(CC) $(4) -MMD $$$$(CFLAGS) -c -o $$$$@ $$$$< en$(EMPTY)def @@ -230,8 +230,8 @@ $(eval $(call create_cc_template,objs,c)) $(eval $(call create_cc_template,objs,S,,-DASSEMBLY)) -$(eval $(call create_cc_template,initobjs,c,.initobj)) -$(eval $(call create_cc_template,initobjs,S,.initobj,-DASSEMBLY)) +$(eval $(call create_cc_template,initobjs,c,.initobj,-D__PRE_RAM__)) +$(eval $(call create_cc_template,initobjs,S,.initobj,-DASSEMBLY -D__PRE_RAM__)) $(eval $(call create_cc_template,drivers,c,.driver)) $(eval $(call create_cc_template,drivers,S,.driver,-DASSEMBLY)) $(eval $(call create_cc_template,smmobjs,c,.smmobj)) @@ -269,7 +269,7 @@ INCLUDES := -Isrc -Isrc/include -I$(obj) -Isrc/arch/$(ARCHDIR-y)/include INCLUDES += -Isrc/devices/oprom/include # abspath is a workaround for romcc -INCLUDES += -include $(abspath $(obj)/config.h) -include $(abspath $(obj)/build.h) +INCLUDES += -include $(abspath $(obj)/config.h) CFLAGS = $(INCLUDES) -Os -nostdinc -pipe CFLAGS += -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes @@ -295,7 +295,7 @@ mkdir -p $(obj)/util/kconfig/lxdialog $(obj)/util/cbfstool test -n "$(alldirs)" && mkdir -p $(alldirs) || true -$(obj)/build.h $(abspath $(obj)/build.h): .xcompile +$(obj)/build.h: .xcompile @printf " GEN build.h\n" rm -f $(obj)/build.h printf "/* build system definitions (autogenerated) */\n" > $(obj)/build.ht Modified: trunk/src/arch/i386/Makefile.bootblock.inc ============================================================================== --- trunk/src/arch/i386/Makefile.bootblock.inc Sun Mar 28 23:31:30 2010 (r5309) +++ trunk/src/arch/i386/Makefile.bootblock.inc Mon Mar 29 15:04:13 2010 (r5310) @@ -42,9 +42,9 @@ bootblock_inc += $(obj)/mainboard/$(MAINBOARDDIR)/bootblock.inc bootblock_inc += $(src)/arch/i386/lib/walkcbfs.S -bootblock_romccflags := -mcpu=i386 -O2 +bootblock_romccflags := -mcpu=i386 -O2 -D__PRE_RAM__ ifeq ($(CONFIG_SSE),y) -bootblock_romccflags := -mcpu=k7 -msse -O2 +bootblock_romccflags := -mcpu=k7 -msse -O2 -D__PRE_RAM__ endif $(obj)/bootblock/ldscript.ld: $$(bootblock_lds) $(obj)/ldoptions Modified: trunk/src/arch/i386/Makefile.inc ============================================================================== --- trunk/src/arch/i386/Makefile.inc Sun Mar 28 23:31:30 2010 (r5309) +++ trunk/src/arch/i386/Makefile.inc Mon Mar 29 15:04:13 2010 (r5310) @@ -193,8 +193,7 @@ $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/romcc $(OPTION_TABLE_H) $(obj)/build.h printf " ROMCC romstage.inc\n" - $(ROMCC) -c -S $(ROMCCFLAGS) -I. $(INCLUDES) $< -o $@ - + $(ROMCC) -c -S $(ROMCCFLAGS) -D__PRE_RAM__ -I. $(INCLUDES) $< -o $@ else $(obj)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(obj)/option_table.h @@ -203,7 +202,7 @@ $(obj)/mainboard/$(MAINBOARDDIR)/romstage.pre.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(OPTION_TABLE_H) $(obj)/build.h printf " CC romstage.inc\n" - $(CC) -MMD $(CFLAGS) -I$(src) -I. -c -S $< -o $@ + $(CC) -MMD $(CFLAGS) -D__PRE_RAM__ -I$(src) -I. -c -S $< -o $@ $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(obj)/mainboard/$(MAINBOARDDIR)/romstage.pre.inc printf " POST romstage.inc\n" Modified: trunk/src/arch/i386/lib/Makefile.inc ============================================================================== --- trunk/src/arch/i386/lib/Makefile.inc Sun Mar 28 23:31:30 2010 (r5309) +++ trunk/src/arch/i386/lib/Makefile.inc Mon Mar 29 15:04:13 2010 (r5310) @@ -8,3 +8,5 @@ initobj-y += printk_init.o initobj-y += cbfs_and_run.o + +$(obj)/arch/i386/lib/console.o :: $(obj)/build.h Modified: trunk/src/lib/Makefile.inc ============================================================================== --- trunk/src/lib/Makefile.inc Sun Mar 28 23:31:30 2010 (r5309) +++ trunk/src/lib/Makefile.inc Mon Mar 29 15:04:13 2010 (r5310) @@ -29,3 +29,5 @@ obj-$(CONFIG_BOOTSPLASH) += jpeg.o smmobj-y += memcpy.o + +$(obj)/lib/version.o :: $(obj)/build.h Modified: trunk/src/lib/version.c ============================================================================== --- trunk/src/lib/version.c Sun Mar 28 23:31:30 2010 (r5309) +++ trunk/src/lib/version.c Mon Mar 29 15:04:13 2010 (r5310) @@ -35,7 +35,6 @@ #error COREBOOT_ASSEMBLER not defined #endif - #ifndef COREBOOT_EXTRA_VERSION #define COREBOOT_EXTRA_VERSION "" #endif @@ -55,6 +54,3 @@ const char coreboot_linker[] = COREBOOT_LINKER; const char coreboot_assembler[] = COREBOOT_ASSEMBLER; - - -

1 0

[commit] r5304 - in trunk: . src/arch/i386 src/arch/i386/lib src/cpu/x86/smm util/abuild util/cbfstool
by repository service March 29, 2010

March 29, 2010

Author: oxygene Date: Sat Mar 27 18:18:39 2010 New Revision: 5304 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5304 Log: make only needs to read Makefile.incs once, thanks to the SECONDEXPANSION feature of GNU make (and we rely on GNU make for lots of things already) File paths are relative to the root directory, which simplifies debugging (make V=1 gives shorter command lines) and helps ccache finding matches for checkouts in different directories (even though it should normalize paths itself) Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de> Acked-by: Ronald G. Minnich <rminnich(a)gmail.com> Modified: trunk/Makefile trunk/src/arch/i386/Makefile.bigbootblock.inc trunk/src/arch/i386/Makefile.bootblock.inc trunk/src/arch/i386/Makefile.inc trunk/src/arch/i386/lib/Makefile.inc trunk/src/cpu/x86/smm/Makefile.inc trunk/util/abuild/abuild trunk/util/cbfstool/Makefile.inc Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Fri Mar 26 19:31:12 2010 (r5303) +++ trunk/Makefile Sat Mar 27 18:18:39 2010 (r5304) @@ -33,9 +33,9 @@ endif export top := $(PWD) -export src := $(top)/src +export src := src export srck := $(top)/util/kconfig -export obj ?= $(top)/build +export obj ?= build export objk := $(obj)/util/kconfig export sconfig := $(top)/util/sconfig export yapps2_py := $(sconfig)/yapps2.py @@ -136,9 +136,12 @@ chmod +x .ccwrap scan-build $(CONFIG_SCANBUILD_REPORT_LOCATION) -analyze-headers --use-cc=$(top)/.ccwrap --use-c++=$(top)/.ccwrap $(MAKE) INNER_SCANBUILD=y else -all: $(obj)/config.h coreboot +all: $(obj)/config.h $(obj)/build.h coreboot endif +# must come rather early +.SECONDEXPANSION: + $(obj)/config.h: $(MAKE) oldconfig @@ -156,7 +159,7 @@ # Creation of these is architecture and mainboard independent $(obj)/mainboard/$(MAINBOARDDIR)/static.c: $(src)/mainboard/$(MAINBOARDDIR)/devicetree.cb $(obj)/mainboard/$(MAINBOARDDIR)/config.py mkdir -p $(obj)/mainboard/$(MAINBOARDDIR) - (cd $(obj)/mainboard/$(MAINBOARDDIR) ; PYTHONPATH=$(top)/util/sconfig export PYTHONPATH; python config.py $(MAINBOARDDIR) $(top) $(obj)/mainboard/$(MAINBOARDDIR)) + (PYTHONPATH=$(top)/util/sconfig python $(obj)/mainboard/$(MAINBOARDDIR)/config.py $(MAINBOARDDIR) $(top) $(obj)/mainboard/$(MAINBOARDDIR)) objs:=$(obj)/mainboard/$(MAINBOARDDIR)/static.o initobjs:= @@ -173,12 +176,12 @@ $(foreach type,$(2), $(eval $(type)-y:=)) \ $(eval subdirs-y:=) \ $(eval -include $(1)) \ - $(if $(strip $(3)), \ - $(foreach type,$(2), \ - $(eval $(type)s+= \ - $$(abspath $$(patsubst src/%, \ - $(obj)/%, \ - $$(addprefix $(dir $(1)),$$($(type)-y))))))) \ + $(foreach type,$(2), \ + $(eval $(type)s+= \ + $$(subst $(top)/,, \ + $$(abspath $$(patsubst src/%, \ + $(obj)/%, \ + $$(addprefix $(dir $(1)),$$($(type)-y))))))) \ $(eval subdirs+=$$(subst $(PWD)/,,$$(abspath $$(addprefix $(dir $(1)),$$(subdirs-y))))) # For each path in $(subdirs) call includemakefiles, passing $(1) as $(3) @@ -187,12 +190,12 @@ $(eval cursubdirs:=$(subdirs)) \ $(eval subdirs:=) \ $(foreach dir,$(cursubdirs), \ - $(eval $(call includemakefiles,$(dir)/Makefile.inc,$(types),$(1)))) \ - $(if $(subdirs),$(eval $(call evaluate_subdirs, $(1)))) + $(eval $(call includemakefiles,$(dir)/Makefile.inc,$(types)))) \ + $(if $(subdirs),$(eval $(call evaluate_subdirs))) # collect all object files eligible for building subdirs:=$(PLATFORM-y) $(BUILD-y) -$(eval $(call evaluate_subdirs, modify)) +$(eval $(call evaluate_subdirs)) initobjs:=$(addsuffix .initobj.o, $(basename $(initobjs))) drivers:=$(addsuffix .driver.o, $(basename $(drivers))) @@ -203,17 +206,10 @@ source_with_ext=$(patsubst $(obj)/%.o,src/%.$(1),$(allobjs)) allsrc=$(wildcard $(call source_with_ext,c) $(call source_with_ext,S)) -POST_EVALUATION:=y - -# fetch rules (protected in POST_EVALUATION) that rely on the variables filled above -subdirs:=$(PLATFORM-y) $(BUILD-y) -$(eval $(call evaluate_subdirs)) - - define objs_asl_template $(obj)/$(1)%.o: src/$(1)%.asl @printf " IASL $$(subst $(top)/,,$$(@))\n" - $(CPP) -D__ACPI__ -P -include $(obj)/config.h -I$(src) -I$(src)/mainboard/$(MAINBOARDDIR) $$< -o $$(basename $$(a)).asl + $(CPP) -D__ACPI__ -P -include $(abspath $(obj)/config.h) -I$(src) -I$(src)/mainboard/$(MAINBOARDDIR) $$< -o $$(basename $$(a)).asl iasl -p $$(basename $$@) -tc $$(basename $$(a)).asl mv $$(basename $$(a)).hex $$(basename $$(a)).c $(CC) $$(CFLAGS) $$(if $$(subst dsdt,,$$(basename $$(notdir $$@))), -DAmlCode=AmlCode_$$(basename $$(notdir $$@))) -c -o $$@ $$(basename $$(a)).c @@ -226,7 +222,7 @@ # $3 .o infix ("" ".initobj", ...) # $4 additional compiler flags de$(EMPTY)fine $(1)_$(2)_template -$(obj)/$$(1)%$(3).o: src/$$(1)%.$(2) $(obj)/config.h +$(obj)/$$(1)%$(3).o: src/$$(1)%.$(2) | $(obj)/build.h $(obj)/config.h printf " CC $$$$(subst $$$$(obj)/,,$$$$(@))\n" $(CC) $(4) -MMD $$$$(CFLAGS) -c -o $$$$@ $$$$< en$(EMPTY)def @@ -270,9 +266,10 @@ @echo $(patsubst $(top)/%,%,$(crt0s)) OBJS := $(patsubst %,$(obj)/%,$(TARGETS-y)) -INCLUDES := -I$(top)/src -I$(top)/src/include -I$(obj) -I$(top)/src/arch/$(ARCHDIR-y)/include -INCLUDES += -I$(top)/src/devices/oprom/include -INCLUDES += -include $(obj)/config.h +INCLUDES := -Isrc -Isrc/include -I$(obj) -Isrc/arch/$(ARCHDIR-y)/include +INCLUDES += -Isrc/devices/oprom/include +# abspath is a workaround for romcc +INCLUDES += -include $(abspath $(obj)/config.h) -include $(abspath $(obj)/build.h) CFLAGS = $(INCLUDES) -Os -nostdinc -pipe CFLAGS += -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes @@ -298,7 +295,7 @@ mkdir -p $(obj)/util/kconfig/lxdialog $(obj)/util/cbfstool test -n "$(alldirs)" && mkdir -p $(alldirs) || true -$(obj)/build.h: .xcompile +$(obj)/build.h $(abspath $(obj)/build.h): .xcompile @printf " GEN build.h\n" rm -f $(obj)/build.h printf "/* build system definitions (autogenerated) */\n" > $(obj)/build.ht Modified: trunk/src/arch/i386/Makefile.bigbootblock.inc ============================================================================== --- trunk/src/arch/i386/Makefile.bigbootblock.inc Fri Mar 26 19:31:12 2010 (r5303) +++ trunk/src/arch/i386/Makefile.bigbootblock.inc Sat Mar 27 18:18:39 2010 (r5304) @@ -1,5 +1,3 @@ -ifdef POST_EVALUATION - ####################################################################### # Build the final rom image @@ -14,11 +12,11 @@ @printf " OBJCOPY $(subst $(obj)/,,$(@))\n" $(OBJCOPY) -O binary $< $@ -$(obj)/ldscript.ld: $(ldscripts) $(obj)/ldoptions +$(obj)/ldscript.ld: $$(ldscripts) $(obj)/ldoptions printf 'INCLUDE "ldoptions"\n' > $@ printf '$(foreach ldscript,$(ldscripts),INCLUDE "$(ldscript:$(obj)/%=%)"\n)' >> $@ -$(obj)/crt0_includes.h: $(crt0s) +$(obj)/crt0_includes.h: $$(crt0s) @printf " GEN $(subst $(obj)/,,$(@))\n" printf '$(foreach crt0,config.h $(crt0s),#include "$(crt0:$(obj)/%=%)"\n)' > $@ @@ -30,9 +28,8 @@ @printf " CC $(subst $(obj)/,,$(@))\n" $(CC) -MMD -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -include $(obj)/config.h -I. -I$(src) $< > $@.new && mv $@.new $@ -$(obj)/coreboot: $(initobjs) $(obj)/ldscript.ld +$(obj)/coreboot: $$(initobjs) $(obj)/ldscript.ld @printf " LINK $(subst $(obj)/,,$(@))\n" $(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(obj)/ldscript.ld $(initobjs) $(NM) -n $(obj)/coreboot | sort > $(obj)/coreboot.map -endif Modified: trunk/src/arch/i386/Makefile.bootblock.inc ============================================================================== --- trunk/src/arch/i386/Makefile.bootblock.inc Fri Mar 26 19:31:12 2010 (r5303) +++ trunk/src/arch/i386/Makefile.bootblock.inc Sat Mar 27 18:18:39 2010 (r5304) @@ -1,5 +1,3 @@ -ifdef POST_EVALUATION - ####################################################################### # Build the final rom image @@ -49,12 +47,12 @@ bootblock_romccflags := -mcpu=k7 -msse -O2 endif -$(obj)/bootblock/ldscript.ld: $(bootblock_ldscripts) $(obj)/ldoptions +$(obj)/bootblock/ldscript.ld: $$(bootblock_lds) $(obj)/ldoptions @printf " GEN $(subst $(obj)/,,$(@))\n" mkdir -p $(obj)/bootblock printf '$(foreach ldscript,ldoptions $(bootblock_lds),INCLUDE "$(ldscript)"\n)' > $@ -$(obj)/bootblock/bootblock.c: $(bootblock_inc) +$(obj)/bootblock/bootblock.c: $$(bootblock_inc) @printf " GEN $(subst $(obj)/,,$(@))\n" mkdir -p $(obj)/bootblock printf '$(foreach crt0,config.h $(bootblock_inc),#include "$(crt0)"\n)' > $@ @@ -80,7 +78,7 @@ ####################################################################### # Build the romstage -$(obj)/coreboot.romstage: $(obj)/coreboot.pre1 $(initobjs) $(obj)/romstage/ldscript.ld +$(obj)/coreboot.romstage: $(obj)/coreboot.pre1 $$(initobjs) $(obj)/romstage/ldscript.ld @printf " LINK $(subst $(obj)/,,$(@))\n" printf "CONFIG_ROMBASE = 0x0;\nAUTO_XIP_ROM_BASE = 0x0;\n" > $(obj)/location.ld $(CC) -nostdlib -nostartfiles -static -o $(obj)/romstage.elf -L$(obj) -T $(obj)/romstage/ldscript.ld $(initobjs) @@ -93,12 +91,12 @@ $(NM) -n $(obj)/romstage.elf | sort > $(obj)/romstage.map $(OBJCOPY) -O binary $(obj)/romstage.elf $@ -$(obj)/romstage/ldscript.ld: $(ldscripts) $(obj)/ldoptions +$(obj)/romstage/ldscript.ld: $$(ldscripts) $(obj)/ldoptions @printf " GEN $(subst $(obj)/,,$(@))\n" mkdir -p $(obj)/romstage printf '$(foreach ldscript,ldoptions location.ld $(ldscripts),INCLUDE "$(ldscript:$(obj)/%=%)"\n)' > $@ -$(obj)/romstage/crt0_includes.h: $(crt0s) +$(obj)/romstage/crt0_includes.h: $$(crt0s) @printf " GEN $(subst $(obj)/,,$(@))\n" mkdir -p $(obj)/romstage printf '$(foreach crt0,config.h $(crt0s),#include "$(crt0:$(obj)/%=%)"\n)' > $@ @@ -111,4 +109,3 @@ @printf " CC $(subst $(obj)/,,$(@))\n" $(CC) -x assembler-with-cpp -DASSEMBLY -E -I$(src)/include -I$(src)/arch/i386/include -I$(obj) -I$(obj)/romstage -include $(obj)/config.h -I. -I$(src) $< > $@.new && mv $@.new $@ -endif Modified: trunk/src/arch/i386/Makefile.inc ============================================================================== --- trunk/src/arch/i386/Makefile.inc Fri Mar 26 19:31:12 2010 (r5303) +++ trunk/src/arch/i386/Makefile.inc Sat Mar 27 18:18:39 2010 (r5304) @@ -7,8 +7,6 @@ obj-$(CONFIG_HAVE_OPTION_TABLE) += ../../option_table.o -ifdef POST_EVALUATION - ####################################################################### # Build the final rom image COREBOOT_ROM_DEPENDENCIES:= @@ -73,14 +71,14 @@ $(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(src)/arch/i386/coreboot_ram.ld $(obj)/coreboot_ram.o $(NM) -n $(obj)/coreboot_ram | sort > $(obj)/coreboot_ram.map -$(obj)/coreboot_ram.o: $(obj)/arch/i386/lib/c_start.o $(drivers) $(obj)/coreboot.a $(LIBGCC_FILE_NAME) +$(obj)/coreboot_ram.o: $(obj)/arch/i386/lib/c_start.o $$(drivers) $(obj)/coreboot.a $(LIBGCC_FILE_NAME) @printf " CC $(subst $(obj)/,,$(@))\n" $(CC) -nostdlib -r -o $@ $(obj)/arch/i386/lib/c_start.o $(drivers) -Wl,--start-group $(obj)/coreboot.a $(LIBGCC_FILE_NAME) -Wl,--end-group -$(obj)/coreboot.a: $(objs) +$(obj)/coreboot.a: $$(objs) @printf " AR $(subst $(obj)/,,$(@))\n" rm -f $(obj)/coreboot.a - $(AR) cr $(obj)/coreboot.a $(objs) + $(AR) cr $(obj)/coreboot.a $^ ####################################################################### # done @@ -195,7 +193,7 @@ $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/romcc $(OPTION_TABLE_H) $(obj)/build.h printf " ROMCC romstage.inc\n" - $(ROMCC) -c -S $(ROMCCFLAGS) -include $(obj)/build.h -I. $(INCLUDES) $< -o $@ + $(ROMCC) -c -S $(ROMCCFLAGS) -I. $(INCLUDES) $< -o $@ else @@ -205,7 +203,7 @@ $(obj)/mainboard/$(MAINBOARDDIR)/romstage.pre.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(OPTION_TABLE_H) $(obj)/build.h printf " CC romstage.inc\n" - $(CC) -MMD $(CFLAGS) -include $(obj)/build.h -I$(src) -I. -c -S $< -o $@ + $(CC) -MMD $(CFLAGS) -I$(src) -I. -c -S $< -o $@ $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(obj)/mainboard/$(MAINBOARDDIR)/romstage.pre.inc printf " POST romstage.inc\n" @@ -213,9 +211,6 @@ mv $@.tmp $@ endif -else -# Only in first pass - # Things that appear in every board initobjs += $(obj)/mainboard/$(MAINBOARDDIR)/crt0.o objs += $(obj)/mainboard/$(MAINBOARDDIR)/mainboard.o @@ -249,8 +244,6 @@ objs += $(obj)/mainboard/$(MAINBOARDDIR)/get_bus_conf.o endif -endif - ifeq ($(CONFIG_TINY_BOOTBLOCK),y) include $(src)/arch/i386/Makefile.bootblock.inc else Modified: trunk/src/arch/i386/lib/Makefile.inc ============================================================================== --- trunk/src/arch/i386/lib/Makefile.inc Fri Mar 26 19:31:12 2010 (r5303) +++ trunk/src/arch/i386/lib/Makefile.inc Sat Mar 27 18:18:39 2010 (r5304) @@ -8,8 +8,3 @@ initobj-y += printk_init.o initobj-y += cbfs_and_run.o - -ifdef POST_EVALUATION -$(obj)/arch/i386/lib/console.o :: $(obj)/build.h -endif - Modified: trunk/src/cpu/x86/smm/Makefile.inc ============================================================================== --- trunk/src/cpu/x86/smm/Makefile.inc Fri Mar 26 19:31:12 2010 (r5303) +++ trunk/src/cpu/x86/smm/Makefile.inc Sat Mar 27 18:18:39 2010 (r5304) @@ -25,9 +25,7 @@ smmobj-y += smihandler.o smmobj-y += smiutil.o -ifdef POST_EVALUATION - -$(obj)/cpu/x86/smm/smm.o: $(smmobjs) +$(obj)/cpu/x86/smm/smm.o: $$(smmobjs) $(CC) $(LDFLAGS) -nostdlib -r -o $@ $^ $(obj)/cpu/x86/smm/smm: $(obj)/cpu/x86/smm/smm.o $(src)/cpu/x86/smm/smm.ld $(obj)/ldoptions @@ -42,5 +40,3 @@ @printf " CC $(subst $(obj)/,,$(@))\n" $(CC) $(CFLAGS) -c -o $@ $< -endif - Modified: trunk/util/abuild/abuild ============================================================================== --- trunk/util/abuild/abuild Fri Mar 26 19:31:12 2010 (r5303) +++ trunk/util/abuild/abuild Sat Mar 27 18:18:39 2010 (r5304) @@ -18,7 +18,7 @@ ABUILD_VERSION="0.9" # Where shall we place all the build trees? -TARGET=$( pwd )/coreboot-builds +TARGET=coreboot-builds XMLFILE=$( pwd )/abuild.xml # path to payload. Should be more generic Modified: trunk/util/cbfstool/Makefile.inc ============================================================================== --- trunk/util/cbfstool/Makefile.inc Fri Mar 26 19:31:12 2010 (r5303) +++ trunk/util/cbfstool/Makefile.inc Sat Mar 27 18:18:39 2010 (r5304) @@ -1,6 +1,3 @@ - -ifdef POST_EVALUATION - cbfsobj := cbfsobj += common.o cbfsobj += compress.o @@ -53,5 +50,3 @@ printf " HOSTCXX $(subst $(obj)/,,$(@)) (link)\n" $(HOSTCXX) $(CBFSTOOLFLAGS) -o $@ $(addprefix $(obj)/util/cbfstool/,$(cbfsobj)) -endif -

3 2

[PATCH]various build system improvements
by Patrick Georgi March 29, 2010

March 29, 2010

Hi, attached patch improves various aspects in the build system: make only needs to read Makefile.incs once, thanks to the SECONDEXPANSION feature of GNU make (and we rely on GNU make for lots of things already) File paths are relative to the root directory, which simplifies debugging (make V=1 gives shorter command lines) and helps ccache finding matches for checkouts in different directories (even though it should normalize paths itself) It's abuild tested. Signed-off-by: Patrick Georgi <patrick.georgi(a)coresystems.de>

4 3

[commit] r5309 - in trunk/src: lib mainboard/kontron/986lcd-m
by repository service March 29, 2010

March 29, 2010

Author: stepan Date: Sun Mar 28 23:31:30 2010 New Revision: 5309 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5309 Log: Add a non-time consuming version of ram check so we can print a decent error rather than looping on non-working ram. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/src/lib/ramtest.c trunk/src/mainboard/kontron/986lcd-m/romstage.c Modified: trunk/src/lib/ramtest.c ============================================================================== --- trunk/src/lib/ramtest.c Sun Mar 28 23:30:23 2010 (r5308) +++ trunk/src/lib/ramtest.c Sun Mar 28 23:31:30 2010 (r5309) @@ -1,6 +1,6 @@ #include <lib.h> /* Prototypes */ -static void write_phys(unsigned long addr, unsigned long value) +static void write_phys(unsigned long addr, u32 value) { // Assembler in lib/ is very ugly. But we properly guarded // it so let's obey this one for now @@ -9,7 +9,7 @@ "movnti %1, (%0)" : /* outputs */ : "r" (addr), "r" (value) /* inputs */ -#ifndef __GNUC__ +#ifndef __GNUC__ /* GCC does not like empty clobbers? */ : /* clobbers */ #endif ); @@ -20,13 +20,31 @@ #endif } -static unsigned long read_phys(unsigned long addr) +static u32 read_phys(unsigned long addr) { volatile unsigned long *ptr; ptr = (void *)addr; return *ptr; } +static void phys_memory_barrier(void) +{ +#if CONFIG_SSE2 + // Needed for movnti + asm volatile ( + "sfence" + :: +#ifdef __GNUC__ /* ROMCC does not like memory clobbers */ + : "memory" +#endif + ); +#else +#ifdef __GNUC__ /* ROMCC does not like empty asm statements */ + asm volatile ("" ::: "memory"); +#endif +#endif +} + static void ram_fill(unsigned long start, unsigned long stop) { unsigned long addr; @@ -52,12 +70,8 @@ print_debug(" \r"); #endif } - write_phys(addr, addr); + write_phys(addr, (u32)addr); }; -#if CONFIG_SSE2 - // Needed for movnti - asm volatile ("sfence" ::: "memory"); -#endif /* Display final address */ #if CONFIG_USE_PRINTK_IN_CAR printk(BIOS_DEBUG, "%08lx\r\nDRAM filled\r\n", addr); @@ -159,6 +173,8 @@ print_debug("\r\n"); #endif ram_fill(start, stop); + /* Make sure we don't read before we wrote */ + phys_memory_barrier(); ram_verify(start, stop); #if CONFIG_USE_PRINTK_IN_CAR printk(BIOS_DEBUG, "Done.\r\n"); @@ -167,3 +183,33 @@ #endif } +void quick_ram_check(void) +{ + int fail = 0; + u32 backup; + backup = read_phys(CONFIG_RAMBASE); + write_phys(CONFIG_RAMBASE, 0x55555555); + phys_memory_barrier(); + if (read_phys(CONFIG_RAMBASE) != 0x55555555) + fail=1; + write_phys(CONFIG_RAMBASE, 0xaaaaaaaa); + phys_memory_barrier(); + if (read_phys(CONFIG_RAMBASE) != 0xaaaaaaaa) + fail=1; + write_phys(CONFIG_RAMBASE, 0x00000000); + phys_memory_barrier(); + if (read_phys(CONFIG_RAMBASE) != 0x00000000) + fail=1; + write_phys(CONFIG_RAMBASE, 0xffffffff); + phys_memory_barrier(); + if (read_phys(CONFIG_RAMBASE) != 0xffffffff) + fail=1; + + write_phys(CONFIG_RAMBASE, backup); + if (fail) { + post_code(0xea); + die("RAM INIT FAILURE!\n"); + } + phys_memory_barrier(); +} + Modified: trunk/src/mainboard/kontron/986lcd-m/romstage.c ============================================================================== --- trunk/src/mainboard/kontron/986lcd-m/romstage.c Sun Mar 28 23:30:23 2010 (r5308) +++ trunk/src/mainboard/kontron/986lcd-m/romstage.c Sun Mar 28 23:31:30 2010 (r5309) @@ -455,6 +455,8 @@ #endif #endif + quick_ram_check(); + MCHBAR16(SSKPD) = 0xCAFE; #if CONFIG_HAVE_ACPI_RESUME

4 4

Hi...all
by anand bhagwantrao March 29, 2010

March 29, 2010

Hi all, Im want to know which IPMI BMC card is supported by Coreboot. Im building a server where i want both ipmi bmc manageability and coreboot. If anyone find.....?pls let me know... Thanks

6 9