From b7c11c6953285f64603a6e1a115b2fdc1505d832 Mon Sep 17 00:00:00 2001 From: Keith Hui Date: Sun, 2 Feb 2020 20:36:26 -0500 Subject: [PATCH] asus/p2b-ds: Transform into variant TEST=build with BUILD_TIMELESS=1, binary does not change Change-Id: I864f939a84ee9e90013ba9d3fcc8a7e4bf03e4ee Signed-off-by: Keith Hui Reviewed-on: https://review.coreboot.org/c/coreboot/+/39904 Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) --- src/mainboard/asus/p2b-ds/Kconfig | 45 ------------------- src/mainboard/asus/p2b-ds/Kconfig.name | 2 - src/mainboard/asus/p2b-ds/romstage.c | 25 ----------- src/mainboard/asus/p2b/Kconfig | 8 ++-- src/mainboard/asus/p2b/Kconfig.name | 3 ++ .../{ => p2b/variants}/p2b-ds/board_info.txt | 0 .../{ => p2b/variants}/p2b-ds/devicetree.cb | 0 .../{ => p2b/variants}/p2b-ds/irq_tables.c | 0 .../asus/{ => p2b/variants}/p2b-ds/mptable.c | 0 9 files changed, 8 insertions(+), 75 deletions(-) delete mode 100644 src/mainboard/asus/p2b-ds/Kconfig delete mode 100644 src/mainboard/asus/p2b-ds/Kconfig.name delete mode 100644 src/mainboard/asus/p2b-ds/romstage.c rename src/mainboard/asus/{ => p2b/variants}/p2b-ds/board_info.txt (100%) rename src/mainboard/asus/{ => p2b/variants}/p2b-ds/devicetree.cb (100%) rename src/mainboard/asus/{ => p2b/variants}/p2b-ds/irq_tables.c (100%) rename src/mainboard/asus/{ => p2b/variants}/p2b-ds/mptable.c (100%) diff --git a/src/mainboard/asus/p2b-ds/Kconfig b/src/mainboard/asus/p2b-ds/Kconfig deleted file mode 100644 index be03d1b44f..0000000000 --- a/src/mainboard/asus/p2b-ds/Kconfig +++ /dev/null @@ -1,45 +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; 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. -## -if BOARD_ASUS_P2B_DS - -config BOARD_SPECIFIC_OPTIONS - def_bool y - select CPU_INTEL_SLOT_1 - select NORTHBRIDGE_INTEL_I440BX - select SOUTHBRIDGE_INTEL_I82371EB - select SUPERIO_WINBOND_W83977TF - select HAVE_PIRQ_TABLE - select HAVE_MP_TABLE - select SMP - select IOAPIC - select BOARD_ROMSIZE_KB_256 - select SDRAMPWR_4DIMM - -config MAINBOARD_DIR - string - default "asus/p2b-ds" - -config MAINBOARD_PART_NUMBER - string - default "P2B-DS" - -config IRQ_SLOT_COUNT - int - default 7 - -config MAX_CPUS - int - default 2 - -endif # BOARD_ASUS_P2B_DS diff --git a/src/mainboard/asus/p2b-ds/Kconfig.name b/src/mainboard/asus/p2b-ds/Kconfig.name deleted file mode 100644 index 0335139821..0000000000 --- a/src/mainboard/asus/p2b-ds/Kconfig.name +++ /dev/null @@ -1,2 +0,0 @@ -config BOARD_ASUS_P2B_DS - bool "P2B-DS" diff --git a/src/mainboard/asus/p2b-ds/romstage.c b/src/mainboard/asus/p2b-ds/romstage.c deleted file mode 100644 index 67ba632ece..0000000000 --- a/src/mainboard/asus/p2b-ds/romstage.c +++ /dev/null @@ -1,25 +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. - */ - -#include -#include -#include - -#define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1) - -void mainboard_enable_serial(void) -{ - winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); -} diff --git a/src/mainboard/asus/p2b/Kconfig b/src/mainboard/asus/p2b/Kconfig index 36d882fe35..3895990eaa 100644 --- a/src/mainboard/asus/p2b/Kconfig +++ b/src/mainboard/asus/p2b/Kconfig @@ -11,7 +11,7 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## -if BOARD_ASUS_P2B || BOARD_ASUS_P2B_D || BOARD_ASUS_P2B_F || BOARD_ASUS_P2B_LS +if BOARD_ASUS_P2B || BOARD_ASUS_P2B_D || BOARD_ASUS_P2B_DS || BOARD_ASUS_P2B_F || BOARD_ASUS_P2B_LS config BASE_ASUS_P2B_D def_bool n @@ -30,7 +30,7 @@ config BOARD_SPECIFIC_OPTIONS select BOARD_ROMSIZE_KB_256 select SDRAMPWR_4DIMM if BOARD_ASUS_P2B_LS select HAVE_ACPI_TABLES if BOARD_ASUS_P2B || BOARD_ASUS_P2B_LS - select BASE_ASUS_P2B_D if BOARD_ASUS_P2B_D + select BASE_ASUS_P2B_D if BOARD_ASUS_P2B_D || BOARD_ASUS_P2B_DS config MAX_CPUS int @@ -44,6 +44,7 @@ config MAINBOARD_PART_NUMBER string default "P2B" if BOARD_ASUS_P2B default "P2B-D" if BOARD_ASUS_P2B_D + default "P2B-DS" if BOARD_ASUS_P2B_DS default "P2B-F" if BOARD_ASUS_P2B_F default "P2B-LS" if BOARD_ASUS_P2B_LS @@ -51,6 +52,7 @@ config VARIANT_DIR string default "p2b" if BOARD_ASUS_P2B default "p2b-d" if BOARD_ASUS_P2B_D + default "p2b-ds" if BOARD_ASUS_P2B_DS default "p2b-f" if BOARD_ASUS_P2B_F default "p2b-ls" if BOARD_ASUS_P2B_LS @@ -61,7 +63,7 @@ config DEVICETREE config IRQ_SLOT_COUNT int default 8 if BOARD_ASUS_P2B_LS - default 7 if BOARD_ASUS_P2B_F + default 7 if BOARD_ASUS_P2B_F || BOARD_ASUS_P2B_DS default 6 endif diff --git a/src/mainboard/asus/p2b/Kconfig.name b/src/mainboard/asus/p2b/Kconfig.name index 8c42258af8..106e69445e 100644 --- a/src/mainboard/asus/p2b/Kconfig.name +++ b/src/mainboard/asus/p2b/Kconfig.name @@ -4,6 +4,9 @@ config BOARD_ASUS_P2B config BOARD_ASUS_P2B_D bool "P2B-D" +config BOARD_ASUS_P2B_DS + bool "P2B-DS" + config BOARD_ASUS_P2B_F bool "P2B-F" diff --git a/src/mainboard/asus/p2b-ds/board_info.txt b/src/mainboard/asus/p2b/variants/p2b-ds/board_info.txt similarity index 100% rename from src/mainboard/asus/p2b-ds/board_info.txt rename to src/mainboard/asus/p2b/variants/p2b-ds/board_info.txt diff --git a/src/mainboard/asus/p2b-ds/devicetree.cb b/src/mainboard/asus/p2b/variants/p2b-ds/devicetree.cb similarity index 100% rename from src/mainboard/asus/p2b-ds/devicetree.cb rename to src/mainboard/asus/p2b/variants/p2b-ds/devicetree.cb diff --git a/src/mainboard/asus/p2b-ds/irq_tables.c b/src/mainboard/asus/p2b/variants/p2b-ds/irq_tables.c similarity index 100% rename from src/mainboard/asus/p2b-ds/irq_tables.c rename to src/mainboard/asus/p2b/variants/p2b-ds/irq_tables.c diff --git a/src/mainboard/asus/p2b-ds/mptable.c b/src/mainboard/asus/p2b/variants/p2b-ds/mptable.c similarity index 100% rename from src/mainboard/asus/p2b-ds/mptable.c rename to src/mainboard/asus/p2b/variants/p2b-ds/mptable.c