Remove duplicate line from pci_ids.h.

Signed-off-by: Jonathan Kollasch <jakllsch@kollasch.net>
Acked-by: Jonathan Kollasch <jakllsch@kollasch.net>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5920 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/Kconfig b/src/Kconfig
index 00c5591d00b6eefc796e0c4df2b3c5a91278879d..690a1d486401216e5221cc36a32ec74fb0716182 100644 (file)
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -720,6 +720,10 @@ config AP_CODE_IN_CAR
        bool
        default n
 
+config RAMINIT_SYSINFO
+       bool
+       default n
+
 config ENABLE_APIC_EXT_ID
        bool
        default n

diff --git a/src/cpu/amd/model_10xxx/init_cpus.c b/src/cpu/amd/model_10xxx/init_cpus.c
index ae1da669670a4911c70e870c4504dc5f50dea92b..e582ca8af3deb1f55f6f65c766763c65b6a34aee 100644 (file)
--- a/src/cpu/amd/model_10xxx/init_cpus.c
+++ b/src/cpu/amd/model_10xxx/init_cpus.c
@@ -257,7 +257,7 @@ static void STOP_CAR_AND_CPU(void)
        stop_this_cpu();
 }
 
-#if RAMINIT_SYSINFO == 1
+#if CONFIG_RAMINIT_SYSINFO
 static u32 init_cpus(u32 cpu_init_detectedx, struct sys_info *sysinfo)
 #else
 static u32 init_cpus(u32 cpu_init_detectedx)
@@ -918,7 +918,7 @@ static void finalize_node_setup(struct sys_info *sysinfo)
        u8 nodes = get_nodes();
        u32 reg;
 
-#if RAMINIT_SYSINFO == 1
+#if CONFIG_RAMINIT_SYSINFO
        /* read Node0 F0_0x64 bit [8:10] to find out SbLink # */
        reg = pci_read_config32(NODE_HT(0), 0x64);
        sysinfo->sblk = (reg >> 8) & 7;

diff --git a/src/cpu/amd/model_fxx/init_cpus.c b/src/cpu/amd/model_fxx/init_cpus.c
index fa0f8b4f3f65cf6e483339bde517d93df7633a23..5672a6e8f155990c548bab341cd68e932e2a9531 100644 (file)
--- a/src/cpu/amd/model_fxx/init_cpus.c
+++ b/src/cpu/amd/model_fxx/init_cpus.c
@@ -209,7 +209,7 @@ static void STOP_CAR_AND_CPU(void)
        stop_this_cpu();
 }
 
-#if RAMINIT_SYSINFO == 1
+#if CONFIG_RAMINIT_SYSINFO
 static u32 init_cpus(u32 cpu_init_detectedx, struct sys_info *sysinfo)
 #else
 static u32 init_cpus(u32 cpu_init_detectedx)

diff --git a/src/cpu/amd/model_fxx/powernow_acpi.c b/src/cpu/amd/model_fxx/powernow_acpi.c
index 5339f3b5bffe2250d3a81d6e47bc76c9a63dd05d..b07dcb1a96fb0a9db50205385fe6884785f3da31 100644 (file)
--- a/src/cpu/amd/model_fxx/powernow_acpi.c
+++ b/src/cpu/amd/model_fxx/powernow_acpi.c
@@ -30,6 +30,7 @@
 #include <cpu/amd/amdk8_sysconf.h>
 #include <arch/cpu.h>
 
+#if CONFIG_K8_REV_F_SUPPORT
 static int write_pstates_for_core(u8 pstate_num, u16 *pstate_feq, u8 *pstate_vid,
                                u8 *pstate_fid, u32 *pstate_power, int coreID,
                                u32 pcontrol_blk, u8 plen, u8 onlyBSP)
@@ -386,3 +387,12 @@ int amd_model_fxx_generate_powernow(u32 pcontrol_blk, u8 plen, u8 onlyBSP)
        acpigen_patch_len(lens - 1);
        return lens;
 }
+
+#else
+
+int amd_model_fxx_generate_powernow(u32 pcontrol_blk, u8 plen, u8 onlyBSP)
+{
+       return 0;
+}
+
+#endif

diff --git a/src/cpu/amd/socket_754/Kconfig b/src/cpu/amd/socket_754/Kconfig
index d891cd237fa0cb06dc744699c822c89d3af1f769..b6b8260f80f757c64eb631ff8ea0c1bf617dc9d8 100644 (file)
--- a/src/cpu/amd/socket_754/Kconfig
+++ b/src/cpu/amd/socket_754/Kconfig
@@ -1,13 +1,3 @@
 config CPU_AMD_SOCKET_754
        bool
        select CPU_AMD_MODEL_FXX
-
-config CPU_SOCKET_TYPE
-       hex
-       default 0x10
-       depends on CPU_AMD_SOCKET_754
-
-config DIMM_SUPPORT
-       hex
-       default 0x108
-       depends on CPU_AMD_SOCKET_754

diff --git a/src/cpu/amd/socket_939/Kconfig b/src/cpu/amd/socket_939/Kconfig
index ca8059d551781fa62ffcf71ea658ec03a35d30a1..ff36a84849ea52ee9f3e855681360519f5637321 100644 (file)
--- a/src/cpu/amd/socket_939/Kconfig
+++ b/src/cpu/amd/socket_939/Kconfig
@@ -2,12 +2,3 @@ config CPU_AMD_SOCKET_939
        bool
        select CPU_AMD_MODEL_FXX
 
-config CPU_SOCKET_TYPE
-       hex
-       default 0x0
-       depends on CPU_AMD_SOCKET_939
-
-config DIMM_SUPPORT
-       hex
-       default 0x108
-       depends on CPU_AMD_SOCKET_939

diff --git a/src/cpu/amd/socket_940/Kconfig b/src/cpu/amd/socket_940/Kconfig
index 6c3a929f14ef8c379f0bf8334ada705843254867..1dbf6526b78eb2f3209b578257913b6e517a2170 100644 (file)
--- a/src/cpu/amd/socket_940/Kconfig
+++ b/src/cpu/amd/socket_940/Kconfig
@@ -9,14 +9,6 @@ config SOCKET_SPECIFIC_OPTIONS
        select CPU_AMD_MODEL_FXX
        select CACHE_AS_RAM
 
-config CPU_SOCKET_TYPE
-       hex
-       default 0x0
-
-config DIMM_SUPPORT
-       hex
-       default 0x108
-
 config CPU_ADDR_BITS
        int
        default 40

diff --git a/src/lib/generic_sdram.c b/src/lib/generic_sdram.c
index 3f691cb5a9162e24618b54d772f4c2d0f29e9949..efb61dbf7a2900bb72f77961ce30e7a166949468 100644 (file)
--- a/src/lib/generic_sdram.c
+++ b/src/lib/generic_sdram.c
@@ -1,9 +1,5 @@
 #include <lib.h> /* Prototypes */
 
-#ifndef RAMINIT_SYSINFO
-        #define RAMINIT_SYSINFO 0
-#endif
-
 static inline void print_debug_sdram_8(const char *strval, uint32_t val)
 {
 #if CONFIG_CACHE_AS_RAM
@@ -14,7 +10,7 @@ static inline void print_debug_sdram_8(const char *strval, uint32_t val)
 }
 
 /* Setup SDRAM */
-#if RAMINIT_SYSINFO == 1
+#if CONFIG_RAMINIT_SYSINFO
 void sdram_initialize(int controllers, const struct mem_controller *ctrl, void *sysinfo)
 #else
 void sdram_initialize(int controllers, const struct mem_controller *ctrl)
