move target directory to have the same name as the directory in the

mainboard/ path. Also add a Config.lb for abuild. It's required for the
three images variant as abuild doesnt detect this automatically.
Trivial patch - it does not even fix the build yet. Patches welcome.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2906 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/targets/sis/churchill/Config.lb b/targets/sis/churchill/Config.lb
deleted file mode 100644 (file)
index 863cc89..0000000
--- a/targets/sis/churchill/Config.lb
+++ /dev/null
@@ -1,117 +0,0 @@
-##
-## This file is part of the LinuxBIOS project.
-##
-## Copyright (C) 2007 AMD
-## Written by Yinghai Lu <yinghailu@gmail.com> for AMD.
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-##
-
-target churchill
-mainboard sis/sis761
-
-# serengeti_leopard
-
-romimage "normal"
-#       48K for VGA BIOS
-         option ROM_SIZE = 475136
-#       48K for SCSI FW and 48K for ATI ROM
-#        option ROM_SIZE = 425984 
-#       64K for Etherboot
-#        option ROM_SIZE = 458752 
-#       44k for atixx.rom
-#        option ROM_SIZE = 479232
-#       32k for vbios
-#        option ROM_SIZE = 491520
-
-        option USE_FAILOVER_IMAGE=0
-#      option ROM_IMAGE_SIZE=0x13800
-#      option ROM_IMAGE_SIZE=0x18800
-#      option ROM_IMAGE_SIZE=0x19800
-       option ROM_IMAGE_SIZE=0x20000
-#      option ROM_IMAGE_SIZE=0x15800
-       option XIP_ROM_SIZE=0x40000
-       option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
-#       payload ../../../payloads/tg3--ide_disk.zelf
-#       payload ../../../payloads/filo.elf
-#       payload ../../../../payloads/filo.elf
-#       payload ../../../../payloads/filo_hdc1.elf
-        payload ../../../../payloads/filo_uda1.elf
-#       payload ../../../payloads/filo_mem.elf
-#       payload ../../../payloads/filo.zelf
-#       payload ../../../payloads/tg3--filo_hda2.zelf
-#      payload ../../../payloads/tg3.zelf
-#      payload ../../../../payloads/tg3_vga.zelf
-#      payload ../../../../payloads/tg3--filo_hda2_vga.zelf
-#      payload ../../../../payloads/tg3--filo_hda2_vga_5_4.zelf
-#      payload ../../../../payloads/forcedeth--filo_hda2_vga.zelf
-#      payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf
-#       payload  /etc/hosts
-#      payload ../../../payloads/tg3_com2.zelf
-#       payload ../../../payloads/e1000--filo.zelf
-#       payload ../../../payloads/tg3--e1000--filo.zelf
-#       payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
-#      payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_5.3.zelf
-#      payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_com2.zelf
-end
-
-romimage "fallback" 
-        option USE_FAILOVER_IMAGE=0
-       option USE_FALLBACK_IMAGE=1
-#      option ROM_IMAGE_SIZE=0x13800
-#      option ROM_IMAGE_SIZE=0x18800
-#       option ROM_IMAGE_SIZE=0x19800
-       option ROM_IMAGE_SIZE=0x20000
-#      option ROM_IMAGE_SIZE=0x15800
-       option XIP_ROM_SIZE=0x40000
-       option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
-#       payload ../../../payloads/tg3--ide_disk.zelf
-#       payload ../../../payloads/filo.elf
-#       payload ../../../payloads/filo_mem.elf
-#       payload ../../../payloads/filo.zelf
-#       payload ../../../../payloads/filo.elf
-#       payload ../../../../payloads/filo_hdc1.elf
-        payload ../../../../payloads/filo_uda1.elf
-#       payload ../../../payloads/tg3--filo_hda2.zelf
-#      payload ../../../payloads/tg3.zelf
-#      payload ../../../../payloads/tg3_vga.zelf
-#      payload ../../../../payloads/memtest
-#      payload ../../../../payloads/e1000_vga.zelf
-#      payload ../../../../payloads/tg3--filo_hda2_vga.zelf
-#      payload ../../../../payloads/filo_hda.zelf
-#      payload ../../../../payloads/adlo.elf
-#      payload ../../../../payloads/tg3--filo_hda2_vga_5_4.zelf
-#      payload ../../../../payloads/forcedeth_mcp55_filo_hda2.zelf
-#       payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf
-#       payload  /etc/hosts    
-#      payload ../../../../payloads/forcedeth--filo_hda2_vga.zelf
-#      payload ../../../payloads/tg3_com2.zelf
-#       payload ../../../payloads/e1000--filo.zelf
-#       payload ../../../payloads/tg3--e1000--filo.zelf
-#       payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
-#      payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_5.3.zelf
-#      payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_com2.zelf
-end
-
-romimage "failover"
-        option USE_FAILOVER_IMAGE=1
-        option USE_FALLBACK_IMAGE=0
-        option ROM_IMAGE_SIZE=FAILOVER_SIZE
-        option XIP_ROM_SIZE=FAILOVER_SIZE
-        option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
-end
-
-#       buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
-        buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"

