Use __PAYLOAD__ instead of PAYLOAD as replacement template for abuild.

Comment out code which currently doesn't compile. Needs fixing later.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2614 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

12 files changed, 25 insertions, 27 deletions

diff --git a/src/mainboard/iwill/dk8_htx/cache_as_ram_auto.c b/src/mainboard/iwill/dk8_htx/cache_as_ram_auto.c
index 933fdf1bc3..733909f6a5 100644
--- a/src/mainboard/iwill/dk8_htx/cache_as_ram_auto.c
+++ b/src/mainboard/iwill/dk8_htx/cache_as_ram_auto.c
@@ -54,11 +54,12 @@
 
 #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
+ // TODO: This doesn't compile at the moment. Fix later.
+ // #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/northbridge/amd/amdk8/coherent_ht_car.c b/src/northbridge/amd/amdk8/coherent_ht_car.c
index b731a89415..55a2a77bd3 100644
--- a/src/northbridge/amd/amdk8/coherent_ht_car.c
+++ b/src/northbridge/amd/amdk8/coherent_ht_car.c
@@ -78,9 +78,6 @@
 
 #define DEFAULT 0x00010101	/* default row entry */
 
-typedef uint8_t u8;
-typedef uint32_t u32;
-
 #ifndef CROSS_BAR_47_56
 	#define CROSS_BAR_47_56 0
 #endif
diff --git a/targets/amd/serengeti_cheetah/Config-abuild.lb b/targets/amd/serengeti_cheetah/Config-abuild.lb
index b4a4ae6922..7d9e18310a 100644
--- a/targets/amd/serengeti_cheetah/Config-abuild.lb
+++ b/targets/amd/serengeti_cheetah/Config-abuild.lb
@@ -15,13 +15,13 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION=".0-normal"
-	payload PAYLOAD
+	payload __PAYLOAD__
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION=".0-fallback"
-	payload PAYLOAD
+	payload __PAYLOAD__
 end
 buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/arima/hdama/Config-abuild.lb b/targets/arima/hdama/Config-abuild.lb
index b4a4ae6922..7d9e18310a 100644
--- a/targets/arima/hdama/Config-abuild.lb
+++ b/targets/arima/hdama/Config-abuild.lb
@@ -15,13 +15,13 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION=".0-normal"
-	payload PAYLOAD
+	payload __PAYLOAD__
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION=".0-fallback"
-	payload PAYLOAD
+	payload __PAYLOAD__
 end
 buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/digitallogic/msm586seg/Config-abuild.lb b/targets/digitallogic/msm586seg/Config-abuild.lb
index 81d7bc853f..2336b26599 100644
--- a/targets/digitallogic/msm586seg/Config-abuild.lb
+++ b/targets/digitallogic/msm586seg/Config-abuild.lb
@@ -20,7 +20,7 @@ romimage "fallback"
 	option ROM_IMAGE_SIZE=128 * 1024 # 0x10000
 #	option ROM_IMAGE_SIZE=512 * 1024 # 0x10000
 	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
-	payload PAYLOAD
+	payload __PAYLOAD__
 end
 
 buildrom ./linuxbios.rom ROM_SIZE  "fallback"
diff --git a/targets/emulation/qemu-i386/Config-abuild.lb b/targets/emulation/qemu-i386/Config-abuild.lb
index 02016b8603..c2ec536235 100644
--- a/targets/emulation/qemu-i386/Config-abuild.lb
+++ b/targets/emulation/qemu-i386/Config-abuild.lb
@@ -15,7 +15,7 @@ option IRQ_SLOT_COUNT=6
 romimage "image" 
 	option ROM_IMAGE_SIZE=0x10000
 	option LINUXBIOS_EXTRA_VERSION="-OpenBIOS"
-	payload PAYLOAD
+	payload __PAYLOAD__
 end
 
 buildrom ./qemu-bios.rom ROM_SIZE "image"
diff --git a/targets/ibm/e326/Config-abuild.lb b/targets/ibm/e326/Config-abuild.lb
index b4a4ae6922..7d9e18310a 100644
--- a/targets/ibm/e326/Config-abuild.lb
+++ b/targets/ibm/e326/Config-abuild.lb
@@ -15,13 +15,13 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION=".0-normal"
-	payload PAYLOAD
+	payload __PAYLOAD__
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x20000
 	option LINUXBIOS_EXTRA_VERSION=".0-fallback"