@@ -25,7 +21,7 @@ void sdram_initialize(int controllers, const struct mem_controller *ctrl)
        for(i = 0; i < controllers; i++) {
                print_debug_sdram_8("Ram1.", i);
 
-       #if RAMINIT_SYSINFO == 1
+       #if CONFIG_RAMINIT_SYSINFO
                sdram_set_registers(ctrl + i, sysinfo);
        #else
                sdram_set_registers(ctrl + i);
@@ -36,7 +32,7 @@ void sdram_initialize(int controllers, const struct mem_controller *ctrl)
        for(i = 0; i < controllers; i++) {
                 print_debug_sdram_8("Ram2.", i);
 
-       #if RAMINIT_SYSINFO == 1
+       #if CONFIG_RAMINIT_SYSINFO
                sdram_set_spd_registers(ctrl + i, sysinfo);
        #else
                 sdram_set_spd_registers(ctrl + i);
@@ -50,7 +46,7 @@ void sdram_initialize(int controllers, const struct mem_controller *ctrl)
         */
        print_debug("Ram3\n");
 
-       #if RAMINIT_SYSINFO == 1
+       #if CONFIG_RAMINIT_SYSINFO
        sdram_enable(controllers, ctrl, sysinfo);
        #else
        sdram_enable(controllers, ctrl);

diff --git a/src/mainboard/amd/dbm690t/Kconfig b/src/mainboard/amd/dbm690t/Kconfig
index 13d076bd447bb52fe6506a2ffee121d4daf7cd96..bab44a57977526790d33527f2c4d2000595bda9c 100644 (file)
--- a/src/mainboard/amd/dbm690t/Kconfig
+++ b/src/mainboard/amd/dbm690t/Kconfig
@@ -20,6 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select HAVE_HARD_RESET
        select SB_HT_CHAIN_UNITID_OFFSET_ONLY
        select BOARD_ROMSIZE_KB_1024
+       select RAMINIT_SYSINFO
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/amd/dbm690t/romstage.c b/src/mainboard/amd/dbm690t/romstage.c
index 9635e39fd00a7bdd1020ac011d62f342c79e41bd..da1427a7f575c0e9e724683b794c449012c860b9 100644 (file)
--- a/src/mainboard/amd/dbm690t/romstage.c
+++ b/src/mainboard/amd/dbm690t/romstage.c
@@ -17,7 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define RAMINIT_SYSINFO 1
 #define SET_FIDVID 1
 #define QRANK_DIMM_SUPPORT 1
 #if CONFIG_LOGICAL_CPUS==1

diff --git a/src/mainboard/amd/mahogany/Kconfig b/src/mainboard/amd/mahogany/Kconfig
index 95d305ca0558161c63f9c7a3d68b0a8fef9639ec..832c0584073381a21fc4839d49e0b77940e8cc6f 100644 (file)
--- a/src/mainboard/amd/mahogany/Kconfig
+++ b/src/mainboard/amd/mahogany/Kconfig
@@ -22,6 +22,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select HAVE_HARD_RESET
        select SB_HT_CHAIN_UNITID_OFFSET_ONLY
        select BOARD_ROMSIZE_KB_1024
+       select RAMINIT_SYSINFO
        select GFXUMA
 
 config MAINBOARD_DIR

diff --git a/src/mainboard/amd/mahogany/romstage.c b/src/mainboard/amd/mahogany/romstage.c
index 702b97965e6f935bce4b04e8cc6d0461b57c1d1a..5a8dc8ee37cc02ee42c68ce43786906ea8eb4e38 100644 (file)
--- a/src/mainboard/amd/mahogany/romstage.c
+++ b/src/mainboard/amd/mahogany/romstage.c
@@ -17,7 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define RAMINIT_SYSINFO 1
 #define SET_FIDVID 1
 #define QRANK_DIMM_SUPPORT 1
 #if CONFIG_LOGICAL_CPUS==1

diff --git a/src/mainboard/amd/mahogany_fam10/Kconfig b/src/mainboard/amd/mahogany_fam10/Kconfig
index dddc8176986a1f7d801e00236fbee50a93d110c5..2db683d5fef9dcd122d50f9b2f1bbd03e5d031b6 100644 (file)
--- a/src/mainboard/amd/mahogany_fam10/Kconfig
+++ b/src/mainboard/amd/mahogany_fam10/Kconfig
@@ -24,6 +24,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select AMDMCT
        select GENERATE_ACPI_TABLES
        select BOARD_ROMSIZE_KB_1024
+       select RAMINIT_SYSINFO
        select ENABLE_APIC_EXT_ID
        select TINY_BOOTBLOCK
        select GFXUMA

diff --git a/src/mainboard/amd/mahogany_fam10/romstage.c b/src/mainboard/amd/mahogany_fam10/romstage.c
index 64e02f49e029ce8cec89c3a064caa011d811424a..422ff4c2723694a845e4ad02b2af97b14bf93ffc 100644 (file)
--- a/src/mainboard/amd/mahogany_fam10/romstage.c
+++ b/src/mainboard/amd/mahogany_fam10/romstage.c
@@ -21,8 +21,6 @@
 #define SYSTEM_TYPE 1  /* DESKTOP */
 //#define SYSTEM_TYPE 2        /* MOBILE */
 
-#define RAMINIT_SYSINFO 1
-
 #define SET_NB_CFG_54 1
 
 //used by raminit

diff --git a/src/mainboard/amd/pistachio/Kconfig b/src/mainboard/amd/pistachio/Kconfig
index 778ad585d4480564d892ac576297de6e38cf94aa..667b44fb332a3eacd1d54e51c18d223b863cb9a2 100644 (file)
--- a/src/mainboard/amd/pistachio/Kconfig
+++ b/src/mainboard/amd/pistachio/Kconfig
@@ -20,6 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select WAIT_BEFORE_CPUS_INIT
        select HAVE_ACPI_TABLES
        select BOARD_ROMSIZE_KB_1024
+       select RAMINIT_SYSINFO
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/amd/pistachio/romstage.c b/src/mainboard/amd/pistachio/romstage.c
index 51269b1cf65264e3e864d37ed4c6efc605ac3256..5f6aa2ce46eee81942640415a8461bbd962deeb0 100644 (file)
--- a/src/mainboard/amd/pistachio/romstage.c
+++ b/src/mainboard/amd/pistachio/romstage.c
@@ -17,7 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define RAMINIT_SYSINFO 1
 #define SET_FIDVID 1
 #define QRANK_DIMM_SUPPORT 1
 #if CONFIG_LOGICAL_CPUS==1

diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig
index b5fa04c7c8af73a08ee6d681bb14aeca922a16e7..89f6e086be0654e1b2412fe5dc8c65a4951b17bc 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah/Kconfig
@@ -24,6 +24,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select WAIT_BEFORE_CPUS_INIT
        select HAVE_ACPI_TABLES
        select BOARD_ROMSIZE_KB_512
+       select RAMINIT_SYSINFO
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/amd/serengeti_cheetah/ap_romstage.c b/src/mainboard/amd/serengeti_cheetah/ap_romstage.c
index d8539932b2ad880db15aceb2b98831e9a5079e81..80c5e143530e4cfb77341a52eba72829675765e7 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah/ap_romstage.c
+++ b/src/mainboard/amd/serengeti_cheetah/ap_romstage.c
@@ -1,8 +1,6 @@
 #define ASSEMBLY 1
 #define __PRE_RAM__
 
-#define RAMINIT_SYSINFO 1
-
 #define SET_NB_CFG_54 1
 
 //used by raminit

diff --git a/src/mainboard/amd/serengeti_cheetah/romstage.c b/src/mainboard/amd/serengeti_cheetah/romstage.c
index fed8d6a6c3b192f995a5df8f464c005dcfa3475a..2653e94db16dc491ffdcc305bdf09a5ad6627c7c 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah/romstage.c
+++ b/src/mainboard/amd/serengeti_cheetah/romstage.c
@@ -1,5 +1,3 @@
-#define RAMINIT_SYSINFO 1
-
 #define SET_NB_CFG_54 1
 
 //used by raminit

diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
index e95804122aad34d760aecf46d0cd55663732a2e0..f9164744255af42c9694b2f827fef5acba7aa6a0 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
@@ -22,6 +22,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select AMDMCT
        select HAVE_ACPI_TABLES
        select BOARD_ROMSIZE_KB_1024
+       select RAMINIT_SYSINFO
        select ENABLE_APIC_EXT_ID
        select LIFT_BSP_APIC_ID
        select TINY_BOOTBLOCK

diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
index 910c9633a32337d687432f8c7e71771245c3d14b..6f6715e6ce07443ce15670012684cd4390c31bca 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
@@ -21,8 +21,6 @@
 //#define SYSTEM_TYPE 1        /* DESKTOP */
 //#define SYSTEM_TYPE 2        /* MOBILE */
 
-#define RAMINIT_SYSINFO 1
-
 #define SET_NB_CFG_54 1
 
 //used by raminit

diff --git a/src/mainboard/amd/tilapia_fam10/Kconfig b/src/mainboard/amd/tilapia_fam10/Kconfig
index 06509dcd03bbc90a66eead3802584b19d1197547..9181022eb00f16272b59c0a75c0b16575a402fde 100644 (file)
--- a/src/mainboard/amd/tilapia_fam10/Kconfig
+++ b/src/mainboard/amd/tilapia_fam10/Kconfig
@@ -24,6 +24,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select AMDMCT
        select GENERATE_ACPI_TABLES
        select BOARD_ROMSIZE_KB_1024
+       select RAMINIT_SYSINFO
        select ENABLE_APIC_EXT_ID
        select TINY_BOOTBLOCK
        select GFXUMA

diff --git a/src/mainboard/amd/tilapia_fam10/romstage.c b/src/mainboard/amd/tilapia_fam10/romstage.c
index b0da2aec6c62a54faad8a60083c2f5efae372e22..7408a3f8a1d40911ca90680e1332a95b61bc079d 100644 (file)
--- a/src/mainboard/amd/tilapia_fam10/romstage.c
+++ b/src/mainboard/amd/tilapia_fam10/romstage.c
@@ -21,8 +21,6 @@
 #define SYSTEM_TYPE 1  /* DESKTOP */
 //#define SYSTEM_TYPE 2        /* MOBILE */
 
-#define RAMINIT_SYSINFO 1
-
 #define SET_NB_CFG_54 1
 
 //used by raminit

diff --git a/src/mainboard/asrock/939a785gmh/Kconfig b/src/mainboard/asrock/939a785gmh/Kconfig
index e5b503f77a7d9f67dd225fcda5b5f6f09d11d03c..5c48c3cd3b1253ed76d67c8c531a13eb9861b5bb 100644 (file)
--- a/src/mainboard/asrock/939a785gmh/Kconfig
+++ b/src/mainboard/asrock/939a785gmh/Kconfig
@@ -23,6 +23,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select SB_HT_CHAIN_UNITID_OFFSET_ONLY
        select BOARD_ROMSIZE_KB_1024
        select GFXUMA
+       select RAMINIT_SYSINFO
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/asrock/939a785gmh/romstage.c b/src/mainboard/asrock/939a785gmh/romstage.c
index 1a01e5d0f5a0cc1b0dc5ea3a24c7877e0415d1e4..21094ba8d2a1912f4930a5d2f8df1b7f5cff2c0d 100644 (file)
--- a/src/mainboard/asrock/939a785gmh/romstage.c
+++ b/src/mainboard/asrock/939a785gmh/romstage.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define RAMINIT_SYSINFO 1
 #define SET_FIDVID 1
 #define QRANK_DIMM_SUPPORT 1
 #if CONFIG_LOGICAL_CPUS==1

diff --git a/src/mainboard/asus/a8v-e_se/Kconfig b/src/mainboard/asus/a8v-e_se/Kconfig
index 92a7567e95f7c8dcf51d0d54f4aba83a58ef233b..c8e3da094e65b2abeb66eaf2c9e6ba81a4a68ade 100644 (file)
--- a/src/mainboard/asus/a8v-e_se/Kconfig
+++ b/src/mainboard/asus/a8v-e_se/Kconfig
@@ -15,6 +15,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select HAVE_ACPI_TABLES
        select HAVE_MP_TABLE
        select BOARD_ROMSIZE_KB_512
+       select RAMINIT_SYSINFO
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/asus/a8v-e_se/romstage.c b/src/mainboard/asus/a8v-e_se/romstage.c
index 401ac0ea277691cef1c2527cd964650216af2203..699f44b2fd74d00e45a9438a6a8802e18ad65c33 100644 (file)
--- a/src/mainboard/asus/a8v-e_se/romstage.c
+++ b/src/mainboard/asus/a8v-e_se/romstage.c
@@ -22,8 +22,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define RAMINIT_SYSINFO 1
-
 unsigned int get_sbdn(unsigned bus);
 
 /* Used by raminit. */

diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig b/src/mainboard/asus/m2v-mx_se/Kconfig
index ac967bd3b1079e0dda697e71b2e7d583266da8e6..235720a6efeab75e85714dbb4af8e0f0cef6a653 100644 (file)
--- a/src/mainboard/asus/m2v-mx_se/Kconfig
+++ b/src/mainboard/asus/m2v-mx_se/Kconfig
@@ -32,6 +32,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select HAVE_OPTION_TABLE
        select HAVE_ACPI_TABLES
        select BOARD_ROMSIZE_KB_512
+       select RAMINIT_SYSINFO
        select VGA
        select TINY_BOOTBLOCK
        select HAVE_MAINBOARD_RESOURCES

diff --git a/src/mainboard/asus/m2v-mx_se/romstage.c b/src/mainboard/asus/m2v-mx_se/romstage.c
index dcf7274265537f545a5452181b34a5ec23dba26a..75c204e424bc43f721d166c868fe8aa97ce38feb 100644 (file)
--- a/src/mainboard/asus/m2v-mx_se/romstage.c
+++ b/src/mainboard/asus/m2v-mx_se/romstage.c
@@ -22,8 +22,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define RAMINIT_SYSINFO 1
-
 unsigned int get_sbdn(unsigned bus);
 
 /* Used by raminit. */

diff --git a/src/mainboard/asus/m4a785-m/Kconfig b/src/mainboard/asus/m4a785-m/Kconfig
index e04fac75fc786bd3b0e23817c958f98999509b76..d9c310b1bf3ad61978eb29e818583ffd34cbc912 100644 (file)
--- a/src/mainboard/asus/m4a785-m/Kconfig
+++ b/src/mainboard/asus/m4a785-m/Kconfig
@@ -23,6 +23,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select AMDMCT
        select GENERATE_ACPI_TABLES
        select BOARD_ROMSIZE_KB_1024
+       select RAMINIT_SYSINFO
        select ENABLE_APIC_EXT_ID
        select TINY_BOOTBLOCK
        select GFXUMA

diff --git a/src/mainboard/asus/m4a785-m/romstage.c b/src/mainboard/asus/m4a785-m/romstage.c
index 4d16ab703625b0ddf4c535b672959e5a16ef869f..d3e1d887bacca85c526555c83d1c7415628def1f 100644 (file)
--- a/src/mainboard/asus/m4a785-m/romstage.c
+++ b/src/mainboard/asus/m4a785-m/romstage.c
@@ -21,8 +21,6 @@
 #define SYSTEM_TYPE 1  /* DESKTOP */
 //#define SYSTEM_TYPE 2        /* MOBILE */
 
-#define RAMINIT_SYSINFO 1
-
 #define SET_NB_CFG_54 1
 
 //used by raminit

diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
index e4d91a1e9c12fb3ddee35a12a9e41ef6e3497f28..dcf176ee45cfe6b6dca59e82d33415f4774bf965 100644 (file)
--- a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
+++ b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
@@ -17,6 +17,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select LIFT_BSP_APIC_ID
        select K8_REV_F_SUPPORT
        select BOARD_ROMSIZE_KB_512
+       select RAMINIT_SYSINFO
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c b/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c
index 1ecbd61be45d38a47043f8006cb3a8441c362783..c9e3a3e1e9813f4977ec02f0f7df43f0952cd418 100644 (file)
--- a/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c
@@ -24,8 +24,6 @@
 #define ASSEMBLY 1
 #define __PRE_RAM__
 
-#define RAMINIT_SYSINFO 1
-
 #define SET_NB_CFG_54 1
 
 //used by raminit

diff --git a/src/mainboard/gigabyte/ga_2761gxdk/romstage.c b/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
index 9e186eba560763cdd579c9b20562423ef1760b85..0bddee2c961f98e0f129b4d3d835336910c01905 100644 (file)
--- a/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define RAMINIT_SYSINFO 1
-
 #define K8_ALLOCATE_IO_RANGE 1
 
 #define QRANK_DIMM_SUPPORT 1

diff --git a/src/mainboard/gigabyte/m57sli/Kconfig b/src/mainboard/gigabyte/m57sli/Kconfig
index 9dbc4486bee2ea11867b4c8829070acd981be899..1793ac8877fe03ad0b36ecfdfcfbb6af3dc10159 100644 (file)
--- a/src/mainboard/gigabyte/m57sli/Kconfig
+++ b/src/mainboard/gigabyte/m57sli/Kconfig
@@ -22,6 +22,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select HAVE_ACPI_TABLES
        select K8_REV_F_SUPPORT
        select BOARD_ROMSIZE_KB_512
+       select RAMINIT_SYSINFO
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/gigabyte/m57sli/ap_romstage.c b/src/mainboard/gigabyte/m57sli/ap_romstage.c
index 0883a5a60ff72ef90b8235ea1b9cdbc8687156a6..a47a32148e75db62bc2b32941e3ba98a3cf0dc28 100644 (file)
--- a/src/mainboard/gigabyte/m57sli/ap_romstage.c
+++ b/src/mainboard/gigabyte/m57sli/ap_romstage.c
@@ -22,8 +22,6 @@
 #define ASSEMBLY 1
 #define __PRE_RAM__
 
-#define RAMINIT_SYSINFO 1
-
 #define SET_NB_CFG_54 1
 
 //used by raminit

diff --git a/src/mainboard/gigabyte/m57sli/romstage.c b/src/mainboard/gigabyte/m57sli/romstage.c
index 47e936808d09429b2b046f229f4e6c55d5165528..8591abc9943e9f273a024e79f49c1cccb50d0ba4 100644 (file)
--- a/src/mainboard/gigabyte/m57sli/romstage.c
+++ b/src/mainboard/gigabyte/m57sli/romstage.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define RAMINIT_SYSINFO 1
-
 #define K8_ALLOCATE_IO_RANGE 1
 
 #define QRANK_DIMM_SUPPORT 1

diff --git a/src/mainboard/gigabyte/ma785gmt/Kconfig b/src/mainboard/gigabyte/ma785gmt/Kconfig
index fcb039eea4b1a3ca001e2138fb4ab123d5ab0502..46a87f6d5e32292d2b0df30cc75a9c209a202b48 100644 (file)
--- a/src/mainboard/gigabyte/ma785gmt/Kconfig
+++ b/src/mainboard/gigabyte/ma785gmt/Kconfig
@@ -27,6 +27,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select ENABLE_APIC_EXT_ID
        select TINY_BOOTBLOCK
        select GFXUMA
+       select RAMINIT_SYSINFO
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/gigabyte/ma785gmt/romstage.c b/src/mainboard/gigabyte/ma785gmt/romstage.c
index b32fea8271ccb493b6cb3b8bb74cc91785efc108..98223026b94090b0f6ba8e3cc60c38c009a350b8 100644 (file)
--- a/src/mainboard/gigabyte/ma785gmt/romstage.c
+++ b/src/mainboard/gigabyte/ma785gmt/romstage.c
@@ -21,8 +21,6 @@
 #define SYSTEM_TYPE 1  /* DESKTOP */
 //#define SYSTEM_TYPE 2        /* MOBILE */
 
-#define RAMINIT_SYSINFO 1
-
 #define SET_NB_CFG_54 1
 
 //used by raminit

diff --git a/src/mainboard/gigabyte/ma78gm/Kconfig b/src/mainboard/gigabyte/ma78gm/Kconfig
index d42af7284032454e4d08c5e5a12d52666f493ed5..5cb0b5142a466b27f40f1f23431566443e44e3d9 100644 (file)
--- a/src/mainboard/gigabyte/ma78gm/Kconfig
+++ b/src/mainboard/gigabyte/ma78gm/Kconfig
@@ -27,6 +27,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select ENABLE_APIC_EXT_ID
        select TINY_BOOTBLOCK
        select GFXUMA
+       select RAMINIT_SYSINFO
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/gigabyte/ma78gm/romstage.c b/src/mainboard/gigabyte/ma78gm/romstage.c
index ca39156b35d90cacbf21727bbe5a6d72970d8374..603386d87fba4fb5617f6b85de394ff1572a0419 100644 (file)
--- a/src/mainboard/gigabyte/ma78gm/romstage.c
+++ b/src/mainboard/gigabyte/ma78gm/romstage.c
@@ -21,8 +21,6 @@
 #define SYSTEM_TYPE 1  /* DESKTOP */
 //#define SYSTEM_TYPE 2        /* MOBILE */
 
-#define RAMINIT_SYSINFO 1
-
 #define SET_NB_CFG_54 1
 
 //used by raminit

diff --git a/src/mainboard/hp/dl145_g3/Kconfig b/src/mainboard/hp/dl145_g3/Kconfig
index d33efaf26b93a47e89c87a711a8cde309717c5c4..a3fb89db182b18b23de6c2573753660faa27187b 100644 (file)
--- a/src/mainboard/hp/dl145_g3/Kconfig
+++ b/src/mainboard/hp/dl145_g3/Kconfig
@@ -19,6 +19,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select HAVE_HARD_RESET
        select LIFT_BSP_APIC_ID
        select BOARD_ROMSIZE_KB_512
+       select RAMINIT_SYSINFO
        select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 
 config MAINBOARD_DIR

diff --git a/src/mainboard/hp/dl145_g3/romstage.c b/src/mainboard/hp/dl145_g3/romstage.c
index f3555b63f857eeacb76856a224ca795ef67db793..8019361b24ce67a40bfa76f4d0f16cb9e244a3ee 100644 (file)
--- a/src/mainboard/hp/dl145_g3/romstage.c
+++ b/src/mainboard/hp/dl145_g3/romstage.c
@@ -25,8 +25,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define RAMINIT_SYSINFO 1
-
 #define K8_ALLOCATE_IO_RANGE 1
 
 #define QRANK_DIMM_SUPPORT 1

diff --git a/src/mainboard/hp/dl165_g6_fam10/Kconfig b/src/mainboard/hp/dl165_g6_fam10/Kconfig
index 6e045b33da9c28a430fa88dc58bbd9a707c3e350..655613c4daa6660af598d5fb79994e9e6e8631d5 100644 (file)
--- a/src/mainboard/hp/dl165_g6_fam10/Kconfig
+++ b/src/mainboard/hp/dl165_g6_fam10/Kconfig
@@ -19,6 +19,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select HAVE_HARD_RESET
        select LIFT_BSP_APIC_ID
        select BOARD_ROMSIZE_KB_1024
+       select RAMINIT_SYSINFO
        select ENABLE_APIC_EXT_ID
        select AMDMCT
        select TINY_BOOTBLOCK

diff --git a/src/mainboard/hp/dl165_g6_fam10/romstage.c b/src/mainboard/hp/dl165_g6_fam10/romstage.c
index 41c151e4237162d5043e55c09d3cfaa0c7dbe093..b1267167bc8b6b4989199b6ce996839e1f294b38 100644 (file)
--- a/src/mainboard/hp/dl165_g6_fam10/romstage.c
+++ b/src/mainboard/hp/dl165_g6_fam10/romstage.c
@@ -25,8 +25,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define RAMINIT_SYSINFO 1
-
 #define FAM10_SCAN_PCI_BUS 0
 #define FAM10_ALLOCATE_IO_RANGE 1
 

diff --git a/src/mainboard/iei/kino-780am2-fam10/Kconfig b/src/mainboard/iei/kino-780am2-fam10/Kconfig
index 4318c12f98b45795200e95b530a9038c4542b40e..4b1b1d605b0095dd7ce7275594599bad182b7829 100644 (file)
--- a/src/mainboard/iei/kino-780am2-fam10/Kconfig
+++ b/src/mainboard/iei/kino-780am2-fam10/Kconfig
@@ -24,6 +24,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select AMDMCT
        select GENERATE_ACPI_TABLES
        select BOARD_ROMSIZE_KB_1024
+       select RAMINIT_SYSINFO
        select ENABLE_APIC_EXT_ID
        select TINY_BOOTBLOCK
        select GFXUMA

diff --git a/src/mainboard/iei/kino-780am2-fam10/romstage.c b/src/mainboard/iei/kino-780am2-fam10/romstage.c
index c623297bbd388a7be00dc0fc5c178a7cf504bf8a..bc79b190abe24cd7b47d70b1969f1b2940c638b0 100644 (file)
--- a/src/mainboard/iei/kino-780am2-fam10/romstage.c
+++ b/src/mainboard/iei/kino-780am2-fam10/romstage.c
@@ -21,8 +21,6 @@
 #define SYSTEM_TYPE 1  /* DESKTOP */
 //#define SYSTEM_TYPE 2        /* MOBILE */
 
-#define RAMINIT_SYSINFO 1
-
 #define SET_NB_CFG_54 1
 
 //used by raminit

diff --git a/src/mainboard/iwill/dk8_htx/Kconfig b/src/mainboard/iwill/dk8_htx/Kconfig
index 2af7fcfecef8f010ab32905291fffe0db22858dd..90f940c23c31d9c40cac3adf186420ee057fc9cf 100644 (file)
--- a/src/mainboard/iwill/dk8_htx/Kconfig
+++ b/src/mainboard/iwill/dk8_htx/Kconfig
@@ -20,6 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select WAIT_BEFORE_CPUS_INIT
        select HAVE_ACPI_TABLES
        select BOARD_ROMSIZE_KB_512
+       select RAMINIT_SYSINFO
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/iwill/dk8_htx/romstage.c b/src/mainboard/iwill/dk8_htx/romstage.c
index 7d22ad204e210d9ad2c25088eed31e9c63713a25..696c2c3173f1ffff2baa3a6a669bddebe6d4b614 100644 (file)
--- a/src/mainboard/iwill/dk8_htx/romstage.c
+++ b/src/mainboard/iwill/dk8_htx/romstage.c
@@ -1,5 +1,3 @@
-#define RAMINIT_SYSINFO 1
-
 #define SET_NB_CFG_54 1
 
 //used by raminit

diff --git a/src/mainboard/iwill/dk8s2/Kconfig b/src/mainboard/iwill/dk8s2/Kconfig
index a0ac21c3efab1b9738ff8f65415717bcf9182fee..84bb77cb474cf943724d07094d7cc94f3ba1a7c4 100644 (file)
--- a/src/mainboard/iwill/dk8s2/Kconfig
+++ b/src/mainboard/iwill/dk8s2/Kconfig
@@ -17,6 +17,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select WAIT_BEFORE_CPUS_INIT
        select ATI_RAGE_XL
        select BOARD_ROMSIZE_KB_512
+       select RAMINIT_SYSINFO
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/iwill/dk8s2/romstage.c b/src/mainboard/iwill/dk8s2/romstage.c
index 43079accf85698fff6adc976011484a04d287720..fdd650faa4978339efe84e0fad3dfcaf789545e2 100644 (file)
--- a/src/mainboard/iwill/dk8s2/romstage.c
+++ b/src/mainboard/iwill/dk8s2/romstage.c
@@ -1,5 +1,3 @@
-#define RAMINIT_SYSINFO 1
-
 #define SET_NB_CFG_54 1
 
 //used by raminit

diff --git a/src/mainboard/iwill/dk8x/Kconfig b/src/mainboard/iwill/dk8x/Kconfig
index f2c99d3a3192ba637c2134d7d9199e0e0ce76987..e8719162de6c3f5a63632522f03f8e3ec7eb6ce4 100644 (file)
--- a/src/mainboard/iwill/dk8x/Kconfig
+++ b/src/mainboard/iwill/dk8x/Kconfig
@@ -16,6 +16,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select SB_HT_CHAIN_UNITID_OFFSET_ONLY
        select WAIT_BEFORE_CPUS_INIT
        select BOARD_ROMSIZE_KB_512
+       select RAMINIT_SYSINFO
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/iwill/dk8x/romstage.c b/src/mainboard/iwill/dk8x/romstage.c
index 43079accf85698fff6adc976011484a04d287720..fdd650faa4978339efe84e0fad3dfcaf789545e2 100644 (file)
--- a/src/mainboard/iwill/dk8x/romstage.c
+++ b/src/mainboard/iwill/dk8x/romstage.c
@@ -1,5 +1,3 @@
-#define RAMINIT_SYSINFO 1
-
 #define SET_NB_CFG_54 1
 
 //used by raminit

diff --git a/src/mainboard/jetway/pa78vm5/Kconfig b/src/mainboard/jetway/pa78vm5/Kconfig
index e2768df8f29b2ada031fb2d73d895c844429d246..fbe31a1a7d0cc7c004fb2e4c22ebc1a25eed303d 100644 (file)
--- a/src/mainboard/jetway/pa78vm5/Kconfig
+++ b/src/mainboard/jetway/pa78vm5/Kconfig
@@ -24,6 +24,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select AMDMCT
        select GENERATE_ACPI_TABLES
        select BOARD_ROMSIZE_KB_1024
+       select RAMINIT_SYSINFO
        select ENABLE_APIC_EXT_ID
        select TINY_BOOTBLOCK
        select GFXUMA

diff --git a/src/mainboard/jetway/pa78vm5/romstage.c b/src/mainboard/jetway/pa78vm5/romstage.c
index 0ccfaccb5c0cdb40969a239cf1e744dfad2ed8ed..3ca3df1ffed33594f35449b7ee1dd40d13eca7f2 100644 (file)
--- a/src/mainboard/jetway/pa78vm5/romstage.c
+++ b/src/mainboard/jetway/pa78vm5/romstage.c
@@ -22,8 +22,6 @@
 #define SYSTEM_TYPE 1  /* DESKTOP */
 //#define SYSTEM_TYPE 2        /* MOBILE */
 
-#define RAMINIT_SYSINFO 1
-
 #define SET_NB_CFG_54 1
 
 //used by raminit

diff --git a/src/mainboard/kontron/kt690/Kconfig b/src/mainboard/kontron/kt690/Kconfig
index f036a971cb78c80f5fe8fbdc6d1b1018477241e2..a690885aac1a09d352e9e3af73f8b9659a1a728e 100644 (file)
--- a/src/mainboard/kontron/kt690/Kconfig
+++ b/src/mainboard/kontron/kt690/Kconfig
@@ -20,6 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select HAVE_HARD_RESET
        select HAVE_ACPI_TABLES
        select BOARD_ROMSIZE_KB_1024
+       select RAMINIT_SYSINFO
        select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 
 config MAINBOARD_DIR

diff --git a/src/mainboard/kontron/kt690/romstage.c b/src/mainboard/kontron/kt690/romstage.c
index 6b65b4db6ed0d4ea23c819eb576e3786791e7972..5301edf37f33025a27db5580a27ad92a99bc417e 100644 (file)
--- a/src/mainboard/kontron/kt690/romstage.c
+++ b/src/mainboard/kontron/kt690/romstage.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define RAMINIT_SYSINFO 1
 #define SET_FIDVID 1
 #define QRANK_DIMM_SUPPORT 1
 #if CONFIG_LOGICAL_CPUS==1

diff --git a/src/mainboard/msi/ms7260/Kconfig b/src/mainboard/msi/ms7260/Kconfig
index a7f9e1afe64600bd69fcf5b7aeb4c252584d38bd..58d075d805400a199d5b29ab42df80fd7e6363ff 100644 (file)
--- a/src/mainboard/msi/ms7260/Kconfig
+++ b/src/mainboard/msi/ms7260/Kconfig
@@ -20,6 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select LIFT_BSP_APIC_ID
        select K8_REV_F_SUPPORT
        select BOARD_ROMSIZE_KB_512
+       select RAMINIT_SYSINFO
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/msi/ms7260/ap_romstage.c b/src/mainboard/msi/ms7260/ap_romstage.c
index 16b47685a6dd1b2d660b2c2f9027295b7363f733..0ae20238b9acebc5bfcddb81073b30ca59839a70 100644 (file)
--- a/src/mainboard/msi/ms7260/ap_romstage.c
+++ b/src/mainboard/msi/ms7260/ap_romstage.c
@@ -23,7 +23,6 @@
 
 #define __PRE_RAM__
 
-#define RAMINIT_SYSINFO 1
 #define SET_NB_CFG_54 1                        /* Used by RAM init. */
 #define QRANK_DIMM_SUPPORT 1
 #define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0

diff --git a/src/mainboard/msi/ms7260/romstage.c b/src/mainboard/msi/ms7260/romstage.c
index ebd54f4ef52d19af2ee663dbd6ccc408e800fe12..37bb306ed6eb5af5f3f9a136a297f81e0eee3205 100644 (file)
--- a/src/mainboard/msi/ms7260/romstage.c
+++ b/src/mainboard/msi/ms7260/romstage.c
@@ -24,7 +24,6 @@
 // #define DQS_TRAIN_DEBUG 1
 // #define RES_DEBUG 1
 
-#define RAMINIT_SYSINFO 1
 #define K8_ALLOCATE_IO_RANGE 1
 #define QRANK_DIMM_SUPPORT 1
 #if CONFIG_LOGICAL_CPUS == 1

diff --git a/src/mainboard/msi/ms9185/Kconfig b/src/mainboard/msi/ms9185/Kconfig
index 14ee217d895d6d68b93e73982ce15d8dcfc93a8d..3e4ffedd8ca5652df097b371f7b67e9fbc94a0b8 100644 (file)
--- a/src/mainboard/msi/ms9185/Kconfig
+++ b/src/mainboard/msi/ms9185/Kconfig
@@ -19,6 +19,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select HAVE_HARD_RESET
        select LIFT_BSP_APIC_ID
        select BOARD_ROMSIZE_KB_512
+       select RAMINIT_SYSINFO
        select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 
 config MAINBOARD_DIR

diff --git a/src/mainboard/msi/ms9185/romstage.c b/src/mainboard/msi/ms9185/romstage.c
index 522e2f3e11520d130108326cb01a593bbf0a6908..9f84f44864455462f252deaaac2bd1bd2fadd41d 100644 (file)
--- a/src/mainboard/msi/ms9185/romstage.c
+++ b/src/mainboard/msi/ms9185/romstage.c
@@ -23,8 +23,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define RAMINIT_SYSINFO 1
-
 #define SET_NB_CFG_54 1
 
 //used by raminit

diff --git a/src/mainboard/msi/ms9282/Kconfig b/src/mainboard/msi/ms9282/Kconfig
index de12c5789631e820e062cbcd6f918322add5986b..8424ae905696dbee1ebd768524a3b39f5acf8e78 100644 (file)
--- a/src/mainboard/msi/ms9282/Kconfig
+++ b/src/mainboard/msi/ms9282/Kconfig
@@ -18,6 +18,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select HAVE_HARD_RESET
        select K8_REV_F_SUPPORT
        select BOARD_ROMSIZE_KB_512
+       select RAMINIT_SYSINFO
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/msi/ms9282/romstage.c b/src/mainboard/msi/ms9282/romstage.c
index 8facf05f3a099e898d4b3d6a8efda7408f0eb52e..73fd228fb218b3febac4917186cc7411574ef19d 100644 (file)
--- a/src/mainboard/msi/ms9282/romstage.c
+++ b/src/mainboard/msi/ms9282/romstage.c
@@ -22,8 +22,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define RAMINIT_SYSINFO 1
-
 #define SET_NB_CFG_54 1
 
 //used by raminit

diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig
index 1404de8680592ddb50a716ee31ef7f6c8b740388..4ed01e1fdf031400e243bdc4a68a9da2c4c4c2d3 100644 (file)
--- a/src/mainboard/msi/ms9652_fam10/Kconfig
+++ b/src/mainboard/msi/ms9652_fam10/Kconfig
@@ -18,6 +18,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select HAVE_OPTION_TABLE
        select HAVE_HARD_RESET
        select BOARD_ROMSIZE_KB_512
+       select RAMINIT_SYSINFO
        select ENABLE_APIC_EXT_ID
        select AMDMCT
        select TINY_BOOTBLOCK

diff --git a/src/mainboard/msi/ms9652_fam10/romstage.c b/src/mainboard/msi/ms9652_fam10/romstage.c
index b0696087dfff0e1df77997e4bbe383f2c47d1222..5def21aeba148816a1137c7fe9ef1b1e54c2d1ad 100644 (file)
--- a/src/mainboard/msi/ms9652_fam10/romstage.c
+++ b/src/mainboard/msi/ms9652_fam10/romstage.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define RAMINIT_SYSINFO 1
-
 #define FAM10_SCAN_PCI_BUS 0
 #define FAM10_ALLOCATE_IO_RANGE 1
 

diff --git a/src/mainboard/nvidia/l1_2pvv/Kconfig b/src/mainboard/nvidia/l1_2pvv/Kconfig
index 06e10ab92ae7f0fc36cf967d22f03f9f049b13ec..d4ec46a04c1cc9dcc34beb2fdc834db088b41c5f 100644 (file)
--- a/src/mainboard/nvidia/l1_2pvv/Kconfig
+++ b/src/mainboard/nvidia/l1_2pvv/Kconfig
@@ -21,6 +21,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select LIFT_BSP_APIC_ID
        select K8_REV_F_SUPPORT
        select BOARD_ROMSIZE_KB_512
+       select RAMINIT_SYSINFO
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/nvidia/l1_2pvv/ap_romstage.c b/src/mainboard/nvidia/l1_2pvv/ap_romstage.c
index 5d6f45e3287bf89738a668fe2c1bd80a3e477fe7..91aa68dc6572028e3f7e5c8316e3e4491ae075e3 100644 (file)
--- a/src/mainboard/nvidia/l1_2pvv/ap_romstage.c
+++ b/src/mainboard/nvidia/l1_2pvv/ap_romstage.c
@@ -22,8 +22,6 @@
 #define ASSEMBLY 1
 #define __PRE_RAM__
 
-#define RAMINIT_SYSINFO 1
-
 #define SET_NB_CFG_54 1
 
 //used by raminit

diff --git a/src/mainboard/nvidia/l1_2pvv/romstage.c b/src/mainboard/nvidia/l1_2pvv/romstage.c
index fc135d83781550e408de062eb5d755e63b909c40..a40f55d9561493d5d316fd4893f6f37687498708 100644 (file)
--- a/src/mainboard/nvidia/l1_2pvv/romstage.c
+++ b/src/mainboard/nvidia/l1_2pvv/romstage.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define RAMINIT_SYSINFO 1
-
 #define K8_ALLOCATE_IO_RANGE 1
 
 #define QRANK_DIMM_SUPPORT 1

diff --git a/src/mainboard/supermicro/h8dme/Kconfig b/src/mainboard/supermicro/h8dme/Kconfig
index ab81031b07e967f76cda6a3616dc0e3c5572286a..bb0453c7ef8f6f8bf76f9b0a98f4c2aa5a7e19de 100644 (file)
--- a/src/mainboard/supermicro/h8dme/Kconfig
+++ b/src/mainboard/supermicro/h8dme/Kconfig
@@ -21,6 +21,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        #select AP_CODE_IN_CAR
        select LIFT_BSP_APIC_ID
        select BOARD_ROMSIZE_KB_1024
+       select RAMINIT_SYSINFO
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/supermicro/h8dme/ap_romstage.c b/src/mainboard/supermicro/h8dme/ap_romstage.c
index 8e8b73bd2a413b61e407167b4d2ae2816a551d76..845ec1fd9cbf9cab326cfa08b140f81a9baa4fc3 100644 (file)
--- a/src/mainboard/supermicro/h8dme/ap_romstage.c
+++ b/src/mainboard/supermicro/h8dme/ap_romstage.c
@@ -22,8 +22,6 @@
 #define ASSEMBLY 1
 #define __PRE_RAM__
 
-#define RAMINIT_SYSINFO 1
-
 #define SET_NB_CFG_54 1
 
 //used by raminit

diff --git a/src/mainboard/supermicro/h8dme/romstage.c b/src/mainboard/supermicro/h8dme/romstage.c
index 55ec8cceca15e7b54665a5cb9a5da45a812240bb..c57eb93d3bef3e81011c560d7d7f138777268b67 100644 (file)
--- a/src/mainboard/supermicro/h8dme/romstage.c
+++ b/src/mainboard/supermicro/h8dme/romstage.c
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define RAMINIT_SYSINFO 1
-
 #define K8_ALLOCATE_IO_RANGE 1
 
 #define QRANK_DIMM_SUPPORT 1

diff --git a/src/mainboard/supermicro/h8dmr/Kconfig b/src/mainboard/supermicro/h8dmr/Kconfig
index f7b0de4904ef96a2b24e9086a6e52a9cd41a4f58..28396abe8074bb364ffcb0759599e1618debee28 100644 (file)
--- a/src/mainboard/supermicro/h8dmr/Kconfig
+++ b/src/mainboard/supermicro/h8dmr/Kconfig
@@ -20,6 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select HAVE_HARD_RESET
        select LIFT_BSP_APIC_ID
        select BOARD_ROMSIZE_KB_1024
+       select RAMINIT_SYSINFO
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/supermicro/h8dmr/ap_romstage.c b/src/mainboard/supermicro/h8dmr/ap_romstage.c
index 8e8b73bd2a413b61e407167b4d2ae2816a551d76..845ec1fd9cbf9cab326cfa08b140f81a9baa4fc3 100644 (file)
--- a/src/mainboard/supermicro/h8dmr/ap_romstage.c
+++ b/src/mainboard/supermicro/h8dmr/ap_romstage.c
@@ -22,8 +22,6 @@
 #define ASSEMBLY 1
 #define __PRE_RAM__
 
-#define RAMINIT_SYSINFO 1
-
 #define SET_NB_CFG_54 1
 
 //used by raminit

diff --git a/src/mainboard/supermicro/h8dmr/romstage.c b/src/mainboard/supermicro/h8dmr/romstage.c
index ccfce6e119094219d44b04194e079479a0400832..e339b476791654b6ab7efe12356ba36423161986 100644 (file)
--- a/src/mainboard/supermicro/h8dmr/romstage.c
+++ b/src/mainboard/supermicro/h8dmr/romstage.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define RAMINIT_SYSINFO 1
-
 #define K8_ALLOCATE_IO_RANGE 1
 
 #define QRANK_DIMM_SUPPORT 1

diff --git a/src/mainboard/supermicro/h8dmr_fam10/Kconfig b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
index 2d427e690b4e63aa70d7c0406b2161cdec5a80fa..f57ba506fbb4d850bb73ba87298a7eec4b71ab55 100644 (file)
--- a/src/mainboard/supermicro/h8dmr_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
@@ -20,6 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select LIFT_BSP_APIC_ID
        select AMDMCT
        select BOARD_ROMSIZE_KB_1024
+       select RAMINIT_SYSINFO
        select TINY_BOOTBLOCK
        select ENABLE_APIC_EXT_ID
 

diff --git a/src/mainboard/supermicro/h8dmr_fam10/romstage.c b/src/mainboard/supermicro/h8dmr_fam10/romstage.c
index 846bc6e342d66e9e85efb7940f394e73fd3e76c4..f2ca34449e5a4f726c7933aa86cfe146bf997c09 100644 (file)
--- a/src/mainboard/supermicro/h8dmr_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/romstage.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define RAMINIT_SYSINFO 1
-
 #define FAM10_SCAN_PCI_BUS 0
 #define FAM10_ALLOCATE_IO_RANGE 1
 

diff --git a/src/mainboard/supermicro/h8qme_fam10/Kconfig b/src/mainboard/supermicro/h8qme_fam10/Kconfig
index c5fa6c664dcb62c6c1edac8d3b26020d373f70b2..3967c9e5aff964ed695e01ad4fa93ded02b33983 100644 (file)
--- a/src/mainboard/supermicro/h8qme_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8qme_fam10/Kconfig
@@ -19,6 +19,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select LIFT_BSP_APIC_ID
        select AMDMCT
        select BOARD_ROMSIZE_KB_1024
+       select RAMINIT_SYSINFO
        select TINY_BOOTBLOCK
        select ENABLE_APIC_EXT_ID
 

diff --git a/src/mainboard/supermicro/h8qme_fam10/romstage.c b/src/mainboard/supermicro/h8qme_fam10/romstage.c
index de7f7f2c7fefc49e722ad033750d7c982ffecdbe..7046d0db275c2479d21bc08fa1ae3e36caac0ed8 100644 (file)
--- a/src/mainboard/supermicro/h8qme_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8qme_fam10/romstage.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define RAMINIT_SYSINFO 1
-
 #define FAM10_SCAN_PCI_BUS 0
 #define FAM10_ALLOCATE_IO_RANGE 1
 

diff --git a/src/mainboard/technexion/tim5690/Kconfig b/src/mainboard/technexion/tim5690/Kconfig
index 663a0e044efafe843da0744d7f429916d649fe87..a590b16f2c4354dce978727c367bd5fd2a7a10e3 100644 (file)
--- a/src/mainboard/technexion/tim5690/Kconfig
+++ b/src/mainboard/technexion/tim5690/Kconfig
@@ -21,6 +21,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select GFXUMA
        select HAVE_MAINBOARD_RESOURCES
        select BOARD_ROMSIZE_KB_512
+       select RAMINIT_SYSINFO
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/technexion/tim5690/romstage.c b/src/mainboard/technexion/tim5690/romstage.c
index 3291d55c80aa681c874e432499d28378841896cc..6e7de039b4ddf32af89405add7c9c0708e7ba0d9 100644 (file)
--- a/src/mainboard/technexion/tim5690/romstage.c
+++ b/src/mainboard/technexion/tim5690/romstage.c
@@ -17,7 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define RAMINIT_SYSINFO 1
 #define SET_FIDVID 1
 #define QRANK_DIMM_SUPPORT 1
 #if CONFIG_LOGICAL_CPUS==1

diff --git a/src/mainboard/technexion/tim8690/Kconfig b/src/mainboard/technexion/tim8690/Kconfig
index 07cad0f5f5946327fd680ba3c8d5d11af18ac201..01aa6026f249db7c71aeb8c12eab4c5c54ead65c 100644 (file)
--- a/src/mainboard/technexion/tim8690/Kconfig
+++ b/src/mainboard/technexion/tim8690/Kconfig
@@ -20,6 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select WAIT_BEFORE_CPUS_INIT
        select HAVE_ACPI_TABLES
        select BOARD_ROMSIZE_KB_512
+       select RAMINIT_SYSINFO
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/technexion/tim8690/romstage.c b/src/mainboard/technexion/tim8690/romstage.c
index 3bf157409c1591ec04e06e60ea7a86eb1b91cafe..4832a99b3ab1569e97909dd2ba70aeaf63a239c7 100644 (file)
--- a/src/mainboard/technexion/tim8690/romstage.c
+++ b/src/mainboard/technexion/tim8690/romstage.c
@@ -17,7 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define RAMINIT_SYSINFO 1
 #define SET_FIDVID 1
 #define QRANK_DIMM_SUPPORT 1
 #if CONFIG_LOGICAL_CPUS==1

diff --git a/src/mainboard/tyan/s2912/Kconfig b/src/mainboard/tyan/s2912/Kconfig
index 4bed46fc8ebd17e6a61ef3e08415e66493be0522..6dfc6856869726cb10606f47bc7558ae1fef98d6 100644 (file)
--- a/src/mainboard/tyan/s2912/Kconfig
+++ b/src/mainboard/tyan/s2912/Kconfig
@@ -20,6 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select LIFT_BSP_APIC_ID
        select K8_REV_F_SUPPORT
        select BOARD_ROMSIZE_KB_512
+       select RAMINIT_SYSINFO
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/tyan/s2912/ap_romstage.c b/src/mainboard/tyan/s2912/ap_romstage.c
index e60992f88ad423b4842e6fbdb523b0202e89319b..cfffb3c011e34b232a38ff3b65d614044d266670 100644 (file)
--- a/src/mainboard/tyan/s2912/ap_romstage.c
+++ b/src/mainboard/tyan/s2912/ap_romstage.c
@@ -22,8 +22,6 @@
 #define ASSEMBLY 1
 #define __PRE_RAM__
 
-#define RAMINIT_SYSINFO 1
-
 #define SET_NB_CFG_54 1
 
 //used by raminit

diff --git a/src/mainboard/tyan/s2912/romstage.c b/src/mainboard/tyan/s2912/romstage.c
index 4f048e8a05761a385db4e5c853d5fac6f5cee912..8af6861e676b9dcb29f12bc7e94245348ad7709a 100644 (file)
--- a/src/mainboard/tyan/s2912/romstage.c
+++ b/src/mainboard/tyan/s2912/romstage.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define RAMINIT_SYSINFO 1
-
 #define K8_ALLOCATE_IO_RANGE 1
 
 #define QRANK_DIMM_SUPPORT 1

diff --git a/src/mainboard/tyan/s2912_fam10/Kconfig b/src/mainboard/tyan/s2912_fam10/Kconfig
index 55708f5a8d50964cdbc7fbcd0e28f53de03a229a..67751d6a5b364da571e2e8eb0356d6bf7c02496b 100644 (file)
--- a/src/mainboard/tyan/s2912_fam10/Kconfig
+++ b/src/mainboard/tyan/s2912_fam10/Kconfig
@@ -18,6 +18,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select HAVE_HARD_RESET
        select LIFT_BSP_APIC_ID
        select BOARD_ROMSIZE_KB_1024
+       select RAMINIT_SYSINFO
        select ENABLE_APIC_EXT_ID
        select AMDMCT
        select TINY_BOOTBLOCK

diff --git a/src/mainboard/tyan/s2912_fam10/romstage.c b/src/mainboard/tyan/s2912_fam10/romstage.c
index 7094533b3c1028bf9855470e20c648af06bc8f00..a07b5536de5f1aff882eebc34b11af6e925a973d 100644 (file)
--- a/src/mainboard/tyan/s2912_fam10/romstage.c
+++ b/src/mainboard/tyan/s2912_fam10/romstage.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#define RAMINIT_SYSINFO 1
-
 #define FAM10_SCAN_PCI_BUS 0
 #define FAM10_ALLOCATE_IO_RANGE 1
 

diff --git a/src/mainboard/via/epia-m700/Kconfig b/src/mainboard/via/epia-m700/Kconfig
index a633b2efaea21177327d33aa90765fc0179fafae..5d4434bbaf8b4e1716452f0e77b4c74941be8b33 100644 (file)
--- a/src/mainboard/via/epia-m700/Kconfig
+++ b/src/mainboard/via/epia-m700/Kconfig
@@ -9,6 +9,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select BOARD_HAS_FADT
        select HAVE_OPTION_TABLE
        select BOARD_ROMSIZE_KB_512
+       select RAMINIT_SYSINFO
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/via/epia-m700/romstage.c b/src/mainboard/via/epia-m700/romstage.c
index caee4574a859d38bd731c54e552cff246e8ac39a..5ebd388c3e6253fc06c33473a96cad78f1cd2fc5 100644 (file)
--- a/src/mainboard/via/epia-m700/romstage.c
+++ b/src/mainboard/via/epia-m700/romstage.c
@@ -22,7 +22,6 @@
  * and acpi_is_wakeup_early_via_VX800() is part of Rudolf's S3 patch.
  */
 
-#define RAMINIT_SYSINFO 1
 #define PAYLOAD_IS_SEABIOS 0
 
 #include <stdint.h>

diff --git a/src/northbridge/amd/amdfam10/Kconfig b/src/northbridge/amd/amdfam10/Kconfig
index 7e5b9dca4f08d5b922ea1fd09c806de46b7a148a..8fc2653d0224f8d9e5cbaf53e7b82722096c97e5 100644 (file)
--- a/src/northbridge/amd/amdfam10/Kconfig
+++ b/src/northbridge/amd/amdfam10/Kconfig
@@ -26,75 +26,62 @@ config NORTHBRIDGE_AMD_AMDFAM10
        select NORTHBRIDGE_AMD_AMDFAM10_ROOT_COMPLEX
        select MMCONF_SUPPORT
 
+if NORTHBRIDGE_AMD_AMDFAM10
 config AGP_APERTURE_SIZE
        hex
        default 0x4000000
-       depends on NORTHBRIDGE_AMD_AMDFAM10
 
 config HT3_SUPPORT
        bool
        default y
-       depends on NORTHBRIDGE_AMD_AMDFAM10
 
 config AMDMCT
        bool
        default y
-       depends on NORTHBRIDGE_AMD_AMDFAM10
 
 config MEM_TRAIN_SEQ
        int
        default 0
-       depends on NORTHBRIDGE_AMD_AMDFAM10
 
 config HW_MEM_HOLE_SIZEK
        hex
        default 0x100000
-       depends on NORTHBRIDGE_AMD_AMDFAM10
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
        bool
        default n
-       depends on NORTHBRIDGE_AMD_AMDFAM10
 
 config MMCONF_BASE_ADDRESS
        hex
        default 0xe0000000
-       depends on NORTHBRIDGE_AMD_AMDFAM10
 
 config MMCONF_BUS_NUMBER
        int
        default 256
-       depends on NORTHBRIDGE_AMD_AMDFAM10
 
 config BOOTBLOCK_NORTHBRIDGE_INIT
         string
         default "northbridge/amd/amdfam10/bootblock.c"
-       depends on NORTHBRIDGE_AMD_AMDFAM10
 
 config SB_HT_CHAIN_UNITID_OFFSET_ONLY
        bool
        default n
-       depends on NORTHBRIDGE_AMD_AMDFAM10
 
 config DIMM_FBDIMM
        bool
        default n
-       depends on NORTHBRIDGE_AMD_AMDFAM10
 
 config DIMM_DDR2
        bool
        default n
-       depends on NORTHBRIDGE_AMD_AMDFAM10
 
 config DIMM_DDR3
        bool
        default n
-       depends on NORTHBRIDGE_AMD_AMDFAM10
 
 config DIMM_REGISTERED
        bool
        default n
-       depends on NORTHBRIDGE_AMD_AMDFAM10
 
 if DIMM_FBDIMM
        config DIMM_SUPPORT
@@ -123,5 +110,6 @@ if DIMM_DDR3
                default 0x0005
        endif
 endif
+endif
 
 source src/northbridge/amd/amdfam10/root_complex/Kconfig

diff --git a/src/northbridge/amd/amdk8/Kconfig b/src/northbridge/amd/amdk8/Kconfig
index 77a08f2f46011d062ec58815b71dbc0d176455bb..e3a71c1a5ed0e9f2bdda04ca2f52aa6d01ec6e29 100644 (file)
--- a/src/northbridge/amd/amdk8/Kconfig
+++ b/src/northbridge/amd/amdk8/Kconfig
@@ -24,45 +24,40 @@ config NORTHBRIDGE_AMD_AMDK8
        select HAVE_DEBUG_CAR
        select HYPERTRANSPORT_PLUGIN_SUPPORT
 
+if NORTHBRIDGE_AMD_AMDK8
 config AGP_APERTURE_SIZE
        hex
        default 0x4000000
-       depends on NORTHBRIDGE_AMD_AMDK8
 
 config K8_HT_FREQ_1G_SUPPORT
        bool
        default n
-       depends on NORTHBRIDGE_AMD_AMDK8
 
 config MEM_TRAIN_SEQ
        int
        default 0
-       depends on NORTHBRIDGE_AMD_AMDK8
 
 config HW_MEM_HOLE_SIZEK
        hex
        default 0x100000
-       depends on NORTHBRIDGE_AMD_AMDK8
 
 config HW_MEM_HOLE_SIZE_AUTO_INC
        bool
        default n
-       depends on NORTHBRIDGE_AMD_AMDK8
 
 config SB_HT_CHAIN_UNITID_OFFSET_ONLY
        bool
        default n
-       depends on NORTHBRIDGE_AMD_AMDK8
+
+if K8_REV_F_SUPPORT
 
 config DIMM_DDR2
        bool
        default n
-       depends on NORTHBRIDGE_AMD_AMDFAM10
 
 config DIMM_REGISTERED
        bool
        default n
-       depends on NORTHBRIDGE_AMD_AMDFAM10
 
 if DIMM_DDR2
        if DIMM_REGISTERED
@@ -76,6 +71,10 @@ if DIMM_DDR2
                hex
                default 0x0004
        endif
-endif
+endif #DIMM_DDR2
+
+endif #K8_REV_F_SUPPORT
+
+endif #NORTHBRIDGE_AMD_K8
 
 source src/northbridge/amd/amdk8/root_complex/Kconfig

diff --git a/src/northbridge/amd/amdk8/coherent_ht.c b/src/northbridge/amd/amdk8/coherent_ht.c
index f1f5bbc35cbd08063deba5bfff015ca0737277c4..30e047134792828fe79368cb8d207a01c12d2602 100644 (file)
--- a/src/northbridge/amd/amdk8/coherent_ht.c
+++ b/src/northbridge/amd/amdk8/coherent_ht.c
@@ -1813,7 +1813,7 @@ static int optimize_link_coherent_ht(void)
        return needs_reset;
 }
 
-#if RAMINIT_SYSINFO == 1
+#if CONFIG_RAMINIT_SYSINFO
 static void setup_coherent_ht_domain(void)
 #else
 static int setup_coherent_ht_domain(void)
@@ -1835,7 +1835,7 @@ static int setup_coherent_ht_domain(void)
        }
        coherent_ht_finalize(nodes);
 
-#if RAMINIT_SYSINFO == 0
+#if !CONFIG_RAMINIT_SYSINFO
        return optimize_link_coherent_ht();
 #endif
 }

diff --git a/src/northbridge/amd/amdk8/incoherent_ht.c b/src/northbridge/amd/amdk8/incoherent_ht.c
index 91ff6b00ee237305e66635fcdc8353bd6ea98af3..46e696adbf9ff20185f0cc63959cd9fa459b1266 100644 (file)
--- a/src/northbridge/amd/amdk8/incoherent_ht.c
+++ b/src/northbridge/amd/amdk8/incoherent_ht.c
@@ -11,10 +11,6 @@
        #define CONFIG_K8_HT_FREQ_1G_SUPPORT 0
 #endif
 
-#ifndef RAMINIT_SYSINFO
-       #define RAMINIT_SYSINFO 0
-#endif
-
 #ifndef K8_ALLOCATE_IO_RANGE
        #define K8_ALLOCATE_IO_RANGE 0
 #endif
@@ -297,7 +293,7 @@ static int ht_optimize_link(
        return needs_reset;
 }
 
-#if RAMINIT_SYSINFO == 1
+#if CONFIG_RAMINIT_SYSINFO
 static void ht_setup_chainx(device_t udev, uint8_t upos, uint8_t bus, unsigned offset_unitid, struct sys_info *sysinfo)
 #else
 static int ht_setup_chainx(device_t udev, uint8_t upos, uint8_t bus, unsigned offset_unitid)
