summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Jones <marc.jones@amd.com>2008-09-29 22:59:23 +0000
committerMarc Jones <marc.jones@amd.com>2008-09-29 22:59:23 +0000
commit2080bd9a41dfda32e740869be8dbbdbc2978211e (patch)
treedc1661740683c0ffbec951582bbf89eee168367b
parentb246158f7798674a1df1f610e6bc4115721e67dc (diff)
AMD K8 platforms must use CAR so it makes sense to use the PRINK_IN_CAR
option. This patch converts the following patches to use PRTINK_IN_CAR amd/serngeti_cheetah msi/ms9185 msi/ms9828 supermicro/h8dmr Signed-off-by: Marc Jones <marc.jones@amd.com> Acked-by: Ronald G. Minnich <rminnich@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3617 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--src/mainboard/amd/serengeti_cheetah/Options.lb2
-rw-r--r--src/mainboard/amd/serengeti_cheetah/apc_auto.c5
-rw-r--r--src/mainboard/amd/serengeti_cheetah/cache_as_ram_auto.c6
-rw-r--r--src/mainboard/msi/ms9185/Options.lb5
-rw-r--r--src/mainboard/msi/ms9282/Options.lb5
-rw-r--r--src/mainboard/supermicro/h8dmr/Options.lb4
-rw-r--r--targets/supermicro/h8dmr/Config-abuild.lb4
7 files changed, 12 insertions, 19 deletions
diff --git a/src/mainboard/amd/serengeti_cheetah/Options.lb b/src/mainboard/amd/serengeti_cheetah/Options.lb
index 9cdc29dac9..4e837a1ba2 100644
--- a/src/mainboard/amd/serengeti_cheetah/Options.lb
+++ b/src/mainboard/amd/serengeti_cheetah/Options.lb
@@ -286,7 +286,7 @@ default CONFIG_GDB_STUB=0
##
## The Serial Console
##
-default CONFIG_USE_PRINTK_IN_CAR=0
+default CONFIG_USE_PRINTK_IN_CAR=1
# To Enable the Serial Console
default CONFIG_CONSOLE_SERIAL8250=1
diff --git a/src/mainboard/amd/serengeti_cheetah/apc_auto.c b/src/mainboard/amd/serengeti_cheetah/apc_auto.c
index 8f707884f2..a69ae164e1 100644
--- a/src/mainboard/amd/serengeti_cheetah/apc_auto.c
+++ b/src/mainboard/amd/serengeti_cheetah/apc_auto.c
@@ -24,11 +24,6 @@
#if CONFIG_USE_INIT == 0
#include "lib/memcpy.c"
- #if CONFIG_USE_PRINTK_IN_CAR == 1
- #include "lib/uart8250.c"
- #include "console/vtxprintf.c"
- #include "arch/i386/lib/printk_init.c"
- #endif
#endif
#include "arch/i386/lib/console.c"
diff --git a/src/mainboard/amd/serengeti_cheetah/cache_as_ram_auto.c b/src/mainboard/amd/serengeti_cheetah/cache_as_ram_auto.c
index 4eb7a71070..5b217a6711 100644
--- a/src/mainboard/amd/serengeti_cheetah/cache_as_ram_auto.c
+++ b/src/mainboard/amd/serengeti_cheetah/cache_as_ram_auto.c
@@ -33,6 +33,7 @@
#include "option_table.h"
#include "pc80/mc146818rtc_early.c"
+
#if 0
static void post_code(uint8_t value) {
#if 1
@@ -64,11 +65,6 @@ static void post_code(uint8_t value) {
#if CONFIG_USE_INIT == 0
#include "lib/memcpy.c"
- #if CONFIG_USE_PRINTK_IN_CAR == 1
- #include "lib/uart8250.c"
- #include "console/vtxprintf.c"
- #include "arch/i386/lib/printk_init.c"
- #endif
#endif
#include "northbridge/amd/amdk8/debug.c"
#include "cpu/amd/mtrr/amd_earlymtrr.c"
diff --git a/src/mainboard/msi/ms9185/Options.lb b/src/mainboard/msi/ms9185/Options.lb
index d42fb1515c..c20b7d3868 100644
--- a/src/mainboard/msi/ms9185/Options.lb
+++ b/src/mainboard/msi/ms9185/Options.lb
@@ -104,7 +104,7 @@ uses LIFT_BSP_APIC_ID
uses CONFIG_PCI_64BIT_PREF_MEM
uses CONFIG_LB_MEM_TOPK
-
+uses CONFIG_USE_PRINTK_IN_CAR
###
### Build options
@@ -222,7 +222,7 @@ default USE_DCACHE_RAM=1
default DCACHE_RAM_BASE=0xcc000
default DCACHE_RAM_SIZE=0x04000
default DCACHE_RAM_GLOBAL_VAR_SIZE=0x01000
-default CONFIG_USE_INIT=0
+default CONFIG_USE_INIT=0
##
## Build code to setup a generic IOAPIC
@@ -287,6 +287,7 @@ default CONFIG_GDB_STUB=0
##
## The Serial Console
##
+default CONFIG_USE_PRINTK_IN_CAR=1
# To Enable the Serial Console
default CONFIG_CONSOLE_SERIAL8250=1
diff --git a/src/mainboard/msi/ms9282/Options.lb b/src/mainboard/msi/ms9282/Options.lb
index bef1e01f8c..2db8a24664 100644
--- a/src/mainboard/msi/ms9282/Options.lb
+++ b/src/mainboard/msi/ms9282/Options.lb
@@ -100,6 +100,7 @@ uses SB_HT_CHAIN_ON_BUS0
uses CONFIG_COMPRESSED_PAYLOAD_LZMA
uses CONFIG_COMPRESSED_PAYLOAD_NRV2B
uses CONFIG_PRECOMPRESSED_PAYLOAD
+uses CONFIG_USE_PRINTK_IN_CAR
## ROM_SIZE is the size of boot ROM that this board will use.
#512K bytes
@@ -203,7 +204,6 @@ default ENABLE_APIC_EXT_ID=1
default APIC_ID_OFFSET=0x10
default LIFT_BSP_APIC_ID=0
-
##
## Build code to setup a generic IOAPIC
##
@@ -267,7 +267,8 @@ default CONFIG_GDB_STUB=0
##
## The Serial Console
##
-
+default CONFIG_USE_PRINTK_IN_CAR=1
+
# To Enable the Serial Console
default CONFIG_CONSOLE_SERIAL8250=1
diff --git a/src/mainboard/supermicro/h8dmr/Options.lb b/src/mainboard/supermicro/h8dmr/Options.lb
index a1104129a3..15f9ad4c4f 100644
--- a/src/mainboard/supermicro/h8dmr/Options.lb
+++ b/src/mainboard/supermicro/h8dmr/Options.lb
@@ -236,7 +236,7 @@ default DCACHE_RAM_SIZE=0x08000
default DCACHE_RAM_GLOBAL_VAR_SIZE=0x01000
default CONFIG_USE_INIT=0
-default CONFIG_AP_CODE_IN_CAR=0
+default CONFIG_AP_CODE_IN_CAR=1
default MEM_TRAIN_SEQ=1
default WAIT_BEFORE_CPUS_INIT=1
@@ -305,7 +305,7 @@ default CONFIG_GDB_STUB=0
##
## The Serial Console
##
-default CONFIG_USE_PRINTK_IN_CAR=0
+default CONFIG_USE_PRINTK_IN_CAR=1
# To Enable the Serial Console
default CONFIG_CONSOLE_SERIAL8250=1
diff --git a/targets/supermicro/h8dmr/Config-abuild.lb b/targets/supermicro/h8dmr/Config-abuild.lb
index 0b6bad7269..8c204b69f4 100644
--- a/targets/supermicro/h8dmr/Config-abuild.lb
+++ b/targets/supermicro/h8dmr/Config-abuild.lb
@@ -12,7 +12,7 @@ __COMPRESSION__
romimage "normal"
option USE_FAILOVER_IMAGE=0
option USE_FALLBACK_IMAGE=0
- option ROM_IMAGE_SIZE=0x18000
+ option ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-normal"
payload __PAYLOAD__
end
@@ -20,7 +20,7 @@ end
romimage "fallback"
option USE_FAILOVER_IMAGE=0
option USE_FALLBACK_IMAGE=1
- option ROM_IMAGE_SIZE=0x18000
+ option ROM_IMAGE_SIZE=0x20000
option COREBOOT_EXTRA_VERSION=".0-fallback"
payload __PAYLOAD__
end