[LinuxBIOS] LNXI Merge: lnxi-patch-16/16
jason schildt
jschildt at lnxi.com
Sat Sep 3 00:03:31 CEST 2005
DESCRIPTION:
----------------------------------------
## lnxi-patch-16 ##
targets/.../Config.lb
Increased ROM_IMAGE_SIZE to avoid size overlaps
amd/serenade
Iwill/dk8s2
newisys/khepri
tyan/s2881
tyan/s2882
tyan/s2885
tyan/s2892
tyan/s2895
util/abuild/abuild.sh
increased the hardcoded ROM_IMAGE_SIZE to 0x18000 for Fallback and Normal
DIFFSTAT:
----------------------------------------
../util/abuild/abuild.sh | 4 ++--
Iwill/dk8s2/Config.lb | 3 ++-
amd/serenade/Config.lb | 4 ++--
newisys/khepri/Config.lb | 4 ++--
tyan/s2881/Config.lb | 4 ++--
tyan/s2882/Config.lb | 4 ++--
tyan/s2885/Config.lb | 4 ++--
tyan/s2892/Config.lb | 6 ++----
tyan/s2895/Config.lb | 6 ++----
9 files changed, 18 insertions(+), 21 deletions(-)
PATCH:
----------------------------------------
Index: amd/serenade/Config.lb
===================================================================
--- amd/serenade/Config.lb (revision 1105)
+++ amd/serenade/Config.lb (working copy)
@@ -5,14 +5,14 @@
romimage "normal"
option USE_FALLBACK_IMAGE=0
- option ROM_IMAGE_SIZE=0x10000
+ option ROM_IMAGE_SIZE=0x14000
option LINUXBIOS_EXTRA_VERSION=".0-Normal"
payload /home/ollie/work/filo-0.4.1/filo.elf
end
romimage "fallback"
option USE_FALLBACK_IMAGE=1
- option ROM_IMAGE_SIZE=0x10000
+ option ROM_IMAGE_SIZE=0x14000
option LINUXBIOS_EXTRA_VERSION=".0-Fallback"
payload /home/ollie/work/filo-0.4.1/filo.elf
end
Index: Iwill/dk8s2/Config.lb
===================================================================
--- Iwill/dk8s2/Config.lb (revision 1122)
+++ Iwill/dk8s2/Config.lb (working copy)
@@ -64,7 +64,8 @@
option FALLBACK_SIZE=131072
## ROM_IMAGE_SIZE is the amount of space to allow linuxBIOS to occupy.
-option ROM_IMAGE_SIZE=65536
+#option ROM_IMAGE_SIZE=66536
+option ROM_IMAGE_SIZE=0x12000
###
Index: newisys/khepri/Config.lb
===================================================================
--- newisys/khepri/Config.lb (revision 1122)
+++ newisys/khepri/Config.lb (working copy)
@@ -30,14 +30,14 @@
romimage "normal"
option USE_FALLBACK_IMAGE=0
- option ROM_IMAGE_SIZE=0x10000
+ option ROM_IMAGE_SIZE=0x14000
option LINUXBIOS_EXTRA_VERSION="-Khepri-Normal"
payload ../../../payloads/tg3--ide_disk.zelf
end
romimage "fallback"
option USE_FALLBACK_IMAGE=1
- option ROM_IMAGE_SIZE=0x10000
+ option ROM_IMAGE_SIZE=0x14000
option LINUXBIOS_EXTRA_VERSION="-Khepri-Fallback"
payload ../../../payloads/tg3--ide_disk.zelf
end
Index: tyan/s2881/Config.lb
===================================================================
--- tyan/s2881/Config.lb (revision 1122)
+++ tyan/s2881/Config.lb (working copy)
@@ -16,7 +16,7 @@
option USE_FALLBACK_IMAGE=0
# option ROM_IMAGE_SIZE=0x11800
# option ROM_IMAGE_SIZE=0x13000
- option ROM_IMAGE_SIZE=0x16000
+ option ROM_IMAGE_SIZE=0x18000
option XIP_ROM_SIZE=0x20000
option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
# payload ../../../payloads/tg3--ide_disk.zelf
@@ -36,7 +36,7 @@
option USE_FALLBACK_IMAGE=1
# option ROM_IMAGE_SIZE=0x11800
# option ROM_IMAGE_SIZE=0x13000
- option ROM_IMAGE_SIZE=0x16000
+ option ROM_IMAGE_SIZE=0x18000
option XIP_ROM_SIZE=0x20000
option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
# payload ../../../payloads/tg3--ide_disk.zelf
Index: tyan/s2882/Config.lb
===================================================================
--- tyan/s2882/Config.lb (revision 1122)
+++ tyan/s2882/Config.lb (working copy)
@@ -15,7 +15,7 @@
# option ROM_SIZE = 458752
option USE_FALLBACK_IMAGE=0
# option ROM_IMAGE_SIZE=0x11800
- option ROM_IMAGE_SIZE=0x16000
+ option ROM_IMAGE_SIZE=0x18000
option XIP_ROM_SIZE=0x20000
option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
# payload ../../../payloads/tg3--ide_disk.zelf
@@ -32,7 +32,7 @@
romimage "fallback"
option USE_FALLBACK_IMAGE=1
# option ROM_IMAGE_SIZE=0x11800
- option ROM_IMAGE_SIZE=0x16000
+ option ROM_IMAGE_SIZE=0x18000
option XIP_ROM_SIZE=0x20000
option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
# payload ../../../payloads/tg3--ide_disk.zelf
Index: tyan/s2885/Config.lb
===================================================================
--- tyan/s2885/Config.lb (revision 1105)
+++ tyan/s2885/Config.lb (working copy)
@@ -16,7 +16,7 @@
option USE_FALLBACK_IMAGE=0
# option ROM_IMAGE_SIZE=0x13800
# option ROM_IMAGE_SIZE=0x17800
- option ROM_IMAGE_SIZE=0x16200
+ option ROM_IMAGE_SIZE=0x18000
option XIP_ROM_SIZE=0x20000
option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
# payload ../../../payloads/tg3--ide_disk.zelf
@@ -39,7 +39,7 @@
option USE_FALLBACK_IMAGE=1
# option ROM_IMAGE_SIZE=0x13800
# option ROM_IMAGE_SIZE=0x17800
- option ROM_IMAGE_SIZE=0x16200
+ option ROM_IMAGE_SIZE=0x18000
option XIP_ROM_SIZE=0x20000
option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
# payload ../../../payloads/tg3--ide_disk.zelf
Index: tyan/s2892/Config.lb
===================================================================
--- tyan/s2892/Config.lb (revision 1105)
+++ tyan/s2892/Config.lb (working copy)
@@ -16,8 +16,7 @@
option USE_FALLBACK_IMAGE=0
# option ROM_IMAGE_SIZE=0x11800
# option ROM_IMAGE_SIZE=0x13800
- option ROM_IMAGE_SIZE=0x16380
-# option ROM_IMAGE_SIZE=0x17800
+ option ROM_IMAGE_SIZE=0x17000
option XIP_ROM_SIZE=0x20000
option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
# payload ../../../payloads/tg3--ide_disk.zelf
@@ -37,8 +36,7 @@
option USE_FALLBACK_IMAGE=1
# option ROM_IMAGE_SIZE=0x11800
# option ROM_IMAGE_SIZE=0x13800
- option ROM_IMAGE_SIZE=0x16380
-# option ROM_IMAGE_SIZE=0x17800
+ option ROM_IMAGE_SIZE=0x17000
option XIP_ROM_SIZE=0x20000
option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
# payload ../../../payloads/tg3--ide_disk.zelf
Index: tyan/s2895/Config.lb
===================================================================
--- tyan/s2895/Config.lb (revision 1105)
+++ tyan/s2895/Config.lb (working copy)
@@ -18,8 +18,7 @@
option USE_FALLBACK_IMAGE=0
# option ROM_IMAGE_SIZE=0x11800
# option ROM_IMAGE_SIZE=0x13800
- option ROM_IMAGE_SIZE=0x15000
-# option ROM_IMAGE_SIZE=0x17800
+ option ROM_IMAGE_SIZE=0x17000
option XIP_ROM_SIZE=0x20000
option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
# payload ../../../payloads/tg3--ide_disk.zelf
@@ -46,8 +45,7 @@
option USE_FALLBACK_IMAGE=1
# option ROM_IMAGE_SIZE=0x11800
# option ROM_IMAGE_SIZE=0x13800
- option ROM_IMAGE_SIZE=0x15000
-# option ROM_IMAGE_SIZE=0x17800
+ option ROM_IMAGE_SIZE=0x17000
option XIP_ROM_SIZE=0x20000
option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
# payload ../../../payloads/tg3--ide_disk.zelf
Index: ../util/abuild/abuild.sh
===================================================================
--- ../util/abuild/abuild.sh (revision 1105)
+++ ../util/abuild/abuild.sh (working copy)
@@ -82,14 +82,14 @@
cat <<EOF
romimage "normal"
option USE_FALLBACK_IMAGE=0
- option ROM_IMAGE_SIZE=0x15000
+ option ROM_IMAGE_SIZE=0x18000
option LINUXBIOS_EXTRA_VERSION=".0-normal"
payload PAYLOAD
end
romimage "fallback"
option USE_FALLBACK_IMAGE=1
- option ROM_IMAGE_SIZE=0x15000
+ option ROM_IMAGE_SIZE=0x18000
option LINUXBIOS_EXTRA_VERSION=".0-fallback"
payload PAYLOAD
end
--
Jason W. Schildt
LinuxBIOS Software Engineer
Linux Networx
More information about the coreboot
mailing list