Whatever happened here,... The DEC Tulip is a network card, no bridge of any
authorStefan Reinauer <stepan@coresystems.de>
Tue, 17 Aug 2010 09:52:01 +0000 (09:52 +0000)
committerStefan Reinauer <stepan@openbios.org>
Tue, 17 Aug 2010 09:52:01 +0000 (09:52 +0000)
kind. Move it to drivers and make the necessary adaptions. Also drop empty
drivers/generic/generic and start cleaning up Makefiles in drivers/

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

18 files changed:
src/drivers/Kconfig
src/drivers/Makefile.inc
src/drivers/dec/21143/21143.c [new file with mode: 0644]
src/drivers/dec/21143/Kconfig [new file with mode: 0644]
src/drivers/dec/21143/Makefile.inc [new file with mode: 0644]
src/drivers/dec/Kconfig [new file with mode: 0644]
src/drivers/dec/Makefile.inc [new file with mode: 0644]
src/drivers/sil/3114/Makefile.inc
src/mainboard/amd/mahogany/dsdt.asl
src/mainboard/tyan/s2881/Kconfig
src/mainboard/tyan/s2882/Kconfig
src/southbridge/Kconfig
src/southbridge/Makefile.inc
src/southbridge/dec/21143/21143.c [deleted file]
src/southbridge/dec/21143/Kconfig [deleted file]
src/southbridge/dec/21143/Makefile.inc [deleted file]
src/southbridge/dec/Kconfig [deleted file]
src/southbridge/dec/Makefile.inc [deleted file]

index d2ff5d7d9f09e4abacb1ab3f985caec41edaa2f3..da5c7ed1541574e7fd75f997e3af4c45fcd475cf 100644 (file)
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-config DRIVERS_SIL
+config DRIVERS_SIL_3114
        bool "Silicon Image SIL3114"
        default n
        help
        It sets PCI class to IDE compatible native mode, allowing
        SeaBIOS, FILO etc... to boot from it.
+
+
+source src/drivers/dec/Kconfig
+
index e817afc96e4d14efb56cf2afc65dbefeac60dbc5..04fa1a642818f986b3265747447ffddac116071c 100644 (file)
@@ -1,5 +1,35 @@
-subdirs-y += generic/debug
+##
+## This file is part of the coreboot project.
+##
+## Copyright (C) 2010 coresystems GmbH
+##
+## 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; version 2 of the License.
+##
+## 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
+##
+
+subdirs-y += dec
+
+# should these be cleaned up to behave like all other subdirectories?
+
 subdirs-y += ati/ragexl
+subdirs-y += emulation/qemu
+subdirs-y += generic/debug
+subdirs-y += i2c/adm1026
+subdirs-y += i2c/adm1027
+subdirs-y += i2c/adt7463
+subdirs-y += i2c/i2cmux
+subdirs-y += i2c/i2cmux2
+subdirs-y += i2c/lm63
 subdirs-y += sil/3114
