From 93159bf752577365e10913257a9edc8d57990a8b Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Mon, 22 Dec 2008 09:53:24 +0000 Subject: [PATCH] In the process of trying to debug some HT sync problems I added lots of debug code to src/northbridge/amd/amdk8/incoherent_ht.c. However, printk is not available for all boards at that stage. I have changed the following boards: agami/aruma arima/hdama asus/a8n_e broadcom/blast ibm/e325 ibm/e326 iwill/dk8s2 iwill/dk8x msi/ms7135 newisys/khepri sunw/ultra40 tyan/s2850 tyan/s2875 tyan/s2880 tyan/s2881 tyan/s2882 tyan/s2885 tyan/s2891 tyan/s2892 tyan/s2895 tyan/s4880 tyan/s4882 abuild works fine for all of them. agami/aruma needs a Config-abuild.lb which doesn't have fallback and normal due to size problems. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Marc Jones git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3829 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/agami/aruma/Options.lb | 2 +- src/mainboard/arima/hdama/Options.lb | 3 +++ src/mainboard/asus/a8n_e/Options.lb | 2 ++ src/mainboard/broadcom/blast/Options.lb | 3 +++ src/mainboard/ibm/e325/Options.lb | 3 +++ src/mainboard/ibm/e326/Options.lb | 3 +++ src/mainboard/iwill/dk8s2/Options.lb | 3 +++ src/mainboard/iwill/dk8x/Options.lb | 3 +++ src/mainboard/msi/ms7135/Options.lb | 3 +++ src/mainboard/newisys/khepri/Options.lb | 3 +++ src/mainboard/sunw/ultra40/Options.lb | 3 +++ src/mainboard/tyan/s2850/Options.lb | 3 +++ src/mainboard/tyan/s2875/Options.lb | 3 +++ src/mainboard/tyan/s2880/Options.lb | 3 +++ src/mainboard/tyan/s2881/Options.lb | 3 +++ src/mainboard/tyan/s2882/Options.lb | 3 +++ src/mainboard/tyan/s2885/Options.lb | 3 +++ src/mainboard/tyan/s2891/Options.lb | 3 +++ src/mainboard/tyan/s2892/Options.lb | 3 +++ src/mainboard/tyan/s2895/Options.lb | 3 +++ src/mainboard/tyan/s4880/Options.lb | 3 +++ src/mainboard/tyan/s4882/Options.lb | 3 +++ targets/agami/aruma/Config-abuild.lb | 26 +++++++++++++++++++++++++ 23 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 targets/agami/aruma/Config-abuild.lb diff --git a/src/mainboard/agami/aruma/Options.lb b/src/mainboard/agami/aruma/Options.lb index 47eb59fa7f..a6775ea056 100644 --- a/src/mainboard/agami/aruma/Options.lb +++ b/src/mainboard/agami/aruma/Options.lb @@ -179,7 +179,7 @@ default DCACHE_RAM_BASE=0xcc000 default DCACHE_RAM_SIZE=0x4000 default CONFIG_USE_INIT=0 #default CONFIG_USE_INIT=1 -#default CONFIG_USE_PRINTK_IN_CAR=1 +default CONFIG_USE_PRINTK_IN_CAR=1 ## ## Build code to setup a generic IOAPIC diff --git a/src/mainboard/arima/hdama/Options.lb b/src/mainboard/arima/hdama/Options.lb index adb5f601bd..887aab3a41 100644 --- a/src/mainboard/arima/hdama/Options.lb +++ b/src/mainboard/arima/hdama/Options.lb @@ -56,6 +56,7 @@ uses USE_DCACHE_RAM uses DCACHE_RAM_BASE uses DCACHE_RAM_SIZE uses CONFIG_USE_INIT +uses CONFIG_USE_PRINTK_IN_CAR ### ### Build options @@ -191,6 +192,8 @@ default HOSTCC="gcc" ## default CONFIG_GDB_STUB=0 +default CONFIG_USE_PRINTK_IN_CAR=1 + ## ## The Serial Console ## diff --git a/src/mainboard/asus/a8n_e/Options.lb b/src/mainboard/asus/a8n_e/Options.lb index fd551aa42a..b2876cb3d5 100644 --- a/src/mainboard/asus/a8n_e/Options.lb +++ b/src/mainboard/asus/a8n_e/Options.lb @@ -97,6 +97,7 @@ uses HT_CHAIN_END_UNITID_BASE uses SB_HT_CHAIN_ON_BUS0 uses SB_HT_CHAIN_UNITID_OFFSET_ONLY uses CONFIG_LB_MEM_TOPK +uses CONFIG_USE_PRINTK_IN_CAR default ROM_SIZE = 512 * 1024 default ROM_IMAGE_SIZE = 64 * 1024 @@ -157,6 +158,7 @@ default CONFIG_ROM_PAYLOAD = 1 default CC = "$(CROSS_COMPILE)gcc -m32" default HOSTCC = "gcc" default CONFIG_GDB_STUB = 0 +default CONFIG_USE_PRINTK_IN_CAR=1 default CONFIG_CONSOLE_SERIAL8250 = 1 default TTYS0_BAUD = 115200 default TTYS0_BASE = 0x3f8 diff --git a/src/mainboard/broadcom/blast/Options.lb b/src/mainboard/broadcom/blast/Options.lb index 6142896092..d86138d768 100644 --- a/src/mainboard/broadcom/blast/Options.lb +++ b/src/mainboard/broadcom/blast/Options.lb @@ -64,6 +64,7 @@ uses USE_DCACHE_RAM uses DCACHE_RAM_BASE uses DCACHE_RAM_SIZE uses CONFIG_USE_INIT +uses CONFIG_USE_PRINTK_IN_CAR uses SB_HT_CHAIN_UNITID_OFFSET_ONLY @@ -214,6 +215,8 @@ default HOSTCC="gcc" ## default CONFIG_GDB_STUB=0 +default CONFIG_USE_PRINTK_IN_CAR=1 + ## ## The Serial Console ## diff --git a/src/mainboard/ibm/e325/Options.lb b/src/mainboard/ibm/e325/Options.lb index 21fc57a453..a6e0ff80ec 100644 --- a/src/mainboard/ibm/e325/Options.lb +++ b/src/mainboard/ibm/e325/Options.lb @@ -49,6 +49,7 @@ uses USE_DCACHE_RAM uses DCACHE_RAM_BASE uses DCACHE_RAM_SIZE uses CONFIG_USE_INIT +uses CONFIG_USE_PRINTK_IN_CAR ### @@ -170,6 +171,8 @@ default CONFIG_ROM_PAYLOAD = 1 default CC="$(CROSS_COMPILE)gcc -m32" default HOSTCC="gcc" +default CONFIG_USE_PRINTK_IN_CAR=1 + ## ## The Serial Console ## diff --git a/src/mainboard/ibm/e326/Options.lb b/src/mainboard/ibm/e326/Options.lb index 40db181ab5..b164143450 100644 --- a/src/mainboard/ibm/e326/Options.lb +++ b/src/mainboard/ibm/e326/Options.lb @@ -51,6 +51,7 @@ uses USE_DCACHE_RAM uses DCACHE_RAM_BASE uses DCACHE_RAM_SIZE uses CONFIG_USE_INIT +uses CONFIG_USE_PRINTK_IN_CAR ### @@ -176,6 +177,8 @@ default CONFIG_ROM_PAYLOAD = 1 default CC="$(CROSS_COMPILE)gcc -m32" default HOSTCC="gcc" +default CONFIG_USE_PRINTK_IN_CAR=1 + ## ## The Serial Console ## diff --git a/src/mainboard/iwill/dk8s2/Options.lb b/src/mainboard/iwill/dk8s2/Options.lb index 81aa84ef7e..a93e4dc383 100644 --- a/src/mainboard/iwill/dk8s2/Options.lb +++ b/src/mainboard/iwill/dk8s2/Options.lb @@ -53,6 +53,7 @@ uses USE_DCACHE_RAM uses DCACHE_RAM_BASE uses DCACHE_RAM_SIZE uses CONFIG_USE_INIT +uses CONFIG_USE_PRINTK_IN_CAR ## ROM_SIZE is the size of boot ROM that this board will use. default ROM_SIZE=524288 @@ -177,6 +178,8 @@ default CONFIG_ROM_PAYLOAD = 1 ## default CONFIG_GDB_STUB=0 +default CONFIG_USE_PRINTK_IN_CAR=1 + ## ## The Serial Console ## diff --git a/src/mainboard/iwill/dk8x/Options.lb b/src/mainboard/iwill/dk8x/Options.lb index 1811aa44c5..7b4078ca4d 100644 --- a/src/mainboard/iwill/dk8x/Options.lb +++ b/src/mainboard/iwill/dk8x/Options.lb @@ -53,6 +53,7 @@ uses USE_DCACHE_RAM uses DCACHE_RAM_BASE uses DCACHE_RAM_SIZE uses CONFIG_USE_INIT +uses CONFIG_USE_PRINTK_IN_CAR ## ROM_SIZE is the size of boot ROM that this board will use. default ROM_SIZE=524288 @@ -176,6 +177,8 @@ default CONFIG_ROM_PAYLOAD = 1 ## default CONFIG_GDB_STUB=0 +default CONFIG_USE_PRINTK_IN_CAR=1 + ## ## The Serial Console ## diff --git a/src/mainboard/msi/ms7135/Options.lb b/src/mainboard/msi/ms7135/Options.lb index 81bdde0245..acfe37f70d 100644 --- a/src/mainboard/msi/ms7135/Options.lb +++ b/src/mainboard/msi/ms7135/Options.lb @@ -87,6 +87,7 @@ uses DCACHE_RAM_SIZE uses CONFIG_USE_INIT uses DCACHE_RAM_GLOBAL_VAR_SIZE uses CONFIG_AP_CODE_IN_CAR +uses CONFIG_USE_PRINTK_IN_CAR uses MEM_TRAIN_SEQ uses WAIT_BEFORE_CPUS_INIT @@ -271,6 +272,8 @@ default HOSTCC="gcc" ## default CONFIG_GDB_STUB=0 +default CONFIG_USE_PRINTK_IN_CAR=1 + ## ## The Serial Console ## diff --git a/src/mainboard/newisys/khepri/Options.lb b/src/mainboard/newisys/khepri/Options.lb index 0f5b3e7776..0b4d6e9ddc 100644 --- a/src/mainboard/newisys/khepri/Options.lb +++ b/src/mainboard/newisys/khepri/Options.lb @@ -59,6 +59,7 @@ uses USE_DCACHE_RAM uses DCACHE_RAM_BASE uses DCACHE_RAM_SIZE uses CONFIG_USE_INIT +uses CONFIG_USE_PRINTK_IN_CAR ### ### Build options @@ -198,6 +199,8 @@ default HOSTCC="gcc" ## default CONFIG_GDB_STUB=0 +default CONFIG_USE_PRINTK_IN_CAR=1 + ## ## The Serial Console ## diff --git a/src/mainboard/sunw/ultra40/Options.lb b/src/mainboard/sunw/ultra40/Options.lb index 3c15841cf9..e7de774a2d 100644 --- a/src/mainboard/sunw/ultra40/Options.lb +++ b/src/mainboard/sunw/ultra40/Options.lb @@ -61,6 +61,7 @@ uses USE_DCACHE_RAM uses DCACHE_RAM_BASE uses DCACHE_RAM_SIZE uses CONFIG_USE_INIT +uses CONFIG_USE_PRINTK_IN_CAR uses ENABLE_APIC_EXT_ID uses APIC_ID_OFFSET @@ -231,6 +232,8 @@ default HOSTCC="gcc" ## default CONFIG_GDB_STUB=0 +default CONFIG_USE_PRINTK_IN_CAR=1 + ## ## The Serial Console ## diff --git a/src/mainboard/tyan/s2850/Options.lb b/src/mainboard/tyan/s2850/Options.lb index cf1298e9c8..43cf08505f 100644 --- a/src/mainboard/tyan/s2850/Options.lb +++ b/src/mainboard/tyan/s2850/Options.lb @@ -60,6 +60,7 @@ uses USE_DCACHE_RAM uses DCACHE_RAM_BASE uses DCACHE_RAM_SIZE uses CONFIG_USE_INIT +uses CONFIG_USE_PRINTK_IN_CAR ### ### Build options @@ -199,6 +200,8 @@ default HOSTCC="gcc" ## default CONFIG_GDB_STUB=0 +default CONFIG_USE_PRINTK_IN_CAR=1 + ## ## The Serial Console ## diff --git a/src/mainboard/tyan/s2875/Options.lb b/src/mainboard/tyan/s2875/Options.lb index b90d4184e2..5ce11fd3e6 100644 --- a/src/mainboard/tyan/s2875/Options.lb +++ b/src/mainboard/tyan/s2875/Options.lb @@ -60,6 +60,7 @@ uses USE_DCACHE_RAM uses DCACHE_RAM_BASE uses DCACHE_RAM_SIZE uses CONFIG_USE_INIT +uses CONFIG_USE_PRINTK_IN_CAR ### ### Build options @@ -200,6 +201,8 @@ default HOSTCC="gcc" ## default CONFIG_GDB_STUB=0 +default CONFIG_USE_PRINTK_IN_CAR=1 + ## ## The Serial Console ## diff --git a/src/mainboard/tyan/s2880/Options.lb b/src/mainboard/tyan/s2880/Options.lb index 72c40d9466..dd53e75374 100644 --- a/src/mainboard/tyan/s2880/Options.lb +++ b/src/mainboard/tyan/s2880/Options.lb @@ -60,6 +60,7 @@ uses USE_DCACHE_RAM uses DCACHE_RAM_BASE uses DCACHE_RAM_SIZE uses CONFIG_USE_INIT +uses CONFIG_USE_PRINTK_IN_CAR ### ### Build options @@ -199,6 +200,8 @@ default HOSTCC="gcc" ## default CONFIG_GDB_STUB=0 +default CONFIG_USE_PRINTK_IN_CAR=1 + ## ## The Serial Console ## diff --git a/src/mainboard/tyan/s2881/Options.lb b/src/mainboard/tyan/s2881/Options.lb index 306c3a11dd..6105d06a4b 100644 --- a/src/mainboard/tyan/s2881/Options.lb +++ b/src/mainboard/tyan/s2881/Options.lb @@ -65,6 +65,7 @@ uses USE_DCACHE_RAM uses DCACHE_RAM_BASE uses DCACHE_RAM_SIZE uses CONFIG_USE_INIT +uses CONFIG_USE_PRINTK_IN_CAR ### ### Build options @@ -216,6 +217,8 @@ default HOSTCC="gcc" ## default CONFIG_GDB_STUB=0 +default CONFIG_USE_PRINTK_IN_CAR=1 + ## ## The Serial Console ## diff --git a/src/mainboard/tyan/s2882/Options.lb b/src/mainboard/tyan/s2882/Options.lb index 23b2658ed6..b6d62a43d4 100644 --- a/src/mainboard/tyan/s2882/Options.lb +++ b/src/mainboard/tyan/s2882/Options.lb @@ -60,6 +60,7 @@ uses USE_DCACHE_RAM uses DCACHE_RAM_BASE uses DCACHE_RAM_SIZE uses CONFIG_USE_INIT +uses CONFIG_USE_PRINTK_IN_CAR ### ### Build options @@ -199,6 +200,8 @@ default HOSTCC="gcc" ## default CONFIG_GDB_STUB=0 +default CONFIG_USE_PRINTK_IN_CAR=1 + ## ## The Serial Console ## diff --git a/src/mainboard/tyan/s2885/Options.lb b/src/mainboard/tyan/s2885/Options.lb index 254483d3ad..6e3ab834e6 100644 --- a/src/mainboard/tyan/s2885/Options.lb +++ b/src/mainboard/tyan/s2885/Options.lb @@ -60,6 +60,7 @@ uses USE_DCACHE_RAM uses DCACHE_RAM_BASE uses DCACHE_RAM_SIZE uses CONFIG_USE_INIT +uses CONFIG_USE_PRINTK_IN_CAR uses ENABLE_APIC_EXT_ID uses APIC_ID_OFFSET @@ -226,6 +227,8 @@ default HOSTCC="gcc" ## default CONFIG_GDB_STUB=0 +default CONFIG_USE_PRINTK_IN_CAR=1 + ## ## The Serial Console ## diff --git a/src/mainboard/tyan/s2891/Options.lb b/src/mainboard/tyan/s2891/Options.lb index bd3b695671..fa38f84a0b 100644 --- a/src/mainboard/tyan/s2891/Options.lb +++ b/src/mainboard/tyan/s2891/Options.lb @@ -61,6 +61,7 @@ uses USE_DCACHE_RAM uses DCACHE_RAM_BASE uses DCACHE_RAM_SIZE uses CONFIG_USE_INIT +uses CONFIG_USE_PRINTK_IN_CAR uses ENABLE_APIC_EXT_ID uses APIC_ID_OFFSET @@ -233,6 +234,8 @@ default HOSTCC="gcc" ## default CONFIG_GDB_STUB=0 +default CONFIG_USE_PRINTK_IN_CAR=1 + ## ## The Serial Console ## diff --git a/src/mainboard/tyan/s2892/Options.lb b/src/mainboard/tyan/s2892/Options.lb index 381444418c..37b9b5baa2 100644 --- a/src/mainboard/tyan/s2892/Options.lb +++ b/src/mainboard/tyan/s2892/Options.lb @@ -61,6 +61,7 @@ uses USE_DCACHE_RAM uses DCACHE_RAM_BASE uses DCACHE_RAM_SIZE uses CONFIG_USE_INIT +uses CONFIG_USE_PRINTK_IN_CAR uses HT_CHAIN_UNITID_BASE uses HT_CHAIN_END_UNITID_BASE @@ -221,6 +222,8 @@ default HOSTCC="gcc" ## default CONFIG_GDB_STUB=0 +default CONFIG_USE_PRINTK_IN_CAR=1 + ## ## The Serial Console ## diff --git a/src/mainboard/tyan/s2895/Options.lb b/src/mainboard/tyan/s2895/Options.lb index b67642cd6a..55bef9597c 100644 --- a/src/mainboard/tyan/s2895/Options.lb +++ b/src/mainboard/tyan/s2895/Options.lb @@ -64,6 +64,7 @@ uses USE_DCACHE_RAM uses DCACHE_RAM_BASE uses DCACHE_RAM_SIZE uses CONFIG_USE_INIT +uses CONFIG_USE_PRINTK_IN_CAR uses SERIAL_CPU_INIT @@ -243,6 +244,8 @@ default HOSTCC="gcc" ## default CONFIG_GDB_STUB=0 +default CONFIG_USE_PRINTK_IN_CAR=1 + ## ## The Serial Console ## diff --git a/src/mainboard/tyan/s4880/Options.lb b/src/mainboard/tyan/s4880/Options.lb index 7024d629f4..2178a58646 100644 --- a/src/mainboard/tyan/s4880/Options.lb +++ b/src/mainboard/tyan/s4880/Options.lb @@ -60,6 +60,7 @@ uses USE_DCACHE_RAM uses DCACHE_RAM_BASE uses DCACHE_RAM_SIZE uses CONFIG_USE_INIT +uses CONFIG_USE_PRINTK_IN_CAR uses ENABLE_APIC_EXT_ID uses APIC_ID_OFFSET @@ -208,6 +209,8 @@ default HOSTCC="gcc" ## default CONFIG_GDB_STUB=0 +default CONFIG_USE_PRINTK_IN_CAR=1 + ## ## The Serial Console ## diff --git a/src/mainboard/tyan/s4882/Options.lb b/src/mainboard/tyan/s4882/Options.lb index d95b1e3e35..7d2fc9afa4 100644 --- a/src/mainboard/tyan/s4882/Options.lb +++ b/src/mainboard/tyan/s4882/Options.lb @@ -60,6 +60,7 @@ uses USE_DCACHE_RAM uses DCACHE_RAM_BASE uses DCACHE_RAM_SIZE uses CONFIG_USE_INIT +uses CONFIG_USE_PRINTK_IN_CAR uses ENABLE_APIC_EXT_ID uses APIC_ID_OFFSET @@ -207,6 +208,8 @@ default HOSTCC="gcc" ## default CONFIG_GDB_STUB=0 +default CONFIG_USE_PRINTK_IN_CAR=1 + ## ## The Serial Console ## diff --git a/targets/agami/aruma/Config-abuild.lb b/targets/agami/aruma/Config-abuild.lb new file mode 100644 index 0000000000..6eced6a142 --- /dev/null +++ b/targets/agami/aruma/Config-abuild.lb @@ -0,0 +1,26 @@ +# This will make a target directory of ./VENDOR_MAINBOARD + +target VENDOR_MAINBOARD +mainboard VENDOR/MAINBOARD + +option CC="CROSSCC" +option CROSS_COMPILE="CROSS_PREFIX" +option HOSTCC="CROSS_HOSTCC" + +__COMPRESSION__ + +option DEFAULT_CONSOLE_LOGLEVEL=7 +option MAXIMUM_CONSOLE_LOGLEVEL=7 + +option ROM_SIZE = (1024*1024) +option FALLBACK_SIZE = (1024*1024) + +romimage "fallback" + option USE_FALLBACK_IMAGE=1 + option ROM_IMAGE_SIZE=0x16000 + option XIP_ROM_SIZE=0x20000 + option COREBOOT_EXTRA_VERSION=".0-fallback" + payload __PAYLOAD__ +end + +buildrom ./coreboot.rom ROM_SIZE "fallback"