[commit] r6299 - in trunk/src: cpu/intel/socket_441 cpu/intel/socket_mFCPGA478 mainboard/getac/p470 mainboard/ibase/mb899 mainboard/iwave/iWRainbowG6 mainboard/kontron/986lcd-m mainboard/roda/rk886ex

[repository service]

Author: stepan
Date: Thu Jan 27 02:11:20 2011
New Revision: 6299
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6299

Log:
oops. this is weird. CAR addresses should be specified in the socket and not in
the board. I thought we did this ages ago.

Also push CAR BASE further down so it won't conflict with a 32mbit flash part.

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified:
   trunk/src/cpu/intel/socket_441/Kconfig
   trunk/src/cpu/intel/socket_mFCPGA478/Kconfig
   trunk/src/mainboard/getac/p470/Kconfig
   trunk/src/mainboard/ibase/mb899/Kconfig
   trunk/src/mainboard/iwave/iWRainbowG6/Kconfig
   trunk/src/mainboard/kontron/986lcd-m/Kconfig
   trunk/src/mainboard/roda/rk886ex/Kconfig

Modified: trunk/src/cpu/intel/socket_441/Kconfig
==============================================================================
--- trunk/src/cpu/intel/socket_441/Kconfig	Tue Jan 25 20:27:23 2011	(r6298)
+++ trunk/src/cpu/intel/socket_441/Kconfig	Thu Jan 27 02:11:20 2011	(r6299)
@@ -12,7 +12,7 @@

config DCACHE_RAM_BASE
    hex
-	default 0xffdf8000
+	default 0xffaf8000

config DCACHE_RAM_SIZE
    hex

Modified: trunk/src/cpu/intel/socket_mFCPGA478/Kconfig
==============================================================================
--- trunk/src/cpu/intel/socket_mFCPGA478/Kconfig	Tue Jan 25 20:27:23 2011	(r6298)
+++ trunk/src/cpu/intel/socket_mFCPGA478/Kconfig	Thu Jan 27 02:11:20 2011	(r6299)
@@ -1,3 +1,22 @@
 config CPU_INTEL_SOCKET_MFCPGA478
    bool
+
+if CPU_INTEL_SOCKET_MFCPGA478
+
+config SOCKET_SPECIFIC_OPTIONS # dummy
+	def_bool y
+	select CPU_INTEL_CORE
+	select CPU_INTEL_CORE2
+	select MMX
+	select SSE
    select CACHE_AS_RAM
+
+config DCACHE_RAM_BASE
+	hex
+	default 0xffaf8000
+
+config DCACHE_RAM_SIZE
+	hex
+	default 0x8000
+
+endif

Modified: trunk/src/mainboard/getac/p470/Kconfig
==============================================================================
--- trunk/src/mainboard/getac/p470/Kconfig	Tue Jan 25 20:27:23 2011	(r6298)
+++ trunk/src/mainboard/getac/p470/Kconfig	Thu Jan 27 02:11:20 2011	(r6299)
@@ -21,7 +21,6 @@
 config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
    select ARCH_X86
-	select CPU_INTEL_CORE
    select CPU_INTEL_SOCKET_MFCPGA478
    select NORTHBRIDGE_INTEL_I945GM
    select SOUTHBRIDGE_INTEL_I82801GX
@@ -48,14 +47,6 @@
    string
    default getac/p470

-config DCACHE_RAM_BASE
-	hex
-	default 0xffdf8000
-
-config DCACHE_RAM_SIZE
-	hex
-	default 0x8000
-
 config MAINBOARD_PART_NUMBER
    string
    default "P470"

Modified: trunk/src/mainboard/ibase/mb899/Kconfig
==============================================================================
--- trunk/src/mainboard/ibase/mb899/Kconfig	Tue Jan 25 20:27:23 2011	(r6298)
+++ trunk/src/mainboard/ibase/mb899/Kconfig	Thu Jan 27 02:11:20 2011	(r6299)
@@ -3,7 +3,6 @@
 config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
    select ARCH_X86
-	select CPU_INTEL_CORE
    select CPU_INTEL_SOCKET_MFCPGA478
    select NORTHBRIDGE_INTEL_I945GM
    select SOUTHBRIDGE_INTEL_I82801GX

Modified: trunk/src/mainboard/iwave/iWRainbowG6/Kconfig
==============================================================================
--- trunk/src/mainboard/iwave/iWRainbowG6/Kconfig	Tue Jan 25 20:27:23 2011	(r6298)
+++ trunk/src/mainboard/iwave/iWRainbowG6/Kconfig	Thu Jan 27 02:11:20 2011	(r6299)
@@ -4,7 +4,6 @@
 config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
    select ARCH_X86
-	select CPU_INTEL_CORE # FIXME
    select CPU_INTEL_SOCKET_441
    select NORTHBRIDGE_INTEL_SCH
    select SOUTHBRIDGE_INTEL_SCH

Modified: trunk/src/mainboard/kontron/986lcd-m/Kconfig
==============================================================================
--- trunk/src/mainboard/kontron/986lcd-m/Kconfig	Tue Jan 25 20:27:23 2011	(r6298)
+++ trunk/src/mainboard/kontron/986lcd-m/Kconfig	Thu Jan 27 02:11:20 2011	(r6299)
@@ -3,7 +3,6 @@
 config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
    select ARCH_X86
-	select CPU_INTEL_CORE
    select CPU_INTEL_SOCKET_MFCPGA478
    select NORTHBRIDGE_INTEL_I945GM
    select SOUTHBRIDGE_INTEL_I82801GX
@@ -26,14 +25,6 @@
    string
    default kontron/986lcd-m

-config DCACHE_RAM_BASE
-	hex
-	default 0xffdf8000
-
-config DCACHE_RAM_SIZE
-	hex
-	default 0x8000
-
 config MAINBOARD_PART_NUMBER
    string
    default "986LCD-M"

Modified: trunk/src/mainboard/roda/rk886ex/Kconfig
==============================================================================
--- trunk/src/mainboard/roda/rk886ex/Kconfig	Tue Jan 25 20:27:23 2011	(r6298)
+++ trunk/src/mainboard/roda/rk886ex/Kconfig	Thu Jan 27 02:11:20 2011	(r6299)
@@ -25,14 +25,6 @@
    string
    default roda/rk886ex

-config DCACHE_RAM_BASE
-	hex
-	default 0xffdf8000
-
-config DCACHE_RAM_SIZE
-	hex
-	default 0x8000
-
 config MAINBOARD_PART_NUMBER
    string
    default "RK886EX"