@@ -308,7 +304,7 @@ static int ht_setup_chainx(device_t udev, uint8_t upos, uint8_t bus, unsigned of
        uint8_t next_unitid, last_unitid;
        unsigned uoffs;
 
-#if RAMINIT_SYSINFO == 0
+#if !CONFIG_RAMINIT_SYSINFO
        int reset_needed = 0;
 #endif
 
@@ -415,7 +411,7 @@ static int ht_setup_chainx(device_t udev, uint8_t upos, uint8_t bus, unsigned of
                flags = pci_read_config16(dev, pos + PCI_CAP_FLAGS);
                offs = ((flags>>10) & 1) ? PCI_HT_SLAVE1_OFFS : PCI_HT_SLAVE0_OFFS;
 
-               #if RAMINIT_SYSINFO == 1
+               #if CONFIG_RAMINIT_SYSINFO
                /* store the link pair here and we will Setup the Hypertransport link later, after we get final FID/VID */
                {
                        struct link_pair_st *link_pair = &sysinfo->link_pair[sysinfo->link_pair_num];
@@ -451,7 +447,7 @@ end_of_chain: ;
                flags |= CONFIG_HT_CHAIN_END_UNITID_BASE & 0x1f;
                pci_write_config16(PCI_DEV(bus, real_last_unitid, 0), real_last_pos + PCI_CAP_FLAGS, flags);
 
-               #if RAMINIT_SYSINFO == 1
+               #if CONFIG_RAMINIT_SYSINFO
                // Here need to change the dev in the array
                int i;
                for(i=0;i<sysinfo->link_pair_num;i++)
@@ -470,14 +466,14 @@ end_of_chain: ;
        }
 #endif
 
-#if RAMINIT_SYSINFO == 0
+#if !CONFIG_RAMINIT_SYSINFO
        return reset_needed;
 #endif
 
 }
 
 #if 0
-#if RAMINIT_SYSINFO == 1
+#if CONFIG_RAMINIT_SYSINFO
 static void ht_setup_chain(device_t udev, unsigned upos, struct sys_info *sysinfo)
 #else
 static int ht_setup_chain(device_t udev, unsigned upos)
@@ -501,7 +497,7 @@ static int ht_setup_chain(device_t udev, unsigned upos)
        offset_unitid = 1;
 #endif
 
-#if RAMINIT_SYSINFO == 1
+#if CONFIG_RAMINIT_SYSINFO
        ht_setup_chainx(udev, upos, 0, offset_unitid, sysinfo);
 #else
        return ht_setup_chainx(udev, upos, 0, offset_unitid);
@@ -636,7 +632,7 @@ static int set_ht_link_buffer_counts_chain(uint8_t ht_c_num, unsigned vendorid,
 }
 #endif
 
-#if RAMINIT_SYSINFO == 1
+#if CONFIG_RAMINIT_SYSINFO
 static void ht_setup_chains(uint8_t ht_c_num, struct sys_info *sysinfo)
 #else
 static int ht_setup_chains(uint8_t ht_c_num)
@@ -651,7 +647,7 @@ static int ht_setup_chains(uint8_t ht_c_num)
        device_t udev;
        uint8_t i;
 
-#if RAMINIT_SYSINFO == 0
+#if !CONFIG_RAMINIT_SYSINFO
        int reset_needed = 0;
 #else
        sysinfo->link_pair_num = 0;
@@ -692,7 +688,7 @@ static int ht_setup_chains(uint8_t ht_c_num)
                upos = ((reg & 0xf00)>>8) * 0x20 + 0x80;
                udev =  PCI_DEV(0, devpos, 0);
 
-#if RAMINIT_SYSINFO == 1
+#if CONFIG_RAMINIT_SYSINFO
                ht_setup_chainx(udev,upos,busn, offset_unitid, sysinfo); // all not
 #else
                reset_needed |= ht_setup_chainx(udev,upos,busn, offset_unitid); //all not
@@ -700,7 +696,7 @@ static int ht_setup_chains(uint8_t ht_c_num)
 
        }
 
