Change in coreboot[master]: asus/p2b-f: Transform into variant

[Keith Hui (Code Review)]

Keith Hui has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/39902 )

Change subject: asus/p2b-f: Transform into variant
......................................................................

asus/p2b-f: Transform into variant

TEST=build with BUILD_TIMELESS=1, binary does not change

Change-Id: I56983cabfad574b970aba098a178e691c6b354d1
Signed-off-by: Keith Hui 
---
D src/mainboard/asus/p2b-f/Kconfig
D src/mainboard/asus/p2b-f/Kconfig.name
D src/mainboard/asus/p2b-f/romstage.c
M src/mainboard/asus/p2b/Kconfig
M src/mainboard/asus/p2b/Kconfig.name
R src/mainboard/asus/p2b/variants/p2b-f/board_info.txt
R src/mainboard/asus/p2b/variants/p2b-f/devicetree.cb
R src/mainboard/asus/p2b/variants/p2b-f/irq_tables.c
8 files changed, 8 insertions(+), 58 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/39902/1

diff --git a/src/mainboard/asus/p2b-f/Kconfig b/src/mainboard/asus/p2b-f/Kconfig
deleted file mode 100644
index cb220c9..0000000
--- a/src/mainboard/asus/p2b-f/Kconfig
+++ /dev/null
@@ -1,37 +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_F
-
-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 BOARD_ROMSIZE_KB_256
-
-config MAINBOARD_DIR
-	string
-	default "asus/p2b-f"
-
-config MAINBOARD_PART_NUMBER
-	string
-	default "P2B-F"
-
-config IRQ_SLOT_COUNT
-	int
-	default 7
-
-endif # BOARD_ASUS_P2B_F
diff --git a/src/mainboard/asus/p2b-f/Kconfig.name b/src/mainboard/asus/p2b-f/Kconfig.name
deleted file mode 100644
index a433376..0000000
--- a/src/mainboard/asus/p2b-f/Kconfig.name
+++ /dev/null
@@ -1,2 +0,0 @@
-config BOARD_ASUS_P2B_F
-	bool "P2B-F"
diff --git a/src/mainboard/asus/p2b-f/romstage.c b/src/mainboard/asus/p2b-f/romstage.c
deleted file mode 100644
index f91a806..0000000
--- a/src/mainboard/asus/p2b-f/romstage.c
+++ /dev/null
@@ -1,17 +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.
- */
-
-/* Shares romstage with the better supported P2B-LS sibling. */
-#include "../p2b-ls/romstage.c"
diff --git a/src/mainboard/asus/p2b/Kconfig b/src/mainboard/asus/p2b/Kconfig
index dafc0a5..694469d 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_LS
+if BOARD_ASUS_P2B || BOARD_ASUS_P2B_F || BOARD_ASUS_P2B_LS

config BOARD_SPECIFIC_OPTIONS
    def_bool y
@@ -22,7 +22,7 @@
    select HAVE_PIRQ_TABLE
    select BOARD_ROMSIZE_KB_256
    select SDRAMPWR_4DIMM if BOARD_ASUS_P2B_LS
-	select HAVE_ACPI_TABLES
+	select HAVE_ACPI_TABLES if BOARD_ASUS_P2B || BOARD_ASUS_P2B_LS

config MAINBOARD_DIR
    string
@@ -31,11 +31,13 @@
 config MAINBOARD_PART_NUMBER
    string
    default "P2B" if BOARD_ASUS_P2B
+	default "P2B-F" if BOARD_ASUS_P2B_F
    default "P2B-LS" if BOARD_ASUS_P2B_LS

config VARIANT_DIR
    string
    default "p2b" if BOARD_ASUS_P2B
+	default "p2b-f" if BOARD_ASUS_P2B_F
    default "p2b-ls" if BOARD_ASUS_P2B_LS

config DEVICETREE
@@ -45,6 +47,7 @@
 config IRQ_SLOT_COUNT
    int
    default 8 if BOARD_ASUS_P2B_LS
+	default 7 if BOARD_ASUS_P2B_F
    default 6

