summaryrefslogtreecommitdiff
path: root/targets
diff options
context:
space:
mode:
authorYinghai Lu <yinghailu@gmail.com>2004-04-28 05:37:36 +0000
committerYinghai Lu <yinghailu@gmail.com>2004-04-28 05:37:36 +0000
commit97c4947ec9af1664e81ee797834a32d3ca2f74fe (patch)
tree33f41aaaf4c61c0b41ae4751081d2c369ee371b0 /targets
parent48d11d557f725ecf89678a1b9df440417b8da225 (diff)
Changes for btext and etherboot and filo merge support
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1540 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'targets')
-rw-r--r--targets/tyan/s2850/Config.lb20
-rw-r--r--targets/tyan/s2875/Config.lb19
-rw-r--r--targets/tyan/s2880/Config.lb22
-rw-r--r--targets/tyan/s2881/Config.lb26
-rw-r--r--targets/tyan/s2882/Config.lb17
-rw-r--r--targets/tyan/s2885/Config.lb16
-rw-r--r--targets/tyan/s4880/Config.lb25
-rw-r--r--targets/tyan/s4882/Config.lb25
8 files changed, 130 insertions, 40 deletions
diff --git a/targets/tyan/s2850/Config.lb b/targets/tyan/s2850/Config.lb
index 02e17e21c7..ecdb36f6d9 100644
--- a/targets/tyan/s2850/Config.lb
+++ b/targets/tyan/s2850/Config.lb
@@ -41,7 +41,8 @@ uses USE_FALLBACK_IMAGE
uses USE_OPTION_TABLE
uses HAVE_OPTION_TABLE
uses CONFIG_CHIP_CONFIGURE
-
+
+uses CONFIG_CONSOLE_BTEXT
uses CONFIG_CONSOLE_SERIAL8250
uses TTYS0_BAUD
uses DEFAULT_CONSOLE_LOGLEVEL
@@ -78,6 +79,7 @@ option k7=1
option k8=1
option ROM_SIZE=524288
+option CONFIG_CONSOLE_BTEXT=1
#option CONFIG_VGABIOS=0
#option CONFIG_REALMODE_IDT=0
#option CONFIG_PCIBIOS=0
@@ -217,8 +219,12 @@ romimage "normal"
option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
mainboard tyan/s2850
-# payload ../../tg3--ide_disk_dev.zelf
- payload ../../eepro100--ide_diskx.zelf
+# payload ../../../payloads/eepro100--ide_disk.zelf
+# payload ../../../payloads/filo.elf
+# payload ../../../payloads/filo_mem.elf
+# payload ../../../payloads/filo_mem_btext.elf
+# payload ../../../payloads/filo_btext.zelf
+ payload ../../../payloads/eepro100--filo_btext.zelf
end
romimage "fallback"
@@ -235,8 +241,12 @@ romimage "fallback"
option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
mainboard tyan/s2850
-# payload ../../tg3--ide_disk_dev.zelf
- payload ../../eepro100--ide_diskx.zelf
+# payload ../../../payloads/eepro100--ide_disk.zelf
+# payload ../../../payloads/filo.elf
+# payload ../../../payloads/filo_mem.elf
+# payload ../../../payloads/filo_mem_btext.elf
+# payload ../../../payloads/filo_btext.zelf
+ payload ../../../payloads/eepro100--filo_btext.zelf
end
buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2875/Config.lb b/targets/tyan/s2875/Config.lb
index 5d7bee9f19..42a0b99b50 100644
--- a/targets/tyan/s2875/Config.lb
+++ b/targets/tyan/s2875/Config.lb
@@ -41,7 +41,8 @@ uses USE_FALLBACK_IMAGE
uses USE_OPTION_TABLE
uses HAVE_OPTION_TABLE
uses CONFIG_CHIP_CONFIGURE
-
+
+#uses CONFIG_CONSOLE_BTEXT
uses CONFIG_CONSOLE_SERIAL8250
uses TTYS0_BAUD
uses DEFAULT_CONSOLE_LOGLEVEL
@@ -75,6 +76,7 @@ option k7=1
option k8=1
option ROM_SIZE=524288
+#option CONFIG_CONSOLE_BTEXT=1
#option CONFIG_VGABIOS=1
#option CONFIG_REALMODE_IDT=1
#option CONFIG_PCIBIOS=1
@@ -216,7 +218,12 @@ romimage "normal"
option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
mainboard tyan/s2875
- payload ../../e1000--ide_disk.zelf
+# payload ../../../payloads/e1000--ide_disk.zelf
+# payload ../../../payloads/filo.elf
+# payload ../../../payloads/filo_mem.elf
+# payload ../../../payloads/filo_mem_btext.elf
+# payload ../../../payloads/filo.zelf
+ payload ../../../payloads/e1000--filo.zelf
end
romimage "fallback"
@@ -234,8 +241,12 @@ romimage "fallback"
option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
mainboard tyan/s2875
- payload ../../e1000--ide_disk.zelf
-# payload ../../filo.elf.d
+# payload ../../../payloads/e1000--ide_disk.zelf
+# payload ../../../payloads/filo.elf
+# payload ../../../payloads/filo_mem.elf
+# payload ../../../payloads/filo_mem_btext.elf
+# payload ../../../payloads/filo.zelf
+ payload ../../../payloads/e1000--filo.zelf
end
buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2880/Config.lb b/targets/tyan/s2880/Config.lb
index b0de50850a..df1a518976 100644
--- a/targets/tyan/s2880/Config.lb
+++ b/targets/tyan/s2880/Config.lb
@@ -42,6 +42,7 @@ uses USE_OPTION_TABLE
uses HAVE_OPTION_TABLE
uses CONFIG_CHIP_CONFIGURE
+uses CONFIG_CONSOLE_BTEXT
uses CONFIG_CONSOLE_SERIAL8250
uses TTYS0_BAUD
uses DEFAULT_CONSOLE_LOGLEVEL
@@ -79,6 +80,7 @@ option k7=1
option k8=1
option ROM_SIZE=524288
+option CONFIG_CONSOLE_BTEXT=1
#option CONFIG_VGABIOS=0
#option CONFIG_REALMODE_IDT=0
#option CONFIG_PCIBIOS=0
@@ -170,9 +172,9 @@ option TTYS0_BAUD=115200
## SPEW 9 Way too many details
## Request this level of debugging output
-option DEFAULT_CONSOLE_LOGLEVEL=8
+option DEFAULT_CONSOLE_LOGLEVEL=7
## At a maximum only compile in this level of debugging
-option MAXIMUM_CONSOLE_LOGLEVEL=8
+option MAXIMUM_CONSOLE_LOGLEVEL=7
option DEBUG=1
@@ -202,7 +204,7 @@ option CONFIG_ROM_STREAM = 1
#
romimage "normal"
# 48K for SCSI FW
- option ROM_SIZE = 475136
+# option ROM_SIZE = 475136
# 48K for SCSI FW and 48K for ATI ROM
# option ROM_SIZE = 425984
option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
@@ -220,7 +222,12 @@ romimage "normal"
option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
mainboard tyan/s2880
- payload ../../tg3--ide_disk.zelf
+# payload ../../../payloads/tg3--ide_disk.zelf
+# payload ../../../payloads/filo.elf
+# payload ../../../payloads/filo_mem.elf
+# payload ../../../payloads/filo_mem_btext.elf
+# payload ../../../payloads/filo_btext.zelf
+ payload ../../../payloads/tg3--filo_btext.zelf
end
romimage "fallback"
@@ -238,7 +245,12 @@ romimage "fallback"
option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
mainboard tyan/s2880
- payload ../../tg3--ide_disk.zelf
+# payload ../../../payloads/tg3--ide_disk.zelf
+# payload ../../../payloads/filo.elf
+# payload ../../../payloads/filo_mem.elf
+# payload ../../../payloads/filo_mem_btext.elf
+# payload ../../../payloads/filo_btext.zelf
+ payload ../../../payloads/tg3--filo_btext.zelf
end
buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2881/Config.lb b/targets/tyan/s2881/Config.lb
index 4b2c8af8a8..cd0b3f0e68 100644
--- a/targets/tyan/s2881/Config.lb
+++ b/targets/tyan/s2881/Config.lb
@@ -41,7 +41,8 @@ uses USE_FALLBACK_IMAGE
uses USE_OPTION_TABLE
uses HAVE_OPTION_TABLE
uses CONFIG_CHIP_CONFIGURE
-
+
+uses CONFIG_CONSOLE_BTEXT
uses CONFIG_CONSOLE_SERIAL8250
uses TTYS0_BAUD
uses DEFAULT_CONSOLE_LOGLEVEL
@@ -78,6 +79,7 @@ option k7=1
option k8=1
option ROM_SIZE=524288
+option CONFIG_CONSOLE_BTEXT=1
#option CONFIG_VGABIOS=0
#option CONFIG_REALMODE_IDT=0
#option CONFIG_PCIBIOS=0
@@ -169,9 +171,9 @@ option TTYS0_BAUD=115200
## SPEW 9 Way too many details
## Request this level of debugging output
-option DEFAULT_CONSOLE_LOGLEVEL=8
+option DEFAULT_CONSOLE_LOGLEVEL=7
## At a maximum only compile in this level of debugging
-option MAXIMUM_CONSOLE_LOGLEVEL=8
+option MAXIMUM_CONSOLE_LOGLEVEL=7
option DEBUG=1
@@ -205,7 +207,7 @@ romimage "normal"
# 48K for SCSI FW and 48K for ATI ROM
# option ROM_SIZE = 425984
# 64K for Etherboot
- option ROM_SIZE = 458752
+# option ROM_SIZE = 458752
option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
option USE_FALLBACK_IMAGE=0
option ROM_SECTION_SIZE = (ROM_SIZE - FALLBACK_SIZE)
@@ -220,8 +222,12 @@ romimage "normal"
option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
mainboard tyan/s2881
-# payload ../../../payloads/tg3--ide_disk.zelf
- payload ../../../payloads/filo.elf
+# payload ../../../payloads/tg3--ide_disk.zelf
+# payload ../../../payloads/filo.elf
+# payload ../../../payloads/filo_mem.elf
+# payload ../../../payloads/filo_mem_btext.elf
+# payload ../../../payloads/filo_btext.zelf
+ payload ../../../payloads/tg3--filo_btext.zelf
end
romimage "fallback"
@@ -239,8 +245,12 @@ romimage "fallback"
option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
mainboard tyan/s2881
-# payload ../../../payloads/tg3--ide_disk.zelf
- payload ../../../payloads/filo_mem.elf
+# payload ../../../payloads/tg3--ide_disk.zelf
+# payload ../../../payloads/filo.elf
+# payload ../../../payloads/filo_mem.elf
+# payload ../../../payloads/filo_mem_btext.elf
+# payload ../../../payloads/filo_btext.zelf
+ payload ../../../payloads/tg3--filo_btext.zelf
end
buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2882/Config.lb b/targets/tyan/s2882/Config.lb
index 69da1350e1..c05e08d608 100644
--- a/targets/tyan/s2882/Config.lb
+++ b/targets/tyan/s2882/Config.lb
@@ -58,6 +58,9 @@ uses LINUXBIOS_EXTRA_VERSION
uses XIP_ROM_SIZE
uses XIP_ROM_BASE
+uses CONFIG_FS_STREAM
+uses CONFIG_IDE
+
uses HAVE_HARD_RESET
#uses CONFIG_VGABIOS
@@ -89,6 +92,9 @@ option CONFIG_CONSOLE_BTEXT=1
#option VGABIOS_START=0xfff8c000
#option SCSIFW_START=0xfff80000
+#option CONFIG_FS_STREAM=1
+#option CONFIG_IDE=1
+
option HAVE_FALLBACK_BOOT=1
# use the new chip configure code.
@@ -213,7 +219,7 @@ romimage "normal"
# 48K for SCSI FW and 48K for ATI ROM
# option ROM_SIZE = 425984
# 64K for Etherboot
- option ROM_SIZE = 458752
+# option ROM_SIZE = 458752
option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
option USE_FALLBACK_IMAGE=0
option ROM_SECTION_SIZE = (ROM_SIZE - FALLBACK_SIZE)
@@ -230,7 +236,10 @@ romimage "normal"
mainboard tyan/s2882
# payload ../../../payloads/tg3--ide_disk.zelf
# payload ../../../payloads/filo.elf
- payload ../../../payloads/filo_mem_btext.elf
+# payload ../../../payloads/filo_mem.elf
+# payload ../../../payloads/filo_mem_btext.elf
+# payload ../../../payloads/filo_btext.zelf
+ payload ../../../payloads/tg3--filo_btext.zelf
# SMDC support
# payload ../../tg3--ide_disk_com1_2.zelf
end
@@ -252,7 +261,9 @@ romimage "fallback"
mainboard tyan/s2882
# payload ../../../payloads/tg3--ide_disk.zelf
# payload ../../../payloads/filo_mem.elf
- payload ../../../payloads/filo_mem_btext.elf
+# payload ../../../payloads/filo_mem_btext.elf
+ payload ../../../payloads/tg3_btext.zelf
+
#SMDC support
# payload ../../tg3--ide_disk_com1_2.zelf
end
diff --git a/targets/tyan/s2885/Config.lb b/targets/tyan/s2885/Config.lb
index e5ba9c8fb1..19b7016f74 100644
--- a/targets/tyan/s2885/Config.lb
+++ b/targets/tyan/s2885/Config.lb
@@ -203,7 +203,7 @@ romimage "normal"
# 48K for SCSI FW and 48K for ATI ROM
# option ROM_SIZE = 425984
# 64K for Etherboot
- option ROM_SIZE = 458752
+# option ROM_SIZE = 458752
option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
option USE_FALLBACK_IMAGE=0
option ROM_SECTION_SIZE = (ROM_SIZE - FALLBACK_SIZE)
@@ -218,8 +218,11 @@ romimage "normal"
option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
mainboard tyan/s2885
-# payload ../../../payloads/tg3--ide_disk.zelf
- payload ../../../payloads/filo_mem.elf
+# payload ../../../payloads/tg3--ide_disk.zelf
+# payload ../../../payloads/filo.elf
+# payload ../../../payloads/filo_mem.elf
+# payload ../../../payloads/filo.zelf
+ payload ../../../payloads/tg3--filo.zelf
end
romimage "fallback"
@@ -237,8 +240,11 @@ romimage "fallback"
option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
mainboard tyan/s2885
-# payload ../../../payloads/tg3--ide_disk.zelf
- payload ../../../payloads/filo_mem.elf
+# payload ../../../payloads/tg3--ide_disk.zelf
+# payload ../../../payloads/filo.elf
+# payload ../../../payloads/filo_mem.elf
+# payload ../../../payloads/filo.zelf
+ payload ../../../payloads/tg3--filo.zelf
end
buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s4880/Config.lb b/targets/tyan/s4880/Config.lb
index 114cfcaab3..efd636d748 100644
--- a/targets/tyan/s4880/Config.lb
+++ b/targets/tyan/s4880/Config.lb
@@ -41,7 +41,8 @@ uses USE_FALLBACK_IMAGE
uses USE_OPTION_TABLE
uses HAVE_OPTION_TABLE
uses CONFIG_CHIP_CONFIGURE
-
+
+#uses CONFIG_CONSOLE_BTEXT
uses CONFIG_CONSOLE_SERIAL8250
uses TTYS0_BAUD
uses DEFAULT_CONSOLE_LOGLEVEL
@@ -78,6 +79,7 @@ option k7=1
option k8=1
option ROM_SIZE=524288
+#option CONFIG_CONSOLE_BTEXT=1
#option CONFIG_VGABIOS=0
#option CONFIG_REALMODE_IDT=0
#option CONFIG_PCIBIOS=0
@@ -201,7 +203,7 @@ option CONFIG_ROM_STREAM = 1
#
romimage "normal"
# 48K for SCSI FW
- option ROM_SIZE = 475136
+# option ROM_SIZE = 475136
# 48K for SCSI FW and 48K for ATI ROM
# option ROM_SIZE = 425984
option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
@@ -218,7 +220,14 @@ romimage "normal"
option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
mainboard tyan/s4880
- payload ../../tg3--ide_disk.zelf
+# payload ../../../payloads/tg3--ide_disk.zelf
+# payload ../../../payloads/filo.elf
+# payload ../../../payloads/filo_mem.elf
+# payload ../../../payloads/filo_mem_btext.elf
+# payload ../../../payloads/filo_btext.zelf
+# payload ../../../payloads/tg3--filo_btext.zelf
+# payload ../../../payloads/filo.zelf
+ payload ../../../payloads/tg3--filo.zelf
end
romimage "fallback"
@@ -236,8 +245,14 @@ romimage "fallback"
option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
mainboard tyan/s4880
-# payload ../../tg3--ide_disk.zelf
- payload ../../filo.elf.d
+# payload ../../../payloads/tg3--ide_disk.zelf
+# payload ../../../payloads/filo.elf
+# payload ../../../payloads/filo_mem.elf
+# payload ../../../payloads/filo_mem_btext.elf
+# payload ../../../payloads/filo_btext.zelf
+# payload ../../../payloads/tg3--filo_btext.zelf
+# payload ../../../payloads/filo.zelf
+ payload ../../../payloads/tg3--filo.zelf
end
buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s4882/Config.lb b/targets/tyan/s4882/Config.lb
index 65a09cfa98..025193dc5b 100644
--- a/targets/tyan/s4882/Config.lb
+++ b/targets/tyan/s4882/Config.lb
@@ -41,7 +41,8 @@ uses USE_FALLBACK_IMAGE
uses USE_OPTION_TABLE
uses HAVE_OPTION_TABLE
uses CONFIG_CHIP_CONFIGURE
-
+
+#uses CONFIG_CONSOLE_BTEXT
uses CONFIG_CONSOLE_SERIAL8250
uses TTYS0_BAUD
uses DEFAULT_CONSOLE_LOGLEVEL
@@ -78,6 +79,7 @@ option k7=1
option k8=1
option ROM_SIZE=524288
+#option CONFIG_CONSOLE_BTEXT=1
#option CONFIG_VGABIOS=0
#option CONFIG_REALMODE_IDT=0
#option CONFIG_PCIBIOS=0
@@ -201,7 +203,7 @@ option CONFIG_ROM_STREAM = 1
#
romimage "normal"
# 48K for SCSI FW
- option ROM_SIZE = 475136
+# option ROM_SIZE = 475136
# 48K for SCSI FW and 48K for ATI ROM
# option ROM_SIZE = 425984
option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
@@ -218,7 +220,14 @@ romimage "normal"
option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
mainboard tyan/s4882
- payload ../../tg3--ide_disk.zelf
+# payload ../../../payloads/tg3--ide_disk.zelf
+# payload ../../../payloads/filo.elf
+# payload ../../../payloads/filo_mem.elf
+# payload ../../../payloads/filo_mem_btext.elf
+# payload ../../../payloads/filo_btext.zelf
+# payload ../../../payloads/tg3--filo_btext.zelf
+# payload ../../../payloads/filo.zelf
+ payload ../../../payloads/tg3--filo.zelf
end
romimage "fallback"
@@ -236,8 +245,14 @@ romimage "fallback"
option XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE)
mainboard tyan/s4882
- payload ../../tg3--ide_disk.zelf
-# payload ../../filo.elf.d
+# payload ../../../payloads/tg3--ide_disk.zelf
+# payload ../../../payloads/filo.elf
+# payload ../../../payloads/filo_mem.elf
+# payload ../../../payloads/filo_mem_btext.elf
+# payload ../../../payloads/filo_btext.zelf
+# payload ../../../payloads/tg3--filo_btext.zelf
+# payload ../../../payloads/filo.zelf
+ payload ../../../payloads/tg3--filo.zelf
end
buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"