-	payload PAYLOAD
+	payload __PAYLOAD__
 end
 buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/iwill/dk8_htx/Config-abuild.lb b/targets/iwill/dk8_htx/Config-abuild.lb
index c602910a75..e29e66c7f7 100644
--- a/targets/iwill/dk8_htx/Config-abuild.lb
+++ b/targets/iwill/dk8_htx/Config-abuild.lb
@@ -13,13 +13,13 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x17000
 	option LINUXBIOS_EXTRA_VERSION=".0-normal"
-	payload PAYLOAD
+	payload __PAYLOAD__
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x17000
 	option LINUXBIOS_EXTRA_VERSION=".0-fallback"
-	payload PAYLOAD
+	payload __PAYLOAD__
 end
 buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/msi/ms9185/Config-abuild.lb b/targets/msi/ms9185/Config-abuild.lb
index 2d83623ad4..fd0a32628d 100644
--- a/targets/msi/ms9185/Config-abuild.lb
+++ b/targets/msi/ms9185/Config-abuild.lb
@@ -13,13 +13,13 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x17000
 	option LINUXBIOS_EXTRA_VERSION=".0-normal"
-	payload PAYLOAD
+	payload __PAYLOAD__
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x17000
 	option LINUXBIOS_EXTRA_VERSION=".0-fallback"
-	payload PAYLOAD
+	payload __PAYLOAD__
 end
 buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/technologic/ts5300/Config-abuild.lb b/targets/technologic/ts5300/Config-abuild.lb
index 2d9d389062..bfa728de2e 100644
--- a/targets/technologic/ts5300/Config-abuild.lb
+++ b/targets/technologic/ts5300/Config-abuild.lb
@@ -15,7 +15,7 @@ romimage "fallback"
 #	option ROM_IMAGE_SIZE=32 * 1024 # 0x8000
 	option ROM_IMAGE_SIZE=128 * 1024 # 0x10000
 	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
-	payload PAYLOAD
+	payload __PAYLOAD__
 end
 
 buildrom ./linuxbios.rom ROM_SIZE  "fallback"
diff --git a/targets/via/epia-m/Config-abuild.lb b/targets/via/epia-m/Config-abuild.lb
index 42268f0eca..c74fbfa083 100644
--- a/targets/via/epia-m/Config-abuild.lb
+++ b/targets/via/epia-m/Config-abuild.lb
@@ -31,14 +31,14 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=64*1024
 	option LINUXBIOS_EXTRA_VERSION=".0-Normal"
-	payload PAYLOAD
+	payload __PAYLOAD__
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=64*1024
 	option LINUXBIOS_EXTRA_VERSION=".0-Fallback"
-	payload PAYLOAD
+	payload __PAYLOAD__
 end
 
 buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/util/abuild/abuild b/util/abuild/abuild
index 40e182758a..173acd01b9 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -144,14 +144,14 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x17000
 	option LINUXBIOS_EXTRA_VERSION=".0-normal"
-	payload PAYLOAD
+	payload __PAYLOAD__
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x17000
 	option LINUXBIOS_EXTRA_VERSION=".0-fallback"
-	payload PAYLOAD
+	payload __PAYLOAD__
 end
 buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
 EOF
@@ -159,7 +159,7 @@ EOF
 			cat <<EOF
 romimage "only"
 	option LINUXBIOS_EXTRA_VERSION=".0"
-	payload PAYLOAD
+	payload __PAYLOAD__
 end
 buildrom ./linuxbios.rom ROM_SIZE "only"
 EOF
@@ -175,7 +175,7 @@ EOF
 
 	sed -i.pre -e s,VENDOR,$VENDOR,g \
 		-e s,MAINBOARD,$MAINBOARD,g \
-		-e s,payload\ PAYLOAD,payload\ $PAYLOAD,g \
+		-e s,payload\ __PAYLOAD__,payload\ $PAYLOAD,g \
 		-e s,CROSSCC,"$CC",g \
 		-e s,CROSS_PREFIX,"$CROSS_COMPILE",g \
 		-e s,CROSS_HOSTCC,"$HOSTCC",g \