endif
diff --git a/src/mainboard/asus/p2b/Kconfig.name b/src/mainboard/asus/p2b/Kconfig.name
index c9b7611..fd645f0 100644
--- a/src/mainboard/asus/p2b/Kconfig.name
+++ b/src/mainboard/asus/p2b/Kconfig.name
@@ -1,5 +1,8 @@
 config BOARD_ASUS_P2B
    bool "P2B"

+config BOARD_ASUS_P2B_F
+	bool "P2B-F"
+
 config BOARD_ASUS_P2B_LS
    bool "P2B-LS"
diff --git a/src/mainboard/asus/p2b-f/board_info.txt b/src/mainboard/asus/p2b/variants/p2b-f/board_info.txt
similarity index 100%
rename from src/mainboard/asus/p2b-f/board_info.txt
rename to src/mainboard/asus/p2b/variants/p2b-f/board_info.txt
diff --git a/src/mainboard/asus/p2b-f/devicetree.cb b/src/mainboard/asus/p2b/variants/p2b-f/devicetree.cb
similarity index 100%
rename from src/mainboard/asus/p2b-f/devicetree.cb
rename to src/mainboard/asus/p2b/variants/p2b-f/devicetree.cb
diff --git a/src/mainboard/asus/p2b-f/irq_tables.c b/src/mainboard/asus/p2b/variants/p2b-f/irq_tables.c
similarity index 100%
rename from src/mainboard/asus/p2b-f/irq_tables.c
rename to src/mainboard/asus/p2b/variants/p2b-f/irq_tables.c

[Keith Hui (Code Review)]

Hello build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/39902

to look at the new patch set (#2).

Change subject: asus/p2b-f: Transform into variant
......................................................................

asus/p2b-f: Transform into variant

TEST=build with BUILD_TIMELESS=1, binary does not change

Change-Id: I56983cabfad574b970aba098a178e691c6b354d1
Signed-off-by: Keith Hui 
---
D src/mainboard/asus/p2b-f/Kconfig
D src/mainboard/asus/p2b-f/Kconfig.name
D src/mainboard/asus/p2b-f/romstage.c
M src/mainboard/asus/p2b/Kconfig
M src/mainboard/asus/p2b/Kconfig.name
R src/mainboard/asus/p2b/variants/p2b-f/board_info.txt
R src/mainboard/asus/p2b/variants/p2b-f/devicetree.cb
R src/mainboard/asus/p2b/variants/p2b-f/irq_tables.c
8 files changed, 12 insertions(+), 58 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/39902/2

[Nico Huber (Code Review)]

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39902 )

Change subject: asus/p2b-f: Transform into variant
......................................................................

Patch Set 2: Code-Review+2

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39902 )

Change subject: asus/p2b-f: Transform into variant
......................................................................

Patch Set 2: Code-Review+2

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/39902 )

Change subject: asus/p2b-f: Transform into variant
......................................................................

asus/p2b-f: Transform into variant

TEST=build with BUILD_TIMELESS=1, binary does not change

Change-Id: I56983cabfad574b970aba098a178e691c6b354d1
Signed-off-by: Keith Hui 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39902
Tested-by: build bot (Jenkins) 
Reviewed-by: Nico Huber 
Reviewed-by: Angel Pons 
---
D src/mainboard/asus/p2b-f/Kconfig
D src/mainboard/asus/p2b-f/Kconfig.name
D src/mainboard/asus/p2b-f/romstage.c
M src/mainboard/asus/p2b/Kconfig
M src/mainboard/asus/p2b/Kconfig.name
R src/mainboard/asus/p2b/variants/p2b-f/board_info.txt
R src/mainboard/asus/p2b/variants/p2b-f/devicetree.cb
R src/mainboard/asus/p2b/variants/p2b-f/irq_tables.c
8 files changed, 12 insertions(+), 58 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Nico Huber: Looks good to me, approved
  Angel Pons: Looks good to me, approved

