Author: uwe Date: 2007-04-22 21:03:34 +0200 (Sun, 22 Apr 2007) New Revision: 2614
Modified: trunk/LinuxBIOSv2/src/mainboard/iwill/dk8_htx/cache_as_ram_auto.c trunk/LinuxBIOSv2/src/northbridge/amd/amdk8/coherent_ht_car.c trunk/LinuxBIOSv2/targets/amd/serengeti_cheetah/Config-abuild.lb trunk/LinuxBIOSv2/targets/arima/hdama/Config-abuild.lb trunk/LinuxBIOSv2/targets/digitallogic/msm586seg/Config-abuild.lb trunk/LinuxBIOSv2/targets/emulation/qemu-i386/Config-abuild.lb trunk/LinuxBIOSv2/targets/ibm/e326/Config-abuild.lb trunk/LinuxBIOSv2/targets/iwill/dk8_htx/Config-abuild.lb trunk/LinuxBIOSv2/targets/msi/ms9185/Config-abuild.lb trunk/LinuxBIOSv2/targets/technologic/ts5300/Config-abuild.lb trunk/LinuxBIOSv2/targets/via/epia-m/Config-abuild.lb trunk/LinuxBIOSv2/util/abuild/abuild Log: 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
Modified: trunk/LinuxBIOSv2/src/mainboard/iwill/dk8_htx/cache_as_ram_auto.c =================================================================== --- trunk/LinuxBIOSv2/src/mainboard/iwill/dk8_htx/cache_as_ram_auto.c 2007-04-22 01:17:36 UTC (rev 2613) +++ trunk/LinuxBIOSv2/src/mainboard/iwill/dk8_htx/cache_as_ram_auto.c 2007-04-22 19:03:34 UTC (rev 2614) @@ -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"
Modified: trunk/LinuxBIOSv2/src/northbridge/amd/amdk8/coherent_ht_car.c =================================================================== --- trunk/LinuxBIOSv2/src/northbridge/amd/amdk8/coherent_ht_car.c 2007-04-22 01:17:36 UTC (rev 2613) +++ trunk/LinuxBIOSv2/src/northbridge/amd/amdk8/coherent_ht_car.c 2007-04-22 19:03:34 UTC (rev 2614) @@ -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
Modified: trunk/LinuxBIOSv2/targets/amd/serengeti_cheetah/Config-abuild.lb =================================================================== --- trunk/LinuxBIOSv2/targets/amd/serengeti_cheetah/Config-abuild.lb 2007-04-22 01:17:36 UTC (rev 2613) +++ trunk/LinuxBIOSv2/targets/amd/serengeti_cheetah/Config-abuild.lb 2007-04-22 19:03:34 UTC (rev 2614) @@ -15,13 +15,13 @@ 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"
Modified: trunk/LinuxBIOSv2/targets/arima/hdama/Config-abuild.lb =================================================================== --- trunk/LinuxBIOSv2/targets/arima/hdama/Config-abuild.lb 2007-04-22 01:17:36 UTC (rev 2613) +++ trunk/LinuxBIOSv2/targets/arima/hdama/Config-abuild.lb 2007-04-22 19:03:34 UTC (rev 2614) @@ -15,13 +15,13 @@ 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"
Modified: trunk/LinuxBIOSv2/targets/digitallogic/msm586seg/Config-abuild.lb =================================================================== --- trunk/LinuxBIOSv2/targets/digitallogic/msm586seg/Config-abuild.lb 2007-04-22 01:17:36 UTC (rev 2613) +++ trunk/LinuxBIOSv2/targets/digitallogic/msm586seg/Config-abuild.lb 2007-04-22 19:03:34 UTC (rev 2614) @@ -20,7 +20,7 @@ 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"
Modified: trunk/LinuxBIOSv2/targets/emulation/qemu-i386/Config-abuild.lb =================================================================== --- trunk/LinuxBIOSv2/targets/emulation/qemu-i386/Config-abuild.lb 2007-04-22 01:17:36 UTC (rev 2613) +++ trunk/LinuxBIOSv2/targets/emulation/qemu-i386/Config-abuild.lb 2007-04-22 19:03:34 UTC (rev 2614) @@ -15,7 +15,7 @@ romimage "image" option ROM_IMAGE_SIZE=0x10000 option LINUXBIOS_EXTRA_VERSION="-OpenBIOS" - payload PAYLOAD + payload __PAYLOAD__ end
buildrom ./qemu-bios.rom ROM_SIZE "image"
Modified: trunk/LinuxBIOSv2/targets/ibm/e326/Config-abuild.lb =================================================================== --- trunk/LinuxBIOSv2/targets/ibm/e326/Config-abuild.lb 2007-04-22 01:17:36 UTC (rev 2613) +++ trunk/LinuxBIOSv2/targets/ibm/e326/Config-abuild.lb 2007-04-22 19:03:34 UTC (rev 2614) @@ -15,13 +15,13 @@ 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"
Modified: trunk/LinuxBIOSv2/targets/iwill/dk8_htx/Config-abuild.lb =================================================================== --- trunk/LinuxBIOSv2/targets/iwill/dk8_htx/Config-abuild.lb 2007-04-22 01:17:36 UTC (rev 2613) +++ trunk/LinuxBIOSv2/targets/iwill/dk8_htx/Config-abuild.lb 2007-04-22 19:03:34 UTC (rev 2614) @@ -13,13 +13,13 @@ 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"
Modified: trunk/LinuxBIOSv2/targets/msi/ms9185/Config-abuild.lb =================================================================== --- trunk/LinuxBIOSv2/targets/msi/ms9185/Config-abuild.lb 2007-04-22 01:17:36 UTC (rev 2613) +++ trunk/LinuxBIOSv2/targets/msi/ms9185/Config-abuild.lb 2007-04-22 19:03:34 UTC (rev 2614) @@ -13,13 +13,13 @@ 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"
Modified: trunk/LinuxBIOSv2/targets/technologic/ts5300/Config-abuild.lb =================================================================== --- trunk/LinuxBIOSv2/targets/technologic/ts5300/Config-abuild.lb 2007-04-22 01:17:36 UTC (rev 2613) +++ trunk/LinuxBIOSv2/targets/technologic/ts5300/Config-abuild.lb 2007-04-22 19:03:34 UTC (rev 2614) @@ -15,7 +15,7 @@ # 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"
Modified: trunk/LinuxBIOSv2/targets/via/epia-m/Config-abuild.lb =================================================================== --- trunk/LinuxBIOSv2/targets/via/epia-m/Config-abuild.lb 2007-04-22 01:17:36 UTC (rev 2613) +++ trunk/LinuxBIOSv2/targets/via/epia-m/Config-abuild.lb 2007-04-22 19:03:34 UTC (rev 2614) @@ -31,14 +31,14 @@ 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"
Modified: trunk/LinuxBIOSv2/util/abuild/abuild =================================================================== --- trunk/LinuxBIOSv2/util/abuild/abuild 2007-04-22 01:17:36 UTC (rev 2613) +++ trunk/LinuxBIOSv2/util/abuild/abuild 2007-04-22 19:03:34 UTC (rev 2614) @@ -144,14 +144,14 @@ 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 @@ 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 @@
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 \