Author: wt
Date: Thu Sep 30 05:35:00 2010
New Revision: 5883
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5883
Log:
Move CAR settings to board config for socket 940 boards.
For the a number of the socket 940 based machines, I collapsed their CAR
configurations into the socket config.
However, I have kept a number of overrides in place for the following
machines:
* broadcom/blast
* ibm/e32{5,6}
* newisys/khepri
* sunw/ultra40
* tyan/s488{0,2}
These machines used different setting than the defaults for socket 940
systems.
Signed-off-by: Warren Turkal <[email protected]>
Acked-by: Peter Stuge <[email protected]>
Modified:
trunk/src/cpu/amd/model_fxx/Kconfig
trunk/src/cpu/amd/socket_940/Kconfig
trunk/src/mainboard/arima/hdama/Kconfig
trunk/src/mainboard/broadcom/blast/Kconfig
trunk/src/mainboard/ibm/e325/Kconfig
trunk/src/mainboard/ibm/e326/Kconfig
trunk/src/mainboard/iwill/dk8_htx/Kconfig
trunk/src/mainboard/iwill/dk8s2/Kconfig
trunk/src/mainboard/iwill/dk8x/Kconfig
trunk/src/mainboard/newisys/khepri/Kconfig
trunk/src/mainboard/sunw/ultra40/Kconfig
trunk/src/mainboard/tyan/s4880/Kconfig
trunk/src/mainboard/tyan/s4882/Kconfig
Modified: trunk/src/cpu/amd/model_fxx/Kconfig
==============================================================================
--- trunk/src/cpu/amd/model_fxx/Kconfig Thu Sep 30 05:13:21 2010 (r5882)
+++ trunk/src/cpu/amd/model_fxx/Kconfig Thu Sep 30 05:35:00 2010 (r5883)
@@ -1,31 +1,9 @@
config CPU_AMD_MODEL_FXX
bool
- select CACHE_AS_RAM
select MMX
select SSE
select SSE2
-config CPU_ADDR_BITS
- int
- default 40
- depends on CPU_AMD_MODEL_FXX
-
-config DCACHE_RAM_BASE
- hex
- default 0xc8000
- depends on CPU_AMD_MODEL_FXX
-
-config DCACHE_RAM_SIZE
- hex
- default 0x08000
- depends on CPU_AMD_MODEL_FXX
-
-config DCACHE_RAM_GLOBAL_VAR_SIZE
- hex
- default 0x01000
- depends on CPU_AMD_MODEL_FXX
-
-
config UDELAY_IO
bool
default n
Modified: trunk/src/cpu/amd/socket_940/Kconfig
==============================================================================
--- trunk/src/cpu/amd/socket_940/Kconfig Thu Sep 30 05:13:21 2010
(r5882)
+++ trunk/src/cpu/amd/socket_940/Kconfig Thu Sep 30 05:35:00 2010
(r5883)
@@ -1,14 +1,36 @@
config CPU_AMD_SOCKET_940
bool
+
+if CPU_AMD_SOCKET_940
+
+config SOCKET_SPECIFIC_OPTIONS
+ def_bool y
select K8_HT_FREQ_1G_SUPPORT
select CPU_AMD_MODEL_FXX
+ select CACHE_AS_RAM
config CPU_SOCKET_TYPE
hex
default 0x0
- depends on CPU_AMD_SOCKET_940
config DIMM_SUPPORT
hex
default 0x108
- depends on CPU_AMD_SOCKET_940
+
+config CPU_ADDR_BITS
+ int
+ default 40
+
+config DCACHE_RAM_BASE
+ hex
+ default 0xc8000
+
+config DCACHE_RAM_SIZE
+ hex
+ default 0x08000
+
+config DCACHE_RAM_GLOBAL_VAR_SIZE
+ hex
+ default 0x01000
+
+endif # CPU_AMD_SOCKET_940
Modified: trunk/src/mainboard/arima/hdama/Kconfig
==============================================================================
--- trunk/src/mainboard/arima/hdama/Kconfig Thu Sep 30 05:13:21 2010
(r5882)
+++ trunk/src/mainboard/arima/hdama/Kconfig Thu Sep 30 05:35:00 2010
(r5883)
@@ -12,7 +12,6 @@
select HAVE_PIRQ_TABLE
select HAVE_OPTION_TABLE
select HAVE_MP_TABLE
- select CACHE_AS_RAM
select HAVE_HARD_RESET
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
select BOARD_ROMSIZE_KB_512
Modified: trunk/src/mainboard/broadcom/blast/Kconfig
==============================================================================
--- trunk/src/mainboard/broadcom/blast/Kconfig Thu Sep 30 05:13:21 2010
(r5882)
+++ trunk/src/mainboard/broadcom/blast/Kconfig Thu Sep 30 05:35:00 2010
(r5883)
@@ -13,7 +13,6 @@
select HAVE_OPTION_TABLE
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
- select CACHE_AS_RAM
select HAVE_HARD_RESET
select BOARD_ROMSIZE_KB_512
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
Modified: trunk/src/mainboard/ibm/e325/Kconfig
==============================================================================
--- trunk/src/mainboard/ibm/e325/Kconfig Thu Sep 30 05:13:21 2010
(r5882)
+++ trunk/src/mainboard/ibm/e325/Kconfig Thu Sep 30 05:35:00 2010
(r5883)
@@ -12,7 +12,6 @@
select HAVE_OPTION_TABLE
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
- select CACHE_AS_RAM
select HAVE_HARD_RESET
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
select WAIT_BEFORE_CPUS_INIT
Modified: trunk/src/mainboard/ibm/e326/Kconfig
==============================================================================
--- trunk/src/mainboard/ibm/e326/Kconfig Thu Sep 30 05:13:21 2010
(r5882)
+++ trunk/src/mainboard/ibm/e326/Kconfig Thu Sep 30 05:35:00 2010
(r5883)
@@ -12,7 +12,6 @@
select HAVE_OPTION_TABLE
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
- select CACHE_AS_RAM
select HAVE_HARD_RESET
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
select WAIT_BEFORE_CPUS_INIT
Modified: trunk/src/mainboard/iwill/dk8_htx/Kconfig
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/Kconfig Thu Sep 30 05:13:21 2010
(r5882)
+++ trunk/src/mainboard/iwill/dk8_htx/Kconfig Thu Sep 30 05:35:00 2010
(r5883)
@@ -14,7 +14,6 @@
select HAVE_OPTION_TABLE
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
- select CACHE_AS_RAM
select HAVE_HARD_RESET
select LIFT_BSP_APIC_ID
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
@@ -26,18 +25,6 @@
string
default iwill/dk8_htx
-config DCACHE_RAM_BASE
- hex
- default 0xc8000
-
-config DCACHE_RAM_SIZE
- hex
- default 0x08000
-
-config DCACHE_RAM_GLOBAL_VAR_SIZE
- hex
- default 0x01000
-
config APIC_ID_OFFSET
hex
default 0x10
Modified: trunk/src/mainboard/iwill/dk8s2/Kconfig
==============================================================================
--- trunk/src/mainboard/iwill/dk8s2/Kconfig Thu Sep 30 05:13:21 2010
(r5882)
+++ trunk/src/mainboard/iwill/dk8s2/Kconfig Thu Sep 30 05:35:00 2010
(r5883)
@@ -12,7 +12,6 @@
select HAVE_PIRQ_TABLE
select HAVE_OPTION_TABLE
select HAVE_MP_TABLE
- select CACHE_AS_RAM
select HAVE_HARD_RESET
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
select WAIT_BEFORE_CPUS_INIT
@@ -23,18 +22,6 @@
string
default iwill/dk8s2
-config DCACHE_RAM_BASE
- hex
- default 0xc8000
-
-config DCACHE_RAM_SIZE
- hex
- default 0x08000
-
-config DCACHE_RAM_GLOBAL_VAR_SIZE
- hex
- default 0x01000
-
config APIC_ID_OFFSET
hex
default 0x0
Modified: trunk/src/mainboard/iwill/dk8x/Kconfig
==============================================================================
--- trunk/src/mainboard/iwill/dk8x/Kconfig Thu Sep 30 05:13:21 2010
(r5882)
+++ trunk/src/mainboard/iwill/dk8x/Kconfig Thu Sep 30 05:35:00 2010
(r5883)
@@ -12,7 +12,6 @@
select HAVE_OPTION_TABLE
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
- select CACHE_AS_RAM
select HAVE_HARD_RESET
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
select WAIT_BEFORE_CPUS_INIT
@@ -22,18 +21,6 @@
string
default iwill/dk8x
-config DCACHE_RAM_BASE
- hex
- default 0xc8000
-
-config DCACHE_RAM_SIZE
- hex
- default 0x08000
-
-config DCACHE_RAM_GLOBAL_VAR_SIZE
- hex
- default 0x01000
-
config APIC_ID_OFFSET
hex
default 0x0
Modified: trunk/src/mainboard/newisys/khepri/Kconfig
==============================================================================
--- trunk/src/mainboard/newisys/khepri/Kconfig Thu Sep 30 05:13:21 2010
(r5882)
+++ trunk/src/mainboard/newisys/khepri/Kconfig Thu Sep 30 05:35:00 2010
(r5883)
@@ -12,7 +12,6 @@
select HAVE_OPTION_TABLE
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
- select CACHE_AS_RAM
select HAVE_HARD_RESET
select BOARD_ROMSIZE_KB_512
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
Modified: trunk/src/mainboard/sunw/ultra40/Kconfig
==============================================================================
--- trunk/src/mainboard/sunw/ultra40/Kconfig Thu Sep 30 05:13:21 2010
(r5882)
+++ trunk/src/mainboard/sunw/ultra40/Kconfig Thu Sep 30 05:35:00 2010
(r5883)
@@ -12,7 +12,6 @@
select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
- select CACHE_AS_RAM
select HAVE_HARD_RESET
select BOARD_ROMSIZE_KB_1024
Modified: trunk/src/mainboard/tyan/s4880/Kconfig
==============================================================================
--- trunk/src/mainboard/tyan/s4880/Kconfig Thu Sep 30 05:13:21 2010
(r5882)
+++ trunk/src/mainboard/tyan/s4880/Kconfig Thu Sep 30 05:35:00 2010
(r5883)
@@ -12,7 +12,6 @@
select HAVE_OPTION_TABLE
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
- select CACHE_AS_RAM
select HAVE_HARD_RESET
select BOARD_ROMSIZE_KB_512
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
Modified: trunk/src/mainboard/tyan/s4882/Kconfig
==============================================================================
--- trunk/src/mainboard/tyan/s4882/Kconfig Thu Sep 30 05:13:21 2010
(r5882)
+++ trunk/src/mainboard/tyan/s4882/Kconfig Thu Sep 30 05:35:00 2010
(r5883)
@@ -12,7 +12,6 @@
select HAVE_OPTION_TABLE
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
- select CACHE_AS_RAM
select HAVE_HARD_RESET
select BOARD_ROMSIZE_KB_512
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
--
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot
