Author: stepan
Date: 2006-09-16 01:14:37 +0200 (Sat, 16 Sep 2006)
New Revision: 2418
Modified:
trunk/LinuxBIOSv2/targets/via/epia-m/Config-abuild.lb
trunk/LinuxBIOSv2/util/abuild/abuild.sh
Log:
run preprocessor on hand-crafted config files in abuild, too
Modified: trunk/LinuxBIOSv2/targets/via/epia-m/Config-abuild.lb
===================================================================
--- trunk/LinuxBIOSv2/targets/via/epia-m/Config-abuild.lb 2006-09-15 17:00:11 UTC (rev 2417)
+++ trunk/LinuxBIOSv2/targets/via/epia-m/Config-abuild.lb 2006-09-15 23:14:37 UTC (rev 2418)
@@ -7,9 +7,8 @@
option DEFAULT_CONSOLE_LOGLEVEL=8
option CONFIG_CONSOLE_SERIAL8250=1
-option ROM_SIZE=512*1024
+option ROM_SIZE=256*1024
-
option HAVE_OPTION_TABLE=1
option CONFIG_ROM_STREAM=1
option HAVE_FALLBACK_BOOT=1
@@ -28,16 +27,16 @@
#
romimage "normal"
option USE_FALLBACK_IMAGE=0
- option ROM_IMAGE_SIZE=0x20000
+ option ROM_IMAGE_SIZE=64*1024
option LINUXBIOS_EXTRA_VERSION=".0-Normal"
- payload /dev/null
+ payload PAYLOAD
end
romimage "fallback"
option USE_FALLBACK_IMAGE=1
- option ROM_IMAGE_SIZE=0x20000
+ option ROM_IMAGE_SIZE=64*1024
option LINUXBIOS_EXTRA_VERSION=".0-Fallback"
- payload /dev/null
+ payload PAYLOAD
end
buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
Modified: trunk/LinuxBIOSv2/util/abuild/abuild.sh
===================================================================
--- trunk/LinuxBIOSv2/util/abuild/abuild.sh 2006-09-15 17:00:11 UTC (rev 2417)
+++ trunk/LinuxBIOSv2/util/abuild/abuild.sh 2006-09-15 23:14:37 UTC (rev 2418)
@@ -85,22 +85,23 @@
TARGCONFIG=$LBROOT/targets/$VENDOR/$MAINBOARD/Config-abuild.lb
# get a working payload for the board if we have one.
+
if [ -x $payloads/payload.sh ]; then
PAYLOAD=`$payloads/payload.sh $VENDOR $MAINBOARD`
+ echo "Using custom payload $PAYLOAD"
fi
mkdir -p $TARGET
if [ -f $TARGCONFIG ]; then
cp $TARGCONFIG $TARGET/Config-${VENDOR}_${MAINBOARD}.lb
- echo "Used existing test target $TARGCONFIG"
+ echo -n "Using existing test target $TARGCONFIG"
xml " <config>$TARGCONFIG</config>"
- return
- fi
+ else
- echo -n " Creating config file..."
- xml " <config>autogenerated</config>"
- ( cat << EOF
+ echo -n " Creating config file..."
+ xml " <config>autogenerated</config>"
+ ( cat << EOF
# This will make a target directory of ./VENDOR_MAINBOARD
target VENDOR_MAINBOARD
@@ -111,8 +112,8 @@
option HOSTCC="CROSS_HOSTCC"
EOF
- if [ "$TARCH" == i386 ] ; then
- cat <<EOF
+ if [ "$TARCH" == i386 ] ; then
+ cat <<EOF
romimage "normal"
option USE_FALLBACK_IMAGE=0
option ROM_IMAGE_SIZE=0x20000
@@ -128,22 +129,26 @@
end
buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
EOF
- else
- cat <<EOF
+ else
+ cat <<EOF
romimage "only"
option LINUXBIOS_EXTRA_VERSION=".0"
payload PAYLOAD
end
buildrom ./linuxbios.rom ROM_SIZE "only"
EOF
+ fi
+ ) > $TARGET/Config-${VENDOR}_${MAINBOARD}.lb
fi
- ) | sed -e s,VENDOR,$VENDOR,g \
+
+ sed -i.pre -e s,VENDOR,$VENDOR,g \
-e s,MAINBOARD,$MAINBOARD,g \
-e s,PAYLOAD,$PAYLOAD,g \
-e s,CROSSCC,"$CC",g \
-e s,CROSS_PREFIX,"$CROSS_COMPILE",g \
-e s,CROSS_HOSTCC,"$HOSTCC",g \
- > $TARGET/Config-${VENDOR}_${MAINBOARD}.lb
+ $TARGET/Config-${VENDOR}_${MAINBOARD}.lb
+
echo " ok"
}