diff --git a/src/mainboard/asus/p2b-f/Kconfig b/src/mainboard/asus/p2b-f/Kconfig
deleted file mode 100644
index cb220c9..0000000
--- a/src/mainboard/asus/p2b-f/Kconfig
+++ /dev/null
@@ -1,37 +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_F
-
-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 BOARD_ROMSIZE_KB_256
-
-config MAINBOARD_DIR
-	string
-	default "asus/p2b-f"
-
-config MAINBOARD_PART_NUMBER
-	string
-	default "P2B-F"
-
-config IRQ_SLOT_COUNT
-	int
-	default 7
-
-endif # BOARD_ASUS_P2B_F
diff --git a/src/mainboard/asus/p2b-f/Kconfig.name b/src/mainboard/asus/p2b-f/Kconfig.name
deleted file mode 100644
index a433376..0000000
--- a/src/mainboard/asus/p2b-f/Kconfig.name
+++ /dev/null
@@ -1,2 +0,0 @@
-config BOARD_ASUS_P2B_F
-	bool "P2B-F"
diff --git a/src/mainboard/asus/p2b-f/romstage.c b/src/mainboard/asus/p2b-f/romstage.c
deleted file mode 100644
index f91a806..0000000
--- a/src/mainboard/asus/p2b-f/romstage.c
+++ /dev/null
@@ -1,17 +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.
- */
-
-/* Shares romstage with the better supported P2B-LS sibling. */
-#include "../p2b-ls/romstage.c"
diff --git a/src/mainboard/asus/p2b/Kconfig b/src/mainboard/asus/p2b/Kconfig
index a9a9b82..503e662 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
+if BOARD_ASUS_P2B || BOARD_ASUS_P2B_F

config BOARD_SPECIFIC_OPTIONS
    def_bool y
@@ -21,7 +21,7 @@
    select SUPERIO_WINBOND_W83977TF
    select HAVE_PIRQ_TABLE
    select BOARD_ROMSIZE_KB_256
-	select HAVE_ACPI_TABLES
+	select HAVE_ACPI_TABLES if BOARD_ASUS_P2B

config MAINBOARD_DIR
    string
@@ -30,13 +30,20 @@
 config MAINBOARD_PART_NUMBER
    string
    default "P2B" if BOARD_ASUS_P2B
+	default "P2B-F" if BOARD_ASUS_P2B_F

config VARIANT_DIR
    string
    default "p2b" if BOARD_ASUS_P2B
+	default "p2b-f" if BOARD_ASUS_P2B_F
+
+config DEVICETREE
+	string
+	default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" if ! BOARD_ASUS_P2B

config IRQ_SLOT_COUNT
    int
+	default 7 if BOARD_ASUS_P2B_F
    default 6

endif
diff --git a/src/mainboard/asus/p2b/Kconfig.name b/src/mainboard/asus/p2b/Kconfig.name
index 60d6028..ee34b16 100644
--- a/src/mainboard/asus/p2b/Kconfig.name
+++ b/src/mainboard/asus/p2b/Kconfig.name
@@ -1,2 +1,5 @@
 config BOARD_ASUS_P2B
    bool "P2B"
+
+config BOARD_ASUS_P2B_F
+	bool "P2B-F"
diff --git a/src/mainboard/asus/p2b-f/board_info.txt b/src/mainboard/asus/p2b/variants/p2b-f/board_info.txt
similarity index 100%
rename from src/mainboard/asus/p2b-f/board_info.txt
rename to src/mainboard/asus/p2b/variants/p2b-f/board_info.txt
diff --git a/src/mainboard/asus/p2b-f/devicetree.cb b/src/mainboard/asus/p2b/variants/p2b-f/devicetree.cb
similarity index 100%
rename from src/mainboard/asus/p2b-f/devicetree.cb
rename to src/mainboard/asus/p2b/variants/p2b-f/devicetree.cb
diff --git a/src/mainboard/asus/p2b-f/irq_tables.c b/src/mainboard/asus/p2b/variants/p2b-f/irq_tables.c
similarity index 100%
rename from src/mainboard/asus/p2b-f/irq_tables.c
rename to src/mainboard/asus/p2b/variants/p2b-f/irq_tables.c