From 188e3c2ff06a82f61d7d71e610b32b1a250c0a45 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Thu, 26 Jul 2012 12:46:48 -0700 Subject: Drop mainboard chip.h mainboard_config never worked right, at least not since we've had sconfig. Hence, drop mainboard///chip.h and fix up the mainboards that tried to use it anyways. Change-Id: I7cd403ea188d8a9fd4c1ad15479fa88e02ab8e83 Signed-off-by: Stefan Reinauer Reviewed-on: http://review.coreboot.org/1359 Tested-by: build bot (Jenkins) Reviewed-by: Alexandru Gagniuc Reviewed-by: Ronald G. Minnich --- src/mainboard/supermicro/h8dme/chip.h | 21 --------------------- src/mainboard/supermicro/h8dme/mainboard.c | 1 - src/mainboard/supermicro/h8dmr/chip.h | 24 ------------------------ src/mainboard/supermicro/h8dmr/mainboard.c | 1 - src/mainboard/supermicro/h8dmr_fam10/chip.h | 24 ------------------------ src/mainboard/supermicro/h8dmr_fam10/mainboard.c | 1 - src/mainboard/supermicro/h8qgi/chip.h | 23 ----------------------- src/mainboard/supermicro/h8qgi/mainboard.c | 1 - src/mainboard/supermicro/h8qme_fam10/chip.h | 24 ------------------------ src/mainboard/supermicro/h8qme_fam10/mainboard.c | 1 - src/mainboard/supermicro/h8scm_fam10/chip.h | 23 ----------------------- src/mainboard/supermicro/h8scm_fam10/mainboard.c | 5 ----- src/mainboard/supermicro/x6dai_g/chip.h | 3 --- src/mainboard/supermicro/x6dai_g/mainboard.c | 1 - src/mainboard/supermicro/x6dhe_g/chip.h | 3 --- src/mainboard/supermicro/x6dhe_g/mainboard.c | 1 - src/mainboard/supermicro/x6dhe_g2/chip.h | 3 --- src/mainboard/supermicro/x6dhe_g2/mainboard.c | 1 - src/mainboard/supermicro/x6dhr_ig/chip.h | 3 --- src/mainboard/supermicro/x6dhr_ig/mainboard.c | 1 - src/mainboard/supermicro/x6dhr_ig2/chip.h | 3 --- src/mainboard/supermicro/x6dhr_ig2/mainboard.c | 1 - src/mainboard/supermicro/x7db8/chip.h | 21 --------------------- src/mainboard/supermicro/x7db8/mainboard.c | 1 - 24 files changed, 191 deletions(-) delete mode 100644 src/mainboard/supermicro/h8dme/chip.h delete mode 100644 src/mainboard/supermicro/h8dmr/chip.h delete mode 100644 src/mainboard/supermicro/h8dmr_fam10/chip.h delete mode 100644 src/mainboard/supermicro/h8qgi/chip.h delete mode 100644 src/mainboard/supermicro/h8qme_fam10/chip.h delete mode 100644 src/mainboard/supermicro/h8scm_fam10/chip.h delete mode 100644 src/mainboard/supermicro/x6dai_g/chip.h delete mode 100644 src/mainboard/supermicro/x6dhe_g/chip.h delete mode 100644 src/mainboard/supermicro/x6dhe_g2/chip.h delete mode 100644 src/mainboard/supermicro/x6dhr_ig/chip.h delete mode 100644 src/mainboard/supermicro/x6dhr_ig2/chip.h delete mode 100644 src/mainboard/supermicro/x7db8/chip.h (limited to 'src/mainboard/supermicro') diff --git a/src/mainboard/supermicro/h8dme/chip.h b/src/mainboard/supermicro/h8dme/chip.h deleted file mode 100644 index 2076c6f19f..0000000000 --- a/src/mainboard/supermicro/h8dme/chip.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * 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 - */ - -extern struct chip_operations mainboard_ops; - -struct mainboard_config {}; diff --git a/src/mainboard/supermicro/h8dme/mainboard.c b/src/mainboard/supermicro/h8dme/mainboard.c index c1b9635a04..c092c71a35 100644 --- a/src/mainboard/supermicro/h8dme/mainboard.c +++ b/src/mainboard/supermicro/h8dme/mainboard.c @@ -19,7 +19,6 @@ */ #include -#include "chip.h" struct chip_operations mainboard_ops = { CHIP_NAME("Supermicro H8DME Mainboard") diff --git a/src/mainboard/supermicro/h8dmr/chip.h b/src/mainboard/supermicro/h8dmr/chip.h deleted file mode 100644 index ebd990b82f..0000000000 --- a/src/mainboard/supermicro/h8dmr/chip.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007 AMD - * Written by Yinghai Lu for AMD. - * - * 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 - */ - -extern struct chip_operations mainboard_ops; - -struct mainboard_config {}; diff --git a/src/mainboard/supermicro/h8dmr/mainboard.c b/src/mainboard/supermicro/h8dmr/mainboard.c index a00d9e85a6..45536af72d 100644 --- a/src/mainboard/supermicro/h8dmr/mainboard.c +++ b/src/mainboard/supermicro/h8dmr/mainboard.c @@ -20,7 +20,6 @@ */ #include -#include "chip.h" struct chip_operations mainboard_ops = { CHIP_NAME("Supermicro H8DMR Mainboard") diff --git a/src/mainboard/supermicro/h8dmr_fam10/chip.h b/src/mainboard/supermicro/h8dmr_fam10/chip.h deleted file mode 100644 index ebd990b82f..0000000000 --- a/src/mainboard/supermicro/h8dmr_fam10/chip.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007 AMD - * Written by Yinghai Lu for AMD. - * - * 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 - */ - -extern struct chip_operations mainboard_ops; - -struct mainboard_config {}; diff --git a/src/mainboard/supermicro/h8dmr_fam10/mainboard.c b/src/mainboard/supermicro/h8dmr_fam10/mainboard.c index e59a980151..24736a9881 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/mainboard.c +++ b/src/mainboard/supermicro/h8dmr_fam10/mainboard.c @@ -20,7 +20,6 @@ */ #include -#include "chip.h" struct chip_operations mainboard_ops = { CHIP_NAME("Supermicro H8DMR Mainboard (Family 10)") diff --git a/src/mainboard/supermicro/h8qgi/chip.h b/src/mainboard/supermicro/h8qgi/chip.h deleted file mode 100644 index a252705293..0000000000 --- a/src/mainboard/supermicro/h8qgi/chip.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011 Advanced Micro Devices, Inc. - * - * 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 - */ - - -extern struct chip_operations mainboard_ops; - -struct mainboard_config {}; diff --git a/src/mainboard/supermicro/h8qgi/mainboard.c b/src/mainboard/supermicro/h8qgi/mainboard.c index f6d437eab2..1f02c73cc8 100644 --- a/src/mainboard/supermicro/h8qgi/mainboard.c +++ b/src/mainboard/supermicro/h8qgi/mainboard.c @@ -26,7 +26,6 @@ #include #include #include -#include "chip.h" void set_pcie_dereset(void *nbconfig); void set_pcie_reset(void *nbconfig); diff --git a/src/mainboard/supermicro/h8qme_fam10/chip.h b/src/mainboard/supermicro/h8qme_fam10/chip.h deleted file mode 100644 index ebd990b82f..0000000000 --- a/src/mainboard/supermicro/h8qme_fam10/chip.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007 AMD - * Written by Yinghai Lu for AMD. - * - * 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 - */ - -extern struct chip_operations mainboard_ops; - -struct mainboard_config {}; diff --git a/src/mainboard/supermicro/h8qme_fam10/mainboard.c b/src/mainboard/supermicro/h8qme_fam10/mainboard.c index 45b09201bb..647f623b90 100644 --- a/src/mainboard/supermicro/h8qme_fam10/mainboard.c +++ b/src/mainboard/supermicro/h8qme_fam10/mainboard.c @@ -20,7 +20,6 @@ */ #include -#include "chip.h" struct chip_operations mainboard_ops = { CHIP_NAME("Supermicro H8QME-2+ Mainboard (Family 10)") diff --git a/src/mainboard/supermicro/h8scm_fam10/chip.h b/src/mainboard/supermicro/h8scm_fam10/chip.h deleted file mode 100644 index a98b97e98c..0000000000 --- a/src/mainboard/supermicro/h8scm_fam10/chip.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2010 Advanced Micro Devices, Inc. - * - * 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 - */ - - -extern struct chip_operations mainboard_ops; - -struct mainboard_config {}; diff --git a/src/mainboard/supermicro/h8scm_fam10/mainboard.c b/src/mainboard/supermicro/h8scm_fam10/mainboard.c index d0fb54145d..e5a58fe021 100644 --- a/src/mainboard/supermicro/h8scm_fam10/mainboard.c +++ b/src/mainboard/supermicro/h8scm_fam10/mainboard.c @@ -27,7 +27,6 @@ #include #include #include -#include "chip.h" void set_pcie_reset(void); @@ -73,10 +72,6 @@ void set_pcie_dereset(void) *************************************************/ static void h8scm_enable(device_t dev) { - /* Leave it for furture use. */ - /* struct mainboard_config *mainboard = - (struct mainboard_config *)dev->chip_info; */ - printk(BIOS_INFO, "Mainboard H8SCM Enable. dev=0x%p\n", dev); msr_t msr, msr2; diff --git a/src/mainboard/supermicro/x6dai_g/chip.h b/src/mainboard/supermicro/x6dai_g/chip.h deleted file mode 100644 index d138e51b94..0000000000 --- a/src/mainboard/supermicro/x6dai_g/chip.h +++ /dev/null @@ -1,3 +0,0 @@ -extern struct chip_operations mainboard_ops; - -struct mainboard_config {}; diff --git a/src/mainboard/supermicro/x6dai_g/mainboard.c b/src/mainboard/supermicro/x6dai_g/mainboard.c index 1db8cd4b4b..d9b4bc4098 100644 --- a/src/mainboard/supermicro/x6dai_g/mainboard.c +++ b/src/mainboard/supermicro/x6dai_g/mainboard.c @@ -1,5 +1,4 @@ #include -#include "chip.h" struct chip_operations mainboard_ops = { CHIP_NAME("Supermicro X6DAi-G Mainboard") diff --git a/src/mainboard/supermicro/x6dhe_g/chip.h b/src/mainboard/supermicro/x6dhe_g/chip.h deleted file mode 100644 index d138e51b94..0000000000 --- a/src/mainboard/supermicro/x6dhe_g/chip.h +++ /dev/null @@ -1,3 +0,0 @@ -extern struct chip_operations mainboard_ops; - -struct mainboard_config {}; diff --git a/src/mainboard/supermicro/x6dhe_g/mainboard.c b/src/mainboard/supermicro/x6dhe_g/mainboard.c index a242dddcb3..c09c95af3a 100644 --- a/src/mainboard/supermicro/x6dhe_g/mainboard.c +++ b/src/mainboard/supermicro/x6dhe_g/mainboard.c @@ -1,5 +1,4 @@ #include -#include "chip.h" struct chip_operations mainboard_ops = { CHIP_NAME("Supermicro X6DHE-G Mainboard") diff --git a/src/mainboard/supermicro/x6dhe_g2/chip.h b/src/mainboard/supermicro/x6dhe_g2/chip.h deleted file mode 100644 index d138e51b94..0000000000 --- a/src/mainboard/supermicro/x6dhe_g2/chip.h +++ /dev/null @@ -1,3 +0,0 @@ -extern struct chip_operations mainboard_ops; - -struct mainboard_config {}; diff --git a/src/mainboard/supermicro/x6dhe_g2/mainboard.c b/src/mainboard/supermicro/x6dhe_g2/mainboard.c index fdb67cc983..c20a84279c 100644 --- a/src/mainboard/supermicro/x6dhe_g2/mainboard.c +++ b/src/mainboard/supermicro/x6dhe_g2/mainboard.c @@ -1,5 +1,4 @@ #include -#include "chip.h" struct chip_operations mainboard_ops = { CHIP_NAME("Supermicro X6DHE-G2 Mainboard") diff --git a/src/mainboard/supermicro/x6dhr_ig/chip.h b/src/mainboard/supermicro/x6dhr_ig/chip.h deleted file mode 100644 index d138e51b94..0000000000 --- a/src/mainboard/supermicro/x6dhr_ig/chip.h +++ /dev/null @@ -1,3 +0,0 @@ -extern struct chip_operations mainboard_ops; - -struct mainboard_config {}; diff --git a/src/mainboard/supermicro/x6dhr_ig/mainboard.c b/src/mainboard/supermicro/x6dhr_ig/mainboard.c index 51acb86d89..3875fe0910 100644 --- a/src/mainboard/supermicro/x6dhr_ig/mainboard.c +++ b/src/mainboard/supermicro/x6dhr_ig/mainboard.c @@ -1,5 +1,4 @@ #include -#include "chip.h" struct chip_operations mainboard_ops = { CHIP_NAME("Supermicro X6DHR-iG Mainboard") diff --git a/src/mainboard/supermicro/x6dhr_ig2/chip.h b/src/mainboard/supermicro/x6dhr_ig2/chip.h deleted file mode 100644 index d138e51b94..0000000000 --- a/src/mainboard/supermicro/x6dhr_ig2/chip.h +++ /dev/null @@ -1,3 +0,0 @@ -extern struct chip_operations mainboard_ops; - -struct mainboard_config {}; diff --git a/src/mainboard/supermicro/x6dhr_ig2/mainboard.c b/src/mainboard/supermicro/x6dhr_ig2/mainboard.c index 6b6c64ff12..981aee8c6b 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/mainboard.c +++ b/src/mainboard/supermicro/x6dhr_ig2/mainboard.c @@ -1,5 +1,4 @@ #include -#include "chip.h" struct chip_operations mainboard_ops = { CHIP_NAME("Supermicro X6DHR-iG2 Mainboard") diff --git a/src/mainboard/supermicro/x7db8/chip.h b/src/mainboard/supermicro/x7db8/chip.h deleted file mode 100644 index 70f9bb43a6..0000000000 --- a/src/mainboard/supermicro/x7db8/chip.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (c) 2011 Sven Schnelle - * - * 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 - */ - -extern struct chip_operations mainboard_ops; -struct mainboard_config {}; diff --git a/src/mainboard/supermicro/x7db8/mainboard.c b/src/mainboard/supermicro/x7db8/mainboard.c index 27a26f92c9..618eca9d4e 100644 --- a/src/mainboard/supermicro/x7db8/mainboard.c +++ b/src/mainboard/supermicro/x7db8/mainboard.c @@ -25,7 +25,6 @@ #include #include #include -#include "chip.h" #include #include #include -- cgit v1.2.3