diff options
author | Joseph Smith <joe@settoplinux.org> | 2010-04-09 11:10:25 +0000 |
---|---|---|
committer | Stefan Reinauer <stepan@openbios.org> | 2010-04-09 11:10:25 +0000 |
commit | 7488e049df9899dd7062b2ffe393b3e9a6f50dc5 (patch) | |
tree | a226c1f16a9220abb947ba46d26570e065494aa5 /src/mainboard/rca | |
parent | 853263b963b4cacb4f7fa3a7f2c68dcbd094f1d7 (diff) | |
download | coreboot-staging-7488e049df9899dd7062b2ffe393b3e9a6f50dc5.zip coreboot-staging-7488e049df9899dd7062b2ffe393b3e9a6f50dc5.tar.gz |
1. This patch adds CAR for Intel P6 series processors.
2. Add support for Micro-FCBGA 479 Celeron and PIII's
3. Add support for model_6bx and microcode updates
4. Add support for CAR and Tinybootblock on RCA RM4100 and Thomson
IP1000
Build and boot tested.
Signed-off-by: Joseph Smith <joe@settoplinux.org>
The change to CAR reveiled a few more warnings in the ICH4 and i830 code,
I fixed them on the fly.
Checking this in because my last two commits broke Joseph's CAR patch. This
version fixes the issues.
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5388 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/rca')
-rw-r--r-- | src/mainboard/rca/rm4100/Kconfig | 22 | ||||
-rw-r--r-- | src/mainboard/rca/rm4100/Makefile.inc | 2 | ||||
-rw-r--r-- | src/mainboard/rca/rm4100/devicetree.cb | 2 | ||||
-rw-r--r-- | src/mainboard/rca/rm4100/romstage.c | 6 |
4 files changed, 21 insertions, 11 deletions
diff --git a/src/mainboard/rca/rm4100/Kconfig b/src/mainboard/rca/rm4100/Kconfig index fb3ab62..7464f88 100644 --- a/src/mainboard/rca/rm4100/Kconfig +++ b/src/mainboard/rca/rm4100/Kconfig @@ -1,18 +1,20 @@ config BOARD_RCA_RM4100 bool "RM4100" select ARCH_X86 - select CPU_INTEL_SOCKET_PGA370 + select CPU_INTEL_SOCKET_MFCBGA479 select NORTHBRIDGE_INTEL_I82830 select SOUTHBRIDGE_INTEL_I82801DX select SUPERIO_SMSC_SMSCSUPERIO - select ROMCC select HAVE_PIRQ_TABLE select UDELAY_TSC - select BOARD_ROMSIZE_KB_1024 - select HAVE_MAINBOARD_RESOURCES + select BOARD_ROMSIZE_KB_1024 select HAVE_HARD_RESET + select HAVE_MAINBOARD_RESOURCES + select USE_PRINTK_IN_CAR select HAVE_SMI_HANDLER - select GFXUMA + select GFXUMA + select USE_DCACHE_RAM + select TINY_BOOTBLOCK config MAINBOARD_DIR string @@ -29,6 +31,16 @@ config HAVE_OPTION_TABLE default n depends on BOARD_RCA_RM4100 +config DCACHE_RAM_BASE + hex + default 0xffdf8000 + depends on BOARD_RCA_RM4100 + +config DCACHE_RAM_SIZE + hex + default 0x8000 + depends on BOARD_RCA_RM4100 + config IRQ_SLOT_COUNT int default 7 diff --git a/src/mainboard/rca/rm4100/Makefile.inc b/src/mainboard/rca/rm4100/Makefile.inc index 38a5a61..6c034c0 100644 --- a/src/mainboard/rca/rm4100/Makefile.inc +++ b/src/mainboard/rca/rm4100/Makefile.inc @@ -1,4 +1,2 @@ -ROMCCFLAGS=-mcpu=p3 -O - smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o diff --git a/src/mainboard/rca/rm4100/devicetree.cb b/src/mainboard/rca/rm4100/devicetree.cb index 4dff3be..bf2cee0 100644 --- a/src/mainboard/rca/rm4100/devicetree.cb +++ b/src/mainboard/rca/rm4100/devicetree.cb @@ -1,6 +1,6 @@ chip northbridge/intel/i82830 # Northbridge device apic_cluster 0 on # APIC cluster - chip cpu/intel/socket_PGA370 # Mobile Celeron Micro-FCBGA Socket 479 + chip cpu/intel/socket_mFCBGA479 # Mobile Celeron Micro-FCBGA Socket 479 device apic 0 on end # APIC end end diff --git a/src/mainboard/rca/rm4100/romstage.c b/src/mainboard/rca/rm4100/romstage.c index b1bc4b4..c93cec6 100644 --- a/src/mainboard/rca/rm4100/romstage.c +++ b/src/mainboard/rca/rm4100/romstage.c @@ -34,7 +34,6 @@ #include "northbridge/intel/i82830/memory_initialized.c" #include "southbridge/intel/i82801dx/i82801dx.h" #include "southbridge/intel/i82801dx/i82801dx_reset.c" -#include "cpu/x86/mtrr/earlymtrr.c" #include "cpu/x86/bist.h" #include "spd_table.h" #include "gpio.c" @@ -98,10 +97,11 @@ static void mb_early_setup(void) pci_write_config8(PCI_DEV(0, 0x1f, 0), ACPI_CNTL, 0x10); } -static void main(unsigned long bist) +#include "cpu/intel/model_6bx/cache_as_ram_disable.c" + +void real_main(unsigned long bist) { if (bist == 0) { - early_mtrr_init(); if (memory_initialized()) { hard_reset(); } |