summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/asus/p2b-f/Kconfig37
-rw-r--r--src/mainboard/asus/p2b-f/Kconfig.name2
-rw-r--r--src/mainboard/asus/p2b-f/romstage.c17
-rw-r--r--src/mainboard/asus/p2b/Kconfig11
-rw-r--r--src/mainboard/asus/p2b/Kconfig.name3
-rw-r--r--src/mainboard/asus/p2b/variants/p2b-f/board_info.txt (renamed from src/mainboard/asus/p2b-f/board_info.txt)0
-rw-r--r--src/mainboard/asus/p2b/variants/p2b-f/devicetree.cb (renamed from src/mainboard/asus/p2b-f/devicetree.cb)0
-rw-r--r--src/mainboard/asus/p2b/variants/p2b-f/irq_tables.c (renamed from src/mainboard/asus/p2b-f/irq_tables.c)0
8 files changed, 12 insertions, 58 deletions
diff --git a/src/mainboard/asus/p2b-f/Kconfig b/src/mainboard/asus/p2b-f/Kconfig
deleted file mode 100644
index cb220c9913..0000000000
--- 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 a433376ef0..0000000000
--- 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 f91a806b5e..0000000000
--- 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 a9a9b82985..503e662661 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 @@ config BOARD_SPECIFIC_OPTIONS
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_DIR
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 60d6028d74..ee34b16088 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
index 79b8d9174e..79b8d9174e 100644
--- a/src/mainboard/asus/p2b-f/board_info.txt
+++ b/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
index 5bee5ae96a..5bee5ae96a 100644
--- a/src/mainboard/asus/p2b-f/devicetree.cb
+++ b/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
index 368c0e56e7..368c0e56e7 100644
--- a/src/mainboard/asus/p2b-f/irq_tables.c
+++ b/src/mainboard/asus/p2b/variants/p2b-f/irq_tables.c