From 835674b9298b19315ae1ed70c2fc9d82a7f3535b Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Tue, 17 Aug 2010 09:52:01 +0000 Subject: Whatever happened here,... The DEC Tulip is a network card, no bridge of any 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 Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5710 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/drivers/Kconfig | 6 ++- src/drivers/Makefile.inc | 36 +++++++++++++++-- src/drivers/dec/21143/21143.c | 70 ++++++++++++++++++++++++++++++++++ src/drivers/dec/21143/Kconfig | 2 + src/drivers/dec/21143/Makefile.inc | 2 + src/drivers/dec/Kconfig | 1 + src/drivers/dec/Makefile.inc | 1 + src/drivers/sil/3114/Makefile.inc | 2 +- src/mainboard/amd/mahogany/dsdt.asl | 2 +- src/mainboard/tyan/s2881/Kconfig | 2 +- src/mainboard/tyan/s2882/Kconfig | 2 +- src/southbridge/Kconfig | 1 - src/southbridge/Makefile.inc | 1 - src/southbridge/dec/21143/21143.c | 70 ---------------------------------- src/southbridge/dec/21143/Kconfig | 2 - src/southbridge/dec/21143/Makefile.inc | 2 - src/southbridge/dec/Kconfig | 1 - src/southbridge/dec/Makefile.inc | 1 - 18 files changed, 118 insertions(+), 86 deletions(-) create mode 100644 src/drivers/dec/21143/21143.c create mode 100644 src/drivers/dec/21143/Kconfig create mode 100644 src/drivers/dec/21143/Makefile.inc create mode 100644 src/drivers/dec/Kconfig create mode 100644 src/drivers/dec/Makefile.inc delete mode 100644 src/southbridge/dec/21143/21143.c delete mode 100644 src/southbridge/dec/21143/Kconfig delete mode 100644 src/southbridge/dec/21143/Makefile.inc delete mode 100644 src/southbridge/dec/Kconfig delete mode 100644 src/southbridge/dec/Makefile.inc (limited to 'src') diff --git a/src/drivers/Kconfig b/src/drivers/Kconfig index d2ff5d7d9f..da5c7ed154 100644 --- a/src/drivers/Kconfig +++ b/src/drivers/Kconfig @@ -17,9 +17,13 @@ ## 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 + diff --git a/src/drivers/Makefile.inc b/src/drivers/Makefile.inc index e817afc96e..04fa1a6428 100644 --- a/src/drivers/Makefile.inc +++ b/src/drivers/Makefile.inc @@ -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 index 0000000000..62567c8038 --- /dev/null +++ b/src/drivers/dec/21143/21143.c @@ -0,0 +1,70 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2010 Marc Bertens + * + * 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 +#include +#include +#include +#include + +/** + * 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 index 0000000000..82604a65ec --- /dev/null +++ b/src/drivers/dec/21143/Kconfig @@ -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 index 0000000000..a0a84837ba --- /dev/null +++ b/src/drivers/dec/21143/Makefile.inc @@ -0,0 +1,2 @@ +driver-y += 21143.o + diff --git a/src/drivers/dec/Kconfig b/src/drivers/dec/Kconfig new file mode 100644 index 0000000000..c9dfe6483e --- /dev/null +++ b/src/drivers/dec/Kconfig @@ -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 index 0000000000..196c424570 --- /dev/null +++ b/src/drivers/dec/Makefile.inc @@ -0,0 +1 @@ +subdirs-$(CONFIG_DRIVERS_DEC_21143) += 21143 diff --git a/src/drivers/sil/3114/Makefile.inc b/src/drivers/sil/3114/Makefile.inc index 7e5db65987..3af907a5fc 100644 --- a/src/drivers/sil/3114/Makefile.inc +++ b/src/drivers/sil/3114/Makefile.inc @@ -1 +1 @@ -driver-$(CONFIG_DRIVERS_SIL) += sil_sata.o +driver-$(CONFIG_DRIVERS_SIL_3114) += sil_sata.o diff --git a/src/mainboard/amd/mahogany/dsdt.asl b/src/mainboard/amd/mahogany/dsdt.asl index 07d85149ff..981f7284fa 100644 --- a/src/mainboard/amd/mahogany/dsdt.asl +++ b/src/mainboard/amd/mahogany/dsdt.asl @@ -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 */ diff --git a/src/mainboard/tyan/s2881/Kconfig b/src/mainboard/tyan/s2881/Kconfig index e12e95638b..eae991c17a 100644 --- a/src/mainboard/tyan/s2881/Kconfig +++ b/src/mainboard/tyan/s2881/Kconfig @@ -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 diff --git a/src/mainboard/tyan/s2882/Kconfig b/src/mainboard/tyan/s2882/Kconfig index fdb486d151..1c12f41131 100644 --- a/src/mainboard/tyan/s2882/Kconfig +++ b/src/mainboard/tyan/s2882/Kconfig @@ -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 diff --git a/src/southbridge/Kconfig b/src/southbridge/Kconfig index b0da86ad2b..77fe385f57 100644 --- a/src/southbridge/Kconfig +++ b/src/southbridge/Kconfig @@ -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 diff --git a/src/southbridge/Makefile.inc b/src/southbridge/Makefile.inc index c78f0ba84a..b7e04dbb1f 100644 --- a/src/southbridge/Makefile.inc +++ b/src/southbridge/Makefile.inc @@ -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 index 62567c8038..0000000000 --- a/src/southbridge/dec/21143/21143.c +++ /dev/null @@ -1,70 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2010 Marc Bertens - * - * 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 -#include -#include -#include -#include - -/** - * 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 index bd6bc6787f..0000000000 --- a/src/southbridge/dec/21143/Kconfig +++ /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 index a0a84837ba..0000000000 --- a/src/southbridge/dec/21143/Makefile.inc +++ /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 index acca5e54ed..0000000000 --- a/src/southbridge/dec/Kconfig +++ /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 index 1e75f34316..0000000000 --- a/src/southbridge/dec/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -subdirs-$(CONFIG_SOUTHBRIDGE_DEC_21143) += 21143 -- cgit v1.2.3