-#if RAMINIT_SYSINFO == 0
+#if !CONFIG_RAMINIT_SYSINFO
        reset_needed |= optimize_link_read_pointers_chain(ht_c_num);
 
        return reset_needed;
@@ -712,7 +708,7 @@ static int ht_setup_chains(uint8_t ht_c_num)
 static inline unsigned get_nodes(void);
 #endif
 
-#if RAMINIT_SYSINFO == 1
+#if CONFIG_RAMINIT_SYSINFO
 static void ht_setup_chains_x(struct sys_info *sysinfo)
 #else
 static int ht_setup_chains_x(void)
@@ -734,7 +730,7 @@ static int ht_setup_chains_x(void)
        reg = pci_read_config32(PCI_DEV(0, 0x18, 0), 0x64);
        /* update PCI_DEV(0, 0x18, 1) 0xe0 to 0x05000m03, and next_busn=0x3f+1 */
        print_linkn_in("SBLink=", ((reg>>8) & 3) );
-#if RAMINIT_SYSINFO == 1
+#if CONFIG_RAMINIT_SYSINFO
        sysinfo->sblk = (reg>>8) & 3;
        sysinfo->sbbusn = 0;
        sysinfo->nodes = nodes;
@@ -840,7 +836,7 @@ static int ht_setup_chains_x(void)
                }
        }
 
-#if RAMINIT_SYSINFO == 1
+#if CONFIG_RAMINIT_SYSINFO
        sysinfo->ht_c_num = i;
        ht_setup_chains(i, sysinfo);
        sysinfo->sbdn = get_sbdn(sysinfo->sbbusn);
@@ -850,7 +846,7 @@ static int ht_setup_chains_x(void)
 
 }
 
-#if RAMINIT_SYSINFO == 1
+#if CONFIG_RAMINIT_SYSINFO
 static int optimize_link_incoherent_ht(struct sys_info *sysinfo)
 {
        // We need to use recorded link pair info to optimize the link

diff --git a/src/northbridge/amd/amdk8/raminit.c b/src/northbridge/amd/amdk8/raminit.c
index a48a835185d25335277b2f6fc561bbb8a7705724..b6d9fef06e1a2403fb1c9751e8711d30a8675ee9 100644 (file)
--- a/src/northbridge/amd/amdk8/raminit.c
+++ b/src/northbridge/amd/amdk8/raminit.c
@@ -45,7 +45,7 @@ static int controller_present(const struct mem_controller *ctrl)
        return pci_read_config32(ctrl->f0, 0) == 0x11001022;
 }
 
-#if RAMINIT_SYSINFO==1
+#if CONFIG_RAMINIT_SYSINFO
 static void sdram_set_registers(const struct mem_controller *ctrl, struct sys_info *sysinfo)
 #else
 static void sdram_set_registers(const struct mem_controller *ctrl)
