diff options
Diffstat (limited to 'src/mainboard/artecgroup/dbe61')
-rw-r--r-- | src/mainboard/artecgroup/dbe61/Options.lb | 4 | ||||
-rw-r--r-- | src/mainboard/artecgroup/dbe61/rtl8139/Config.lb | 2 | ||||
-rw-r--r-- | src/mainboard/artecgroup/dbe61/rtl8139/chip.h | 11 | ||||
-rw-r--r-- | src/mainboard/artecgroup/dbe61/rtl8139/rtl8139.c | 65 |
4 files changed, 2 insertions, 80 deletions
diff --git a/src/mainboard/artecgroup/dbe61/Options.lb b/src/mainboard/artecgroup/dbe61/Options.lb index b42f0d04a7..c5d60bc2fc 100644 --- a/src/mainboard/artecgroup/dbe61/Options.lb +++ b/src/mainboard/artecgroup/dbe61/Options.lb @@ -42,7 +42,7 @@ uses CONFIG_UDELAY_TSC uses CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 uses CONFIG_CONSOLE_VGA uses CONFIG_PCI_ROM_RUN -uses VIDEO_MB +uses CONFIG_VIDEO_MB ## ROM_SIZE is the size of boot ROM that this board will use. default ROM_SIZE = 256*1024 @@ -52,7 +52,7 @@ default ROM_SIZE = 256*1024 ### default CONFIG_CONSOLE_VGA=1 default CONFIG_PCI_ROM_RUN=0 -default VIDEO_MB=8 +default CONFIG_VIDEO_MB=8 ## ## Build code for the fallback boot diff --git a/src/mainboard/artecgroup/dbe61/rtl8139/Config.lb b/src/mainboard/artecgroup/dbe61/rtl8139/Config.lb deleted file mode 100644 index e429dca311..0000000000 --- a/src/mainboard/artecgroup/dbe61/rtl8139/Config.lb +++ /dev/null @@ -1,2 +0,0 @@ -config chip.h -driver rtl8139.o diff --git a/src/mainboard/artecgroup/dbe61/rtl8139/chip.h b/src/mainboard/artecgroup/dbe61/rtl8139/chip.h deleted file mode 100644 index 82cf2a0276..0000000000 --- a/src/mainboard/artecgroup/dbe61/rtl8139/chip.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef PCI_RTL8139_H -#define PCI_RTL8139_H - -struct drivers_pci_rtl8139_config -{ - uint8_t nic_irq; // RTL8139 NIC -}; -//struct chip_operations; -extern struct chip_operations drivers_pci_rtl8139_ops; - -#endif diff --git a/src/mainboard/artecgroup/dbe61/rtl8139/rtl8139.c b/src/mainboard/artecgroup/dbe61/rtl8139/rtl8139.c deleted file mode 100644 index d3f0c5f776..0000000000 --- a/src/mainboard/artecgroup/dbe61/rtl8139/rtl8139.c +++ /dev/null @@ -1,65 +0,0 @@ -#include <console/console.h> -#include <device/device.h> -#include <device/pci.h> -#include <device/pci_ids.h> -#include <device/pci_ops.h> -#undef __KERNEL__ -#include <arch/io.h> -#include <string.h> -#include "chip.h" - -void pci_level_irq(unsigned char intNum); - -// initialize Realtek NIC - -static void nic_initialize(device_t dev) -{ - struct drivers_pci_rtl8139_config *cfg = (struct drivers_pci_rtl8139_config*)dev->chip_info; - uint16_t pciCmd = 0; - - printk_debug("RTL8139 initialize\n"); - - dev->on_mainboard=1; - pci_dev_init(dev); - - // Set PCI IRQ descriptors. - // This configures nothing (no magic done in VSA, too), only descriptors are set, - // that are later read by operating system to find out which irq is used by dev. - // The real GPIO to IRQ mapping configuration takes place in cs5536.c - // and is configurable in Config.lb. - - printk_debug("Setting NIC IRQ to %d\n", cfg->nic_irq); - pci_write_config8(dev, PCI_INTERRUPT_LINE, cfg->nic_irq); - pci_level_irq(cfg->nic_irq); - - // RTL8139 must have bus mastering for some data transfers - pciCmd = pci_read_config16(dev, PCI_COMMAND); - pciCmd |= (PCI_COMMAND_MASTER | PCI_COMMAND_IO); - pci_write_config16(dev, PCI_COMMAND, pciCmd); -} - -// device operations : on PCI device init, call nic_initialize - -static struct device_operations drivers_pci_rtl8139_dev_ops = -{ - .init = nic_initialize, - .read_resources = pci_dev_read_resources, - .set_resources = pci_dev_set_resources, - .enable_resources = pci_dev_enable_resources, - .scan_bus = 0, -}; - - -/* FIRST LOOP : traversing static.c list and enabling all chips found in there - * set given device operations descriptor to call nic_initialize - * */ - -void nic_configure_pci(device_t dev) -{ - dev->ops = &drivers_pci_rtl8139_dev_ops; -} - -// PCI NIC operations -struct chip_operations drivers_pci_rtl8139_ops = { - .enable_dev = nic_configure_pci, -}; |