-subdirs-y += ti/pcmcia-cardbus
-subdirs-y += dec/21143
+subdirs-y += trident/blade3d
+
diff --git a/src/drivers/dec/21143/21143.c b/src/drivers/dec/21143/21143.c
new file mode 100644 (file)
index 0000000..62567c8
--- /dev/null
@@ -0,0 +1,70 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2010 Marc Bertens <mbertens@xs4all.nl>
+ *
+ * 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
+ */
+
+#include <device/device.h>
+#include <device/pci_def.h>
+#include <device/pci.h>
+#include <device/pci_ids.h>
+#include <console/console.h>
+
+/**
+ * The following should be set in the mainboard-specific Kconfig file.
+ */
+#if (!defined(CONFIG_DEC21143_CACHE_LINE_SIZE) || \
+     !defined(CONFIG_DEC21143_EXPANSION_ROM_BASE_ADDRESS) || \
+     !defined(CONFIG_DEC21143_COMMAND_AND_STATUS_CONFIGURATION))
+#error "you must supply these values in your mainboard-specific Kconfig file"
+#endif
+
+/* CONFIG_DEC21143_CACHE_LINE_SIZE try 0x00000000 if unsure */
+/* CONFIG_DEC21143_EXPANSION_ROM_BASE_ADDRESS try 0x00000000 if unsure */
+/* CONFIG_DEC21143_COMMAND_AND_STATUS_CONFIGURATION try 0x02800107 or 0x02800007 if unsure */
+
+/**
+ * This driver take the values from Kconfig and load them in the registers
+ */
+static void dec_21143_enable( device_t dev )
+{
+       printk( BIOS_DEBUG, "Init of DECchip 21143 Kconfig style\n");
+       // Command and Status Configuration Register (Offset 0x04)
+       pci_write_config32( dev, 0x04, CONFIG_DEC21143_COMMAND_AND_STATUS_CONFIGURATION );
+       printk( BIOS_DEBUG, "0x04 = %08x (07 01 80 02)\n", pci_read_config32(dev, 0x04) );
+       // Cache Line Size Register (Offset 0x0C)
+       pci_write_config8( dev, 0x0C, CONFIG_DEC21143_CACHE_LINE_SIZE );
+       printk( BIOS_DEBUG, "0x0c = %08x (00 80 00 00)\n", pci_read_config32(dev, 0x0C) );
+       // Expansion ROM Base Address Register (Offset 0x30)
+       pci_write_config32( dev, 0x30, CONFIG_DEC21143_EXPANSION_ROM_BASE_ADDRESS );
+       printk( BIOS_DEBUG, "0x30 = %08x (0x00000000)\n", pci_read_config32(dev, 0x30) );
+       return;
+}
+
+static struct device_operations dec_21143_ops  = {
+        .read_resources   = pci_dev_read_resources,
+        .set_resources    = pci_dev_set_resources,
+        .enable_resources = pci_dev_enable_resources,
+        .init             = dec_21143_enable,
+        .scan_bus         = 0,
+};
+
+static const struct pci_driver dec_21143_driver __pci_driver = {
+        .ops    = &dec_21143_ops,
+        .vendor = PCI_VENDOR_ID_DEC,
+        .device = PCI_DEVICE_ID_DEC_21142,
+};
diff --git a/src/drivers/dec/21143/Kconfig b/src/drivers/dec/21143/Kconfig
new file mode 100644 (file)
index 0000000..82604a6
--- /dev/null
@@ -0,0 +1,2 @@
+config DRIVERS_DEC_21143
+       bool
diff --git a/src/drivers/dec/21143/Makefile.inc b/src/drivers/dec/21143/Makefile.inc
new file mode 100644 (file)
index 0000000..a0a8483
--- /dev/null
@@ -0,0 +1,2 @@
+driver-y += 21143.o
+
diff --git a/src/drivers/dec/Kconfig b/src/drivers/dec/Kconfig
new file mode 100644 (file)
index 0000000..c9dfe64
--- /dev/null
@@ -0,0 +1 @@
+source src/drivers/dec/21143/Kconfig
diff --git a/src/drivers/dec/Makefile.inc b/src/drivers/dec/Makefile.inc
new file mode 100644 (file)
index 0000000..196c424
--- /dev/null
@@ -0,0 +1 @@
+subdirs-$(CONFIG_DRIVERS_DEC_21143) += 21143
index 7e5db65987c5ef1cd64ada545fd1569853db679c..3af907a5fcd75a5972de44b2ba168de2c6493139 100644 (file)
@@ -1 +1 @@
-driver-$(CONFIG_DRIVERS_SIL) += sil_sata.o
+driver-$(CONFIG_DRIVERS_SIL_3114) += sil_sata.o
index 07d85149ff1924a417c90e68131d2afb798dbd13..981f7284fabc62d7dcbdecdf4bca09e66c3af682 100644 (file)
@@ -270,7 +270,7 @@ DefinitionBlock (
                        /* Byte offsets are computed using the following technique:
                         * ((bus number + 1) * ((device number * 8) * 4096)) + register offset
                         * The 8 comes from 8 functions per device, and 4096 bytes per function config space
-                       */
+                        */
                        Offset(0x00088024),     /* Byte offset to SATA register 24h - Bus 0, Device 17, Function 0 */
                        STB5, 32,
                        Offset(0x00098042),     /* Byte offset to OHCI0 register 42h - Bus 0, Device 19, Function 0 */
index e12e95638bd274c9d9ba90dceb3e162589651c03..eae991c17afa616a2b740ff3e1f0e2eb395bee1b 100644 (file)
@@ -14,7 +14,7 @@ config BOARD_TYAN_S2881
        select HAVE_MP_TABLE
        select BOARD_ROMSIZE_KB_512
        select SB_HT_CHAIN_UNITID_OFFSET_ONLY
-       select DRIVERS_SIL
+       select DRIVERS_SIL_3114
 
 config MAINBOARD_DIR
        string
index fdb486d1511ef88349593f742a8c435110c2409b..1c12f4113128f182299030bbfb2ca0f568f562b1 100644 (file)
@@ -13,7 +13,7 @@ config BOARD_TYAN_S2882
        select HAVE_MP_TABLE
        select BOARD_ROMSIZE_KB_512
        select SB_HT_CHAIN_UNITID_OFFSET_ONLY
-       select DRIVERS_SIL
+       select DRIVERS_SIL_3114
 
 config MAINBOARD_DIR
        string
index b0da86ad2ba21baaff23774387bc69b51178057d..77fe385f570b8a4849d8082c4b0bfac209591691 100644 (file)
@@ -1,6 +1,5 @@
 source src/southbridge/amd/Kconfig
 source src/southbridge/broadcom/Kconfig
-source src/southbridge/dec/Kconfig
 source src/southbridge/intel/Kconfig
 source src/southbridge/nvidia/Kconfig
 source src/southbridge/ricoh/Kconfig
index c78f0ba84a6f4a93f78c89c69a9a1fcec6da2ec6..b7e04dbb1f3624ca658e9ce4aafcc427ac098d2f 100644 (file)
@@ -1,6 +1,5 @@
 subdirs-y += amd
 subdirs-y += broadcom
-subdirs-y += dec
 subdirs-y += intel
 subdirs-y += nvidia
 subdirs-y += ricoh
diff --git a/src/southbridge/dec/21143/21143.c b/src/southbridge/dec/21143/21143.c
deleted file mode 100644 (file)
index 62567c8..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2010 Marc Bertens <mbertens@xs4all.nl>
- *
- * 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
- */
-
-#include <device/device.h>
-#include <device/pci_def.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <console/console.h>
-
-/**
- * The following should be set in the mainboard-specific Kconfig file.
- */
-#if (!defined(CONFIG_DEC21143_CACHE_LINE_SIZE) || \
-     !defined(CONFIG_DEC21143_EXPANSION_ROM_BASE_ADDRESS) || \
-     !defined(CONFIG_DEC21143_COMMAND_AND_STATUS_CONFIGURATION))
-#error "you must supply these values in your mainboard-specific Kconfig file"
-#endif
-
-/* CONFIG_DEC21143_CACHE_LINE_SIZE try 0x00000000 if unsure */
-/* CONFIG_DEC21143_EXPANSION_ROM_BASE_ADDRESS try 0x00000000 if unsure */
-/* CONFIG_DEC21143_COMMAND_AND_STATUS_CONFIGURATION try 0x02800107 or 0x02800007 if unsure */
-
-/**
- * This driver take the values from Kconfig and load them in the registers
- */
-static void dec_21143_enable( device_t dev )
-{
-       printk( BIOS_DEBUG, "Init of DECchip 21143 Kconfig style\n");
-       // Command and Status Configuration Register (Offset 0x04)
-       pci_write_config32( dev, 0x04, CONFIG_DEC21143_COMMAND_AND_STATUS_CONFIGURATION );
-       printk( BIOS_DEBUG, "0x04 = %08x (07 01 80 02)\n", pci_read_config32(dev, 0x04) );
-       // Cache Line Size Register (Offset 0x0C)
-       pci_write_config8( dev, 0x0C, CONFIG_DEC21143_CACHE_LINE_SIZE );
-       printk( BIOS_DEBUG, "0x0c = %08x (00 80 00 00)\n", pci_read_config32(dev, 0x0C) );
-       // Expansion ROM Base Address Register (Offset 0x30)
-       pci_write_config32( dev, 0x30, CONFIG_DEC21143_EXPANSION_ROM_BASE_ADDRESS );
-       printk( BIOS_DEBUG, "0x30 = %08x (0x00000000)\n", pci_read_config32(dev, 0x30) );
-       return;
-}
-
-static struct device_operations dec_21143_ops  = {
-        .read_resources   = pci_dev_read_resources,
-        .set_resources    = pci_dev_set_resources,
-        .enable_resources = pci_dev_enable_resources,
-        .init             = dec_21143_enable,
-        .scan_bus         = 0,
-};
-
-static const struct pci_driver dec_21143_driver __pci_driver = {
-        .ops    = &dec_21143_ops,
-        .vendor = PCI_VENDOR_ID_DEC,
-        .device = PCI_DEVICE_ID_DEC_21142,
-};
diff --git a/src/southbridge/dec/21143/Kconfig b/src/southbridge/dec/21143/Kconfig
deleted file mode 100644 (file)
index bd6bc67..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-config SOUTHBRIDGE_DEC_21143
-       bool
diff --git a/src/southbridge/dec/21143/Makefile.inc b/src/southbridge/dec/21143/Makefile.inc
deleted file mode 100644 (file)
index a0a8483..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-driver-y += 21143.o
-
diff --git a/src/southbridge/dec/Kconfig b/src/southbridge/dec/Kconfig
deleted file mode 100644 (file)
index acca5e5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-source src/southbridge/dec/21143/Kconfig
diff --git a/src/southbridge/dec/Makefile.inc b/src/southbridge/dec/Makefile.inc
deleted file mode 100644 (file)
index 1e75f34..0000000
+++ /dev/null
@@ -1 +0,0 @@
-subdirs-$(CONFIG_SOUTHBRIDGE_DEC_21143) += 21143