summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/Config.lb (renamed from src/mainboard/sis/sis761/Config.lb)0
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/Options.lb (renamed from src/mainboard/sis/sis761/Options.lb)0
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/apc_auto.c (renamed from src/mainboard/sis/sis761/apc_auto.c)0
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/cache_as_ram_auto.c (renamed from src/mainboard/sis/sis761/cache_as_ram_auto.c)0
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/chip.h (renamed from src/mainboard/sis/sis761/chip.h)6
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/cmos.layout (renamed from src/mainboard/sis/sis761/cmos.layout)0
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c (renamed from src/mainboard/sis/sis761/get_bus_conf.c)0
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c (renamed from src/mainboard/sis/sis761/irq_tables.c)0
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/mainboard.c (renamed from src/mainboard/sis/sis761/mainboard.c)4
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/mptable.c (renamed from src/mainboard/sis/sis761/mptable.c)4
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/resourcemap.c (renamed from src/mainboard/sis/sis761/resourcemap.c)0
-rw-r--r--targets/gigabyte/ga_2761gxdk/Config-abuild.lb (renamed from targets/sis/sis761/Config-abuild.lb)4
-rw-r--r--targets/gigabyte/ga_2761gxdk/Config.lb70
-rw-r--r--targets/gigabyte/ga_2761gxdk/README3
-rw-r--r--targets/gigabyte/ga_2761gxdk/VERSION1
-rw-r--r--targets/sis/sis761/Config.lb117
-rw-r--r--targets/sis/sis761/README3
-rw-r--r--targets/sis/sis761/VERSION1
18 files changed, 82 insertions, 131 deletions
diff --git a/src/mainboard/sis/sis761/Config.lb b/src/mainboard/gigabyte/ga_2761gxdk/Config.lb
index 46a847f769..46a847f769 100644
--- a/src/mainboard/sis/sis761/Config.lb
+++ b/src/mainboard/gigabyte/ga_2761gxdk/Config.lb
diff --git a/src/mainboard/sis/sis761/Options.lb b/src/mainboard/gigabyte/ga_2761gxdk/Options.lb
index a7832bc078..a7832bc078 100644
--- a/src/mainboard/sis/sis761/Options.lb
+++ b/src/mainboard/gigabyte/ga_2761gxdk/Options.lb
diff --git a/src/mainboard/sis/sis761/apc_auto.c b/src/mainboard/gigabyte/ga_2761gxdk/apc_auto.c
index 7e4eddaa5c..7e4eddaa5c 100644
--- a/src/mainboard/sis/sis761/apc_auto.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/apc_auto.c
diff --git a/src/mainboard/sis/sis761/cache_as_ram_auto.c b/src/mainboard/gigabyte/ga_2761gxdk/cache_as_ram_auto.c
index 732027adca..732027adca 100644
--- a/src/mainboard/sis/sis761/cache_as_ram_auto.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/cache_as_ram_auto.c
diff --git a/src/mainboard/sis/sis761/chip.h b/src/mainboard/gigabyte/ga_2761gxdk/chip.h
index 8d6d00cac6..a93dc54917 100644
--- a/src/mainboard/sis/sis761/chip.h
+++ b/src/mainboard/gigabyte/ga_2761gxdk/chip.h
@@ -21,9 +21,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-extern struct chip_operations mainboard_sis_sis761_ops;
+extern struct chip_operations mainboard_gigabyte_ga_2761gxdk_ops;
-struct mainboard_sis_sis761_config {
-// int fixup_scsi;
-// int fixup_vga;
+struct mainboard_gigabyte_ga_2761gxdk_config {
};
diff --git a/src/mainboard/sis/sis761/cmos.layout b/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
index 84a5c52278..84a5c52278 100644
--- a/src/mainboard/sis/sis761/cmos.layout
+++ b/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
diff --git a/src/mainboard/sis/sis761/get_bus_conf.c b/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c
index d8b0c0ab5a..d8b0c0ab5a 100644
--- a/src/mainboard/sis/sis761/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c
diff --git a/src/mainboard/sis/sis761/irq_tables.c b/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c
index c87b9d6954..c87b9d6954 100644
--- a/src/mainboard/sis/sis761/irq_tables.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c
diff --git a/src/mainboard/sis/sis761/mainboard.c b/src/mainboard/gigabyte/ga_2761gxdk/mainboard.c
index 9e21efdce8..b8b6a189f9 100644
--- a/src/mainboard/sis/sis761/mainboard.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/mainboard.c
@@ -29,7 +29,7 @@
#include "chip.h"
#if CONFIG_CHIP_NAME == 1
-struct chip_operations mainboard_sis_sis761_ops = {
- CHIP_NAME("SiS SiS761GX/SiS966 Mainboard")
+struct chip_operations mainboard_gigabyte_ga_2761gxdk_ops = {
+ CHIP_NAME("GIGABYTE GA-2761GXDK Mainboard")
};
#endif
diff --git a/src/mainboard/sis/sis761/mptable.c b/src/mainboard/gigabyte/ga_2761gxdk/mptable.c
index 047a187aaa..ab54d0c361 100644
--- a/src/mainboard/sis/sis761/mptable.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/mptable.c
@@ -38,8 +38,8 @@ extern unsigned bus_type[256];
void *smp_write_config_table(void *v)
{
static const char sig[4] = "PCMP";
- static const char oem[8] = "SIS";
- static const char productid[12] = "SiS761GX";
+ static const char oem[8] = "GIGABYTE";
+ static const char productid[12] = "GA-2761GXDK ";
struct mp_config_table *mc;
unsigned sbdn;
diff --git a/src/mainboard/sis/sis761/resourcemap.c b/src/mainboard/gigabyte/ga_2761gxdk/resourcemap.c
index 7e23ad9cc9..7e23ad9cc9 100644
--- a/src/mainboard/sis/sis761/resourcemap.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/resourcemap.c
diff --git a/targets/sis/sis761/Config-abuild.lb b/targets/gigabyte/ga_2761gxdk/Config-abuild.lb
index 1334e8c7ec..8b91aed7ba 100644
--- a/targets/sis/sis761/Config-abuild.lb
+++ b/targets/gigabyte/ga_2761gxdk/Config-abuild.lb
@@ -18,8 +18,8 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-target sis_sis761
-mainboard sis/sis761
+target ga_2761gxdk
+mainboard gigabyte/ga_2761gxdk
__COMPRESSION__
diff --git a/targets/gigabyte/ga_2761gxdk/Config.lb b/targets/gigabyte/ga_2761gxdk/Config.lb
new file mode 100644
index 0000000000..890d3e3626
--- /dev/null
+++ b/targets/gigabyte/ga_2761gxdk/Config.lb
@@ -0,0 +1,70 @@
+##
+## 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 ga_2761gxdk
+mainboard gigabyte/ga_2761gxdk
+
+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/filo_uda1.elf
+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/filo_uda1.elf
+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/gigabyte/ga_2761gxdk/README b/targets/gigabyte/ga_2761gxdk/README
new file mode 100644
index 0000000000..ef9cd5a707
--- /dev/null
+++ b/targets/gigabyte/ga_2761gxdk/README
@@ -0,0 +1,3 @@
+## How to append VGA bios?
+
+cat 6330VGA.rom ga_2761gxdk/linuxbios.rom > ga_2761gxdk.bin
diff --git a/targets/gigabyte/ga_2761gxdk/VERSION b/targets/gigabyte/ga_2761gxdk/VERSION
new file mode 100644
index 0000000000..f9823583ab
--- /dev/null
+++ b/targets/gigabyte/ga_2761gxdk/VERSION
@@ -0,0 +1 @@
+_ga_2761gxdk
diff --git a/targets/sis/sis761/Config.lb b/targets/sis/sis761/Config.lb
deleted file mode 100644
index 863cc89c55..0000000000
--- a/targets/sis/sis761/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/sis761/README b/targets/sis/sis761/README
deleted file mode 100644
index 351d743041..0000000000
--- a/targets/sis/sis761/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/sis761/VERSION b/targets/sis/sis761/VERSION
deleted file mode 100644
index 8775da4b7a..0000000000
--- a/targets/sis/sis761/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-_churchill