From 779b32beffae83ece727a43f2ce216513bf66c15 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Sun, 15 Oct 2017 14:52:44 -0600 Subject: Intel i855 board & chips: Remove - using LATE_CBMEM_INIT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All boards and chips that are still using LATE_CBMEM_INIT are being removed as previously discussed. If these boards and chips are updated to not use LATE_CBMEM_INIT, they can be restored to the active codebase from the 4.7 branch. chips: northbridge/intel/i855 Mainboards: mainboard/lanner/em8510 Change-Id: Ic9ba0ba7e2b6e602a5749cc531dd705c49e3f08d Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/22029 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki --- src/mainboard/lanner/Kconfig | 16 ------- src/mainboard/lanner/Kconfig.name | 2 - src/mainboard/lanner/em8510/Kconfig | 25 ---------- src/mainboard/lanner/em8510/Kconfig.name | 2 - src/mainboard/lanner/em8510/board_info.txt | 1 - src/mainboard/lanner/em8510/cmos.layout | 28 ----------- src/mainboard/lanner/em8510/devicetree.cb | 56 ---------------------- src/mainboard/lanner/em8510/irq_tables.c | 52 --------------------- src/mainboard/lanner/em8510/romstage.c | 75 ------------------------------ 9 files changed, 257 deletions(-) delete mode 100644 src/mainboard/lanner/Kconfig delete mode 100644 src/mainboard/lanner/Kconfig.name delete mode 100644 src/mainboard/lanner/em8510/Kconfig delete mode 100644 src/mainboard/lanner/em8510/Kconfig.name delete mode 100644 src/mainboard/lanner/em8510/board_info.txt delete mode 100644 src/mainboard/lanner/em8510/cmos.layout delete mode 100644 src/mainboard/lanner/em8510/devicetree.cb delete mode 100644 src/mainboard/lanner/em8510/irq_tables.c delete mode 100644 src/mainboard/lanner/em8510/romstage.c (limited to 'src/mainboard/lanner') diff --git a/src/mainboard/lanner/Kconfig b/src/mainboard/lanner/Kconfig deleted file mode 100644 index 3b304ba9f5..0000000000 --- a/src/mainboard/lanner/Kconfig +++ /dev/null @@ -1,16 +0,0 @@ -if VENDOR_LANNER - -choice - prompt "Mainboard model" - -source "src/mainboard/lanner/*/Kconfig.name" - -endchoice - -source "src/mainboard/lanner/*/Kconfig" - -config MAINBOARD_VENDOR - string - default "Lanner" - -endif # VENDOR_LANNER diff --git a/src/mainboard/lanner/Kconfig.name b/src/mainboard/lanner/Kconfig.name deleted file mode 100644 index 69026c5f5e..0000000000 --- a/src/mainboard/lanner/Kconfig.name +++ /dev/null @@ -1,2 +0,0 @@ -config VENDOR_LANNER - bool "Lanner" diff --git a/src/mainboard/lanner/em8510/Kconfig b/src/mainboard/lanner/em8510/Kconfig deleted file mode 100644 index 2919df9d25..0000000000 --- a/src/mainboard/lanner/em8510/Kconfig +++ /dev/null @@ -1,25 +0,0 @@ -if BOARD_LANNER_EM8510 - -config BOARD_SPECIFIC_OPTIONS # dummy - def_bool y - select CPU_INTEL_SOCKET_MPGA479M - select NORTHBRIDGE_INTEL_I855 - select SOUTHBRIDGE_INTEL_I82801DX - select SUPERIO_WINBOND_W83627THG - select HAVE_OPTION_TABLE - select HAVE_PIRQ_TABLE - select BOARD_ROMSIZE_KB_512 - -config MAINBOARD_DIR - string - default lanner/em8510 - -config MAINBOARD_PART_NUMBER - string - default "EM-8510" - -config IRQ_SLOT_COUNT - int - default 10 - -endif # BOARD_LANNER_EM8510 diff --git a/src/mainboard/lanner/em8510/Kconfig.name b/src/mainboard/lanner/em8510/Kconfig.name deleted file mode 100644 index 1ab59af5b7..0000000000 --- a/src/mainboard/lanner/em8510/Kconfig.name +++ /dev/null @@ -1,2 +0,0 @@ -config BOARD_LANNER_EM8510 - bool "EM-8510" diff --git a/src/mainboard/lanner/em8510/board_info.txt b/src/mainboard/lanner/em8510/board_info.txt deleted file mode 100644 index 31cf7506fb..0000000000 --- a/src/mainboard/lanner/em8510/board_info.txt +++ /dev/null @@ -1 +0,0 @@ -Category: desktop diff --git a/src/mainboard/lanner/em8510/cmos.layout b/src/mainboard/lanner/em8510/cmos.layout deleted file mode 100644 index b8ea9363a4..0000000000 --- a/src/mainboard/lanner/em8510/cmos.layout +++ /dev/null @@ -1,28 +0,0 @@ -entries - -0 384 r 0 reserved_memory -384 1 e 4 boot_option -388 4 h 0 reboot_counter -#392 3 r 0 unused -400 1 e 1 power_on_after_fail -412 4 e 6 debug_level -456 1 e 1 ECC_memory -1008 16 h 0 check_sum - -enumerations - -#ID value text -1 0 Disable -1 1 Enable -2 0 Enable -2 1 Disable -4 0 Fallback -4 1 Normal -6 6 Notice -6 7 Info -6 8 Debug -6 9 Spew - -checksums - -checksum 392 1007 1008 diff --git a/src/mainboard/lanner/em8510/devicetree.cb b/src/mainboard/lanner/em8510/devicetree.cb deleted file mode 100644 index 0a91cc99c0..0000000000 --- a/src/mainboard/lanner/em8510/devicetree.cb +++ /dev/null @@ -1,56 +0,0 @@ -chip northbridge/intel/i855 - device domain 0 on - device pci 0.0 on end - chip southbridge/intel/i82801dx -# pci 11.0 on end -# pci 11.1 on end -# pci 11.2 on end -# pci 11.3 on end -# pci 11.4 on end -# pci 11.5 on end -# pci 11.6 on end -# pci 12.0 on end - register "enable_usb" = "0" - register "enable_native_ide" = "0" - device pci 1f.0 on - chip superio/winbond/w83627thg # link 1 - device pnp 2e.0 on # Floppy - io 0x60 = 0x3f0 - irq 0x70 = 6 - drq 0x74 = 2 - end - device pnp 2e.1 on # Parallel Port - io 0x60 = 0x378 - irq 0x70 = 7 - end - device pnp 2e.2 on # Com1 - io 0x60 = 0x3f8 - irq 0x70 = 4 - end - device pnp 2e.3 on # Com2 - io 0x60 = 0x2f8 - irq 0x70 = 3 - end - device pnp 2e.5 on # Keyboard - io 0x60 = 0x60 - io 0x62 = 0x64 - irq 0x70 = 1 - irq 0x72 = 12 - end - device pnp 2e.7 off end # GAME_MIDI_GIPO1 - device pnp 2e.8 off end # GPIO2 - device pnp 2e.9 off end # GPIO3 - device pnp 2e.a off end # ACPI - device pnp 2e.b on # HW Monitor - io 0x60 = 0x290 - end - end - end - end - end - device cpu_cluster 0 on - chip cpu/intel/socket_mPGA479M - device lapic 0 on end - end - end -end diff --git a/src/mainboard/lanner/em8510/irq_tables.c b/src/mainboard/lanner/em8510/irq_tables.c deleted file mode 100644 index 6e769d713f..0000000000 --- a/src/mainboard/lanner/em8510/irq_tables.c +++ /dev/null @@ -1,52 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2010 Travelping 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; 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. - */ - -#include - -static const struct irq_routing_table intel_irq_routing_table = { - PIRQ_SIGNATURE, /* u32 signature */ - PIRQ_VERSION, /* u16 version */ - 32 + 16 * 10, /* Max. number of devices on the bus */ - 0x00, /* Interrupt router bus */ - (0x1f << 3) | 0x0, /* Interrupt router dev */ - 0x1e20, /* IRQs devoted exclusively to PCI usage */ - 0x8086, /* Vendor */ - 0x24cc, /* Device */ - 0, /* Miniport */ - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* u8 rfu[11] */ - 0x39, /* Checksum (has to be set to some value that - * would give 0 after the sum of all bytes - * for this structure (including checksum). - */ - { - /* bus, dev | fn, {link, bitmap}, {link, bitmap}, {link, bitmap}, {link, bitmap}, slot, rfu */ - {0x01, (0x0f << 3) | 0x0, {{0x62, 0xdeb8}, {0x63, 0xdeb8}, {0x60, 0xdeb8}, {0x61, 0xdeb8}}, 0x1, 0x0}, - {0x01, (0x0a << 3) | 0x0, {{0x62, 0xdeb8}, {0x63, 0xdeb8}, {0x60, 0xdeb8}, {0x61, 0xdeb8}}, 0x2, 0x0}, - {0x01, (0x05 << 3) | 0x0, {{0x68, 0xdeb8}, {0x69, 0xdeb8}, {0x6a, 0xdeb8}, {0x6b, 0xdeb8}}, 0x3, 0x0}, - {0x01, (0x06 << 3) | 0x0, {{0x69, 0xdeb8}, {0x6a, 0xdeb8}, {0x6b, 0xdeb8}, {0x68, 0xdeb8}}, 0x4, 0x0}, - {0x01, (0x07 << 3) | 0x0, {{0x6a, 0xdeb8}, {0x6b, 0xdeb8}, {0x68, 0xdeb8}, {0x69, 0xdeb8}}, 0x5, 0x0}, - {0x01, (0x09 << 3) | 0x0, {{0x6b, 0xdeb8}, {0x68, 0xdeb8}, {0x69, 0xdeb8}, {0x6a, 0xdeb8}}, 0x6, 0x0}, - {0x00, (0x1e << 3) | 0x0, {{0x60, 0xdeb8}, {0x61, 0xdeb8}, {0x62, 0xdeb8}, {0x63, 0xdeb8}}, 0x0, 0x0}, - {0x00, (0x02 << 3) | 0x0, {{0x60, 0xdeb8}, {0x60, 0xdeb8}, {0x60, 0xdeb8}, {0x60, 0xdeb8}}, 0x0, 0x0}, - {0x00, (0x1f << 3) | 0x0, {{0x62, 0xdeb8}, {0x61, 0xdeb8}, {0x60, 0xdeb8}, {0x63, 0xdeb8}}, 0x0, 0x0}, - {0x00, (0x1d << 3) | 0x0, {{0x60, 0xdeb8}, {0x63, 0xdeb8}, {0x62, 0xdeb8}, {0x6b, 0xdeb8}}, 0x0, 0x0}, - } -}; - -unsigned long write_pirq_routing_table(unsigned long addr) -{ - return copy_pirq_routing_table(addr, &intel_irq_routing_table); -} diff --git a/src/mainboard/lanner/em8510/romstage.c b/src/mainboard/lanner/em8510/romstage.c deleted file mode 100644 index 126d942645..0000000000 --- a/src/mainboard/lanner/em8510/romstage.c +++ /dev/null @@ -1,75 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Original take from digitallogic/adl855pc - * - * Copyright (C) 2010 Travelping 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; 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. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "northbridge/intel/i855/debug.c" -#include -#include -#include -#include - -#define SERIAL_DEV PNP_DEV(0x2e, W83627THG_SP1) - -static inline int spd_read_byte(unsigned device, unsigned address) -{ - return smbus_read_byte(device, address); -} - -#include "northbridge/intel/i855/raminit.c" -#include "northbridge/intel/i855/reset_test.c" - -void mainboard_romstage_entry(unsigned long bist) -{ - if (bist == 0) { -#if 0 - enable_lapic(); - init_timer(); -#endif - } - - winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); - console_init(); - - /* Halt if there was a built in self test failure */ - report_bist_failure(bist); - -#if 0 - print_pci_devices(); -#endif - - if (!bios_reset_detected()) { - enable_smbus(); -#if 1 - dump_spd_registers(); - dump_smbus_registers(); -#endif - sdram_set_registers(); - sdram_set_spd_registers(); - sdram_enable(); - } -} -- cgit v1.2.3