diff --git a/targets/sis/churchill/README b/targets/sis/churchill/README
deleted file mode 100644 (file)
index 351d743..0000000
--- a/targets/sis/churchill/README
+++ /dev/null
@@ -1,3 +0,0 @@
-## How to append VGA bios?
-
-cat 6330VGA.rom churchill/linuxbios.rom > churchill.bin

diff --git a/targets/sis/churchill/VERSION b/targets/sis/churchill/VERSION
deleted file mode 100644 (file)
index 8775da4..0000000
--- a/targets/sis/churchill/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-_churchill

diff --git a/targets/sis/sis761/Config-abuild.lb b/targets/sis/sis761/Config-abuild.lb
new file mode 100644 (file)
index 0000000..1334e8c
--- /dev/null
+++ b/targets/sis/sis761/Config-abuild.lb
@@ -0,0 +1,55 @@
+##
+## This file is part of the LinuxBIOS project.
+##
+## Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+##
+
+target sis_sis761
+mainboard sis/sis761
+
+__COMPRESSION__
+
+option ROM_SIZE = 512*1024
+
+romimage "normal"
+        option USE_FAILOVER_IMAGE=0
+       option USE_FALLBACK_IMAGE=0
+       option ROM_IMAGE_SIZE=0x28000
+       option XIP_ROM_SIZE=0x40000
+       option LINUXBIOS_EXTRA_VERSION=".0-Normal"
+       payload __PAYLOAD__
+end
+
+romimage "fallback" 
+        option USE_FAILOVER_IMAGE=0
+       option USE_FALLBACK_IMAGE=1
+       option ROM_IMAGE_SIZE=0x20000
+       option XIP_ROM_SIZE=0x40000
+       option LINUXBIOS_EXTRA_VERSION=".0-Fallback"
+       payload __PAYLOAD__
+end
+
+romimage "failover"
+        option USE_FAILOVER_IMAGE=1
+        option USE_FALLBACK_IMAGE=0
+        option ROM_IMAGE_SIZE=FAILOVER_SIZE
+        option XIP_ROM_SIZE=FAILOVER_SIZE
+        option LINUXBIOS_EXTRA_VERSION=".0-Failover"
+end
+
+
+buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"