@@ -2062,7 +2062,7 @@ static long spd_set_dram_timing(const struct mem_controller *ctrl, const struct
        return dimm_mask;
 }
 
-#if RAMINIT_SYSINFO==1
+#if CONFIG_RAMINIT_SYSINFO
 static void sdram_set_spd_registers(const struct mem_controller *ctrl, struct sys_info *sysinfo)
 #else
 static void sdram_set_spd_registers(const struct mem_controller *ctrl)
@@ -2223,7 +2223,7 @@ static void set_hw_mem_hole(int controllers, const struct mem_controller *ctrl)
 #endif
 
 #define TIMEOUT_LOOPS 300000
-#if RAMINIT_SYSINFO == 1
+#if CONFIG_RAMINIT_SYSINFO
 static void sdram_enable(int controllers, const struct mem_controller *ctrl, struct sys_info *sysinfo)
 #else
 static void sdram_enable(int controllers, const struct mem_controller *ctrl)

diff --git a/src/northbridge/amd/amdk8/raminit.h b/src/northbridge/amd/amdk8/raminit.h
index 7a548daf3b710ba1dde0357018227ca6cfb4ca43..9da8417fd0e99acd4609a2206cd8eefbfbc2127d 100644 (file)
--- a/src/northbridge/amd/amdk8/raminit.h
+++ b/src/northbridge/amd/amdk8/raminit.h
@@ -15,7 +15,7 @@ struct sys_info;
 void exit_from_self(int controllers, const struct mem_controller *ctrl, struct sys_info *sysinfo);
 void setup_resource_map(const unsigned int *register_values, int max);
 
-#if defined(__PRE_RAM__) && defined(RAMINIT_SYSINFO) && RAMINIT_SYSINFO == 1
+#if defined(__PRE_RAM__) && CONFIG_RAMINIT_SYSINFO
 void sdram_initialize(int controllers, const struct mem_controller *ctrl, void *sysinfo);
 #else
 void sdram_initialize(int controllers, const struct mem_controller *ctrl);

diff --git a/src/northbridge/via/vx800/examples/romstage.c b/src/northbridge/via/vx800/examples/romstage.c
index 48f7173e8d1c1a80548848c538be7ec4e425b168..5f9dc52e675b77a28062e0884097bcb28e45f717 100644 (file)
--- a/src/northbridge/via/vx800/examples/romstage.c
+++ b/src/northbridge/via/vx800/examples/romstage.c
@@ -20,7 +20,6 @@
 
 #define ASSEMBLY 1
 #define __PRE_RAM__
-#define RAMINIT_SYSINFO 1
 
 #include <stdint.h>
 #include <device/pci_def.h>