Stefan Reinauer (stefan.reinauer@coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7118
-gerrit
commit 2fbd3ae19f80aa3f2ba06cc5dc55062bfee0220c Author: Stefan Reinauer stefan.reinauer@coreboot.org Date: Sat Oct 18 10:29:39 2014 +0200
Drop obsolete SuperIOs used by GX1 systems only
Drop two SuperIOs that were only used by GX1 systems, and are not used anymore. * winbond/w83977f * nsc/pc87351
Change-Id: I8a8eacb0f862b5d08ccfd87f8db503b0ab3c5700 Signed-off-by: Stefan Reinauer stefan.reinauer@coreboot.org --- src/superio/nsc/Kconfig | 2 - src/superio/nsc/Makefile.inc | 1 - src/superio/nsc/pc87351/Makefile.inc | 22 --------- src/superio/nsc/pc87351/early_serial.c | 31 ------------- src/superio/nsc/pc87351/pc87351.h | 35 -------------- src/superio/nsc/pc87351/superio.c | 73 ------------------------------ src/superio/winbond/Kconfig | 4 -- src/superio/winbond/Makefile.inc | 1 - src/superio/winbond/w83977f/Makefile.inc | 21 --------- src/superio/winbond/w83977f/early_serial.c | 45 ------------------ src/superio/winbond/w83977f/superio.c | 73 ------------------------------ src/superio/winbond/w83977f/w83977f.h | 34 -------------- 12 files changed, 342 deletions(-)
diff --git a/src/superio/nsc/Kconfig b/src/superio/nsc/Kconfig index 4aa28f8..3753f6b 100644 --- a/src/superio/nsc/Kconfig +++ b/src/superio/nsc/Kconfig @@ -22,8 +22,6 @@ config SUPERIO_NSC_PC8374 bool config SUPERIO_NSC_PC87309 bool -config SUPERIO_NSC_PC87351 - bool config SUPERIO_NSC_PC87360 bool config SUPERIO_NSC_PC87366 diff --git a/src/superio/nsc/Makefile.inc b/src/superio/nsc/Makefile.inc index 1780d2f..79e55af 100644 --- a/src/superio/nsc/Makefile.inc +++ b/src/superio/nsc/Makefile.inc @@ -19,7 +19,6 @@
subdirs-y += pc8374 subdirs-y += pc87309 -subdirs-y += pc87351 subdirs-y += pc87360 subdirs-y += pc87366 subdirs-y += pc87382 diff --git a/src/superio/nsc/pc87351/Makefile.inc b/src/superio/nsc/pc87351/Makefile.inc deleted file mode 100644 index 0aabe12..0000000 --- a/src/superio/nsc/pc87351/Makefile.inc +++ /dev/null @@ -1,22 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2000 AG Electronics Ltd. -## Copyright (C) 2003-2004 Linux Networx -## -## 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 -## - -ramstage-$(CONFIG_SUPERIO_NSC_PC87351) += superio.c diff --git a/src/superio/nsc/pc87351/early_serial.c b/src/superio/nsc/pc87351/early_serial.c deleted file mode 100644 index c34538f..0000000 --- a/src/superio/nsc/pc87351/early_serial.c +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2000 AG Electronics Ltd. - * Copyright (C) 2003-2004 Linux Networx - * - * 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 <arch/io.h> -#include "pc87351.h" - -static void pc87351_enable_serial(device_t dev, u16 iobase) -{ - pnp_set_logical_device(dev); - pnp_set_enable(dev, 0); - pnp_set_iobase(dev, PNP_IDX_IO0, iobase); - pnp_set_enable(dev, 1); -} diff --git a/src/superio/nsc/pc87351/pc87351.h b/src/superio/nsc/pc87351/pc87351.h deleted file mode 100644 index 67b2a95..0000000 --- a/src/superio/nsc/pc87351/pc87351.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2000 AG Electronics Ltd. - * Copyright (C) 2003-2004 Linux Networx - * - * 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 - */ - -#ifndef SUPERIO_NSC_PC87351_PC87351_H -#define SUPERIO_NSC_PC87351_PC87351_H - -#define PC87351_FDC 0x00 /* Floppy */ -#define PC87351_PP 0x01 /* Parallel port */ -#define PC87351_SP2 0x02 /* Com2 */ -#define PC87351_SP1 0x03 /* Com1 */ -#define PC87351_SWC 0x04 /* System wakeup control */ -#define PC87351_KBCM 0x05 /* Mouse */ -#define PC87351_KBCK 0x06 /* Keyboard */ -#define PC87351_GPIO 0x07 /* General purpose IO */ -#define PC87351_FSD 0x08 /* Fan speed device */ - -#endif diff --git a/src/superio/nsc/pc87351/superio.c b/src/superio/nsc/pc87351/superio.c deleted file mode 100644 index 7f395b4..0000000 --- a/src/superio/nsc/pc87351/superio.c +++ /dev/null @@ -1,73 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2000 AG Electronics Ltd. - * Copyright (C) 2003-2004 Linux Networx - * - * 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 <arch/io.h> -#include <device/device.h> -#include <device/pnp.h> -#include <console/console.h> -#include <string.h> -#include <pc80/keyboard.h> -#include <stdlib.h> -#include "pc87351.h" - -static void init(device_t dev) -{ - - if (!dev->enabled) - return; - - switch(dev->path.pnp.device) { - case PC87351_KBCK: - pc_keyboard_init(); - break; - } -} - -static struct device_operations ops = { - .read_resources = pnp_read_resources, - .set_resources = pnp_set_resources, - .enable_resources = pnp_enable_resources, - .enable = pnp_enable, - .init = init, -}; - -static struct pnp_info pnp_dev_info[] = { - { &ops, PC87351_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07fa, 0}, }, - { &ops, PC87351_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x04f8, 0}, }, - { &ops, PC87351_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, {0x07f8, 0}, }, - { &ops, PC87351_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, - { &ops, PC87351_SWC, PNP_IO0 | PNP_IRQ0, {0xfff0, 0}, }, - { &ops, PC87351_KBCM, PNP_IRQ0, }, - { &ops, PC87351_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x07f8, 0}, {0x07f8, 4}, }, - { &ops, PC87351_GPIO, PNP_IO0 | PNP_IRQ0, {0xfff8, 0}, }, - { &ops, PC87351_FSD, PNP_IO0 | PNP_IRQ0, {0xfff8, 0}, }, -}; - -static void enable_dev(struct device *dev) -{ - pnp_enable_devices(dev, &pnp_ops, - ARRAY_SIZE(pnp_dev_info), pnp_dev_info); -} - -struct chip_operations superio_nsc_pc87351_ops = { - CHIP_NAME("NSC PC87351 Super I/O") - .enable_dev = enable_dev, -}; diff --git a/src/superio/winbond/Kconfig b/src/superio/winbond/Kconfig index 1a0e6a8..b72e413 100644 --- a/src/superio/winbond/Kconfig +++ b/src/superio/winbond/Kconfig @@ -47,10 +47,6 @@ config SUPERIO_WINBOND_W83697HF bool select SUPERIO_WINBOND_COMMON_ROMSTAGE
-config SUPERIO_WINBOND_W83977F - bool - select SUPERIO_WINBOND_COMMON_ROMSTAGE - config SUPERIO_WINBOND_W83977TF bool select SUPERIO_WINBOND_COMMON_ROMSTAGE diff --git a/src/superio/winbond/Makefile.inc b/src/superio/winbond/Makefile.inc index 6d14f33..25ab4b4 100644 --- a/src/superio/winbond/Makefile.inc +++ b/src/superio/winbond/Makefile.inc @@ -26,5 +26,4 @@ subdirs-y += w83627hf subdirs-y += w83627thg subdirs-y += w83627uhg subdirs-y += w83697hf -subdirs-y += w83977f subdirs-y += w83977tf diff --git a/src/superio/winbond/w83977f/Makefile.inc b/src/superio/winbond/w83977f/Makefile.inc deleted file mode 100644 index f499d56..0000000 --- a/src/superio/winbond/w83977f/Makefile.inc +++ /dev/null @@ -1,21 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007 Nikolay Petukhov nikolay.petukhov@gmail.com -## -## 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 -## - -ramstage-$(CONFIG_SUPERIO_WINBOND_W83977F) += superio.c diff --git a/src/superio/winbond/w83977f/early_serial.c b/src/superio/winbond/w83977f/early_serial.c deleted file mode 100644 index c572dcb..0000000 --- a/src/superio/winbond/w83977f/early_serial.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007 Nikolay Petukhov nikolay.petukhov@gmail.com - * - * 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 <arch/io.h> -#include "w83977f.h" - -static void pnp_enter_ext_func_mode(device_t dev) -{ - u16 port = dev >> 8; - outb(0x87, port); - outb(0x87, port); -} - -static void pnp_exit_ext_func_mode(device_t dev) -{ - u16 port = dev >> 8; - outb(0xaa, port); -} - -static void w83977f_enable_serial(device_t dev, u16 iobase) -{ - pnp_enter_ext_func_mode(dev); - pnp_set_logical_device(dev); - pnp_set_enable(dev, 0); - pnp_set_iobase(dev, PNP_IDX_IO0, iobase); - pnp_set_enable(dev, 1); - pnp_exit_ext_func_mode(dev); -} diff --git a/src/superio/winbond/w83977f/superio.c b/src/superio/winbond/w83977f/superio.c deleted file mode 100644 index 232f46a..0000000 --- a/src/superio/winbond/w83977f/superio.c +++ /dev/null @@ -1,73 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007 Nikolay Petukhov nikolay.petukhov@gmail.com - * - * 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 <arch/io.h> -#include <device/device.h> -#include <device/pnp.h> -#include <superio/conf_mode.h> -#include <console/console.h> -#include <string.h> -#include <pc80/keyboard.h> -#include <stdlib.h> -#include "w83977f.h" - -static void w83977f_init(device_t dev) -{ - - if (!dev->enabled) - return; - - switch(dev->path.pnp.device) { - case W83977F_KBC: - pc_keyboard_init(); - break; - } -} - -static struct device_operations ops = { - .read_resources = pnp_read_resources, - .set_resources = pnp_set_resources, - .enable_resources = pnp_enable_resources, - .enable = pnp_enable, - .init = w83977f_init, - .ops_pnp_mode = &pnp_conf_mode_8787_aa, -}; - -static struct pnp_info pnp_dev_info[] = { - { &ops, W83977F_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, }, - { &ops, W83977F_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, }, - { &ops, W83977F_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, - { &ops, W83977F_SP2, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, - { &ops, W83977F_RTC, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, - { &ops, W83977F_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, {0x07f8, 0}, {0x07f8, 0}, }, - { &ops, W83977F_IR, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, - { &ops, W83977F_GPIO1, PNP_IO0, {0x07f8, 0}, }, - { &ops, W83977F_GPIO2, PNP_IO0, {0x07f8, 0}, }, -}; - -static void enable_dev(device_t dev) -{ - pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info); -} - -struct chip_operations superio_winbond_w83977f_ops = { - CHIP_NAME("Winbond W83977F Super I/O") - .enable_dev = enable_dev, -}; diff --git a/src/superio/winbond/w83977f/w83977f.h b/src/superio/winbond/w83977f/w83977f.h deleted file mode 100644 index f2b68ed..0000000 --- a/src/superio/winbond/w83977f/w83977f.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007 Nikolay Petukhov nikolay.petukhov@gmail.com - * - * 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 - */ - -#ifndef SUPERIO_WINBOND_W83977F_W83977F_H -#define SUPERIO_WINBOND_W83977F_W83977F_H - -#define W83977F_FDC 0 /* Floppy */ -#define W83977F_PP 1 /* Parallel port */ -#define W83977F_SP1 2 /* Com1 */ -#define W83977F_SP2 3 /* Com2 */ -#define W83977F_RTC 4 /* RTC */ -#define W83977F_KBC 5 /* PS/2 keyboard & mouse */ -#define W83977F_IR 6 /* Infrared port */ -#define W83977F_GPIO1 7 /* General Purpose I/O 1 */ -#define W83977F_GPIO2 8 /* General Purpose I/O 2 */ - -#endif
-
Stefan Reinauer