diff --git a/targets/sis/sis761/Config.lb b/targets/sis/sis761/Config.lb
new file mode 100644 (file)
index 0000000..863cc89
--- /dev/null
+++ b/targets/sis/sis761/Config.lb
@@ -0,0 +1,117 @@
+##
+## This file is part of the LinuxBIOS project.
+##
+## Copyright (C) 2007 AMD
+## Written by Yinghai Lu <yinghailu@gmail.com> for AMD.
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+##
+
+target churchill
+mainboard sis/sis761
+
+# serengeti_leopard
+
+romimage "normal"
+#       48K for VGA BIOS
+         option ROM_SIZE = 475136
+#       48K for SCSI FW and 48K for ATI ROM
+#        option ROM_SIZE = 425984 
+#       64K for Etherboot
+#        option ROM_SIZE = 458752 
+#       44k for atixx.rom
+#        option ROM_SIZE = 479232
+#       32k for vbios
+#        option ROM_SIZE = 491520
+
+        option USE_FAILOVER_IMAGE=0
+#      option ROM_IMAGE_SIZE=0x13800
+#      option ROM_IMAGE_SIZE=0x18800
+#      option ROM_IMAGE_SIZE=0x19800
+       option ROM_IMAGE_SIZE=0x20000
+#      option ROM_IMAGE_SIZE=0x15800
+       option XIP_ROM_SIZE=0x40000
+       option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+#       payload ../../../payloads/tg3--ide_disk.zelf
+#       payload ../../../payloads/filo.elf
+#       payload ../../../../payloads/filo.elf
+#       payload ../../../../payloads/filo_hdc1.elf
+        payload ../../../../payloads/filo_uda1.elf
+#       payload ../../../payloads/filo_mem.elf
+#       payload ../../../payloads/filo.zelf
+#       payload ../../../payloads/tg3--filo_hda2.zelf
+#      payload ../../../payloads/tg3.zelf
+#      payload ../../../../payloads/tg3_vga.zelf
+#      payload ../../../../payloads/tg3--filo_hda2_vga.zelf
+#      payload ../../../../payloads/tg3--filo_hda2_vga_5_4.zelf
+#      payload ../../../../payloads/forcedeth--filo_hda2_vga.zelf
+#      payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf
+#       payload  /etc/hosts
+#      payload ../../../payloads/tg3_com2.zelf
+#       payload ../../../payloads/e1000--filo.zelf
+#       payload ../../../payloads/tg3--e1000--filo.zelf
+#       payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+#      payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_5.3.zelf
+#      payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_com2.zelf
+end
+
+romimage "fallback" 
+        option USE_FAILOVER_IMAGE=0
+       option USE_FALLBACK_IMAGE=1
+#      option ROM_IMAGE_SIZE=0x13800
+#      option ROM_IMAGE_SIZE=0x18800
+#       option ROM_IMAGE_SIZE=0x19800
+       option ROM_IMAGE_SIZE=0x20000
+#      option ROM_IMAGE_SIZE=0x15800
+       option XIP_ROM_SIZE=0x40000
+       option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+#       payload ../../../payloads/tg3--ide_disk.zelf
+#       payload ../../../payloads/filo.elf
+#       payload ../../../payloads/filo_mem.elf
+#       payload ../../../payloads/filo.zelf
+#       payload ../../../../payloads/filo.elf
+#       payload ../../../../payloads/filo_hdc1.elf
+        payload ../../../../payloads/filo_uda1.elf
+#       payload ../../../payloads/tg3--filo_hda2.zelf
+#      payload ../../../payloads/tg3.zelf
+#      payload ../../../../payloads/tg3_vga.zelf
+#      payload ../../../../payloads/memtest
+#      payload ../../../../payloads/e1000_vga.zelf
+#      payload ../../../../payloads/tg3--filo_hda2_vga.zelf
+#      payload ../../../../payloads/filo_hda.zelf
+#      payload ../../../../payloads/adlo.elf
+#      payload ../../../../payloads/tg3--filo_hda2_vga_5_4.zelf
+#      payload ../../../../payloads/forcedeth_mcp55_filo_hda2.zelf
+#       payload ../../../../payloads/forcedeth--filo_hda2_vga_5_4_2_mcp55.zelf
+#       payload  /etc/hosts    
+#      payload ../../../../payloads/forcedeth--filo_hda2_vga.zelf
+#      payload ../../../payloads/tg3_com2.zelf
+#       payload ../../../payloads/e1000--filo.zelf
+#       payload ../../../payloads/tg3--e1000--filo.zelf
+#       payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
+#      payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_5.3.zelf
+#      payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_com2.zelf
+end
+
+romimage "failover"
+        option USE_FAILOVER_IMAGE=1
+        option USE_FALLBACK_IMAGE=0
+        option ROM_IMAGE_SIZE=FAILOVER_SIZE
+        option XIP_ROM_SIZE=FAILOVER_SIZE
+        option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
+end
+
+#       buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+        buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"

diff --git a/targets/sis/sis761/README b/targets/sis/sis761/README
new file mode 100644 (file)
index 0000000..351d743
--- /dev/null
+++ b/targets/sis/sis761/README
@@ -0,0 +1,3 @@
+## How to append VGA bios?
+
+cat 6330VGA.rom churchill/linuxbios.rom > churchill.bin

diff --git a/targets/sis/sis761/VERSION b/targets/sis/sis761/VERSION
new file mode 100644 (file)
index 0000000..8775da4
--- /dev/null
+++ b/targets/sis/sis761/VERSION
@@ -0,0 +1 @@
+_churchill