summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mainboard/asus/p2b/Kconfig8
-rw-r--r--src/mainboard/asus/p2b/Kconfig.name3
-rw-r--r--src/mainboard/asus/p2b/Makefile.inc1
-rw-r--r--src/mainboard/asus/p2b/variants/p3b-f/board_info.txt (renamed from src/mainboard/asus/p3b-f/board_info.txt)0
-rw-r--r--src/mainboard/asus/p2b/variants/p3b-f/irq_tables.c (renamed from src/mainboard/asus/p3b-f/irq_tables.c)0
-rw-r--r--src/mainboard/asus/p2b/variants/p3b-f/overridetree.cb12
-rw-r--r--src/mainboard/asus/p2b/variants/p3b-f/romstage.c (renamed from src/mainboard/asus/p3b-f/romstage.c)11
-rw-r--r--src/mainboard/asus/p3b-f/Kconfig31
-rw-r--r--src/mainboard/asus/p3b-f/Kconfig.name2
-rw-r--r--src/mainboard/asus/p3b-f/devicetree.cb59
10 files changed, 21 insertions, 106 deletions
diff --git a/src/mainboard/asus/p2b/Kconfig b/src/mainboard/asus/p2b/Kconfig
index faa9e0d5ac..5b3b238a34 100644
--- a/src/mainboard/asus/p2b/Kconfig
+++ b/src/mainboard/asus/p2b/Kconfig
@@ -4,7 +4,7 @@
##
## SPDX-License-Identifier: GPL-2.0-only
-if BOARD_ASUS_P2B || BOARD_ASUS_P2B_D || BOARD_ASUS_P2B_DS || 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 || BOARD_ASUS_P3B_F
config BASE_ASUS_P2B_D
def_bool n
@@ -21,7 +21,7 @@ config BOARD_SPECIFIC_OPTIONS
select SUPERIO_WINBOND_W83977TF
select HAVE_PIRQ_TABLE
select BOARD_ROMSIZE_KB_256
- select SDRAMPWR_4DIMM if BOARD_ASUS_P2B_LS
+ select SDRAMPWR_4DIMM if BOARD_ASUS_P2B_LS || BOARD_ASUS_P3B_F
select HAVE_ACPI_TABLES if BOARD_ASUS_P2B || BOARD_ASUS_P2B_LS
select BASE_ASUS_P2B_D if BOARD_ASUS_P2B_D || BOARD_ASUS_P2B_DS
@@ -40,6 +40,7 @@ config MAINBOARD_PART_NUMBER
default "P2B-DS" if BOARD_ASUS_P2B_DS
default "P2B-F" if BOARD_ASUS_P2B_F
default "P2B-LS" if BOARD_ASUS_P2B_LS
+ default "P3B-F" if BOARD_ASUS_P3B_F
config VARIANT_DIR
string
@@ -48,6 +49,7 @@ config VARIANT_DIR
default "p2b-ds" if BOARD_ASUS_P2B_DS
default "p2b-f" if BOARD_ASUS_P2B_F
default "p2b-ls" if BOARD_ASUS_P2B_LS
+ default "p3b-f" if BOARD_ASUS_P3B_F
config OVERRIDE_DEVICETREE
string
@@ -55,7 +57,7 @@ config OVERRIDE_DEVICETREE
config IRQ_SLOT_COUNT
int
- default 8 if BOARD_ASUS_P2B_LS
+ default 8 if BOARD_ASUS_P2B_LS || BOARD_ASUS_P3B_F
default 7 if BOARD_ASUS_P2B_F || BOARD_ASUS_P2B_DS
default 6
diff --git a/src/mainboard/asus/p2b/Kconfig.name b/src/mainboard/asus/p2b/Kconfig.name
index 106e69445e..f36fb0d9c0 100644
--- a/src/mainboard/asus/p2b/Kconfig.name
+++ b/src/mainboard/asus/p2b/Kconfig.name
@@ -12,3 +12,6 @@ config BOARD_ASUS_P2B_F
config BOARD_ASUS_P2B_LS
bool "P2B-LS"
+
+config BOARD_ASUS_P3B_F
+ bool "P3B-F"
diff --git a/src/mainboard/asus/p2b/Makefile.inc b/src/mainboard/asus/p2b/Makefile.inc
index cc55c25a20..eb48944b6e 100644
--- a/src/mainboard/asus/p2b/Makefile.inc
+++ b/src/mainboard/asus/p2b/Makefile.inc
@@ -1,4 +1,5 @@
bootblock-y += bootblock.c
+romstage-$(CONFIG_BOARD_ASUS_P3B_F) += variants/$(VARIANT_DIR)/romstage.c
ramstage-$(CONFIG_GENERATE_PIRQ_TABLE) += variants/$(VARIANT_DIR)/irq_tables.c
ramstage-$(CONFIG_GENERATE_MP_TABLE) += variants/$(VARIANT_DIR)/mptable.c
diff --git a/src/mainboard/asus/p3b-f/board_info.txt b/src/mainboard/asus/p2b/variants/p3b-f/board_info.txt
index a1657431b7..a1657431b7 100644
--- a/src/mainboard/asus/p3b-f/board_info.txt
+++ b/src/mainboard/asus/p2b/variants/p3b-f/board_info.txt
diff --git a/src/mainboard/asus/p3b-f/irq_tables.c b/src/mainboard/asus/p2b/variants/p3b-f/irq_tables.c
index c0c5aa25da..c0c5aa25da 100644
--- a/src/mainboard/asus/p3b-f/irq_tables.c
+++ b/src/mainboard/asus/p2b/variants/p3b-f/irq_tables.c
diff --git a/src/mainboard/asus/p2b/variants/p3b-f/overridetree.cb b/src/mainboard/asus/p2b/variants/p3b-f/overridetree.cb
new file mode 100644
index 0000000000..0a608121f6
--- /dev/null
+++ b/src/mainboard/asus/p2b/variants/p3b-f/overridetree.cb
@@ -0,0 +1,12 @@
+chip northbridge/intel/i440bx # Northbridge
+ device domain 0 on # PCI domain
+ chip southbridge/intel/i82371eb # Southbridge
+ register "gpo" = "0x67ffbfff" # GPIO: This value sets GPIOs 27,28 to expose HWM
+ device pci 4.0 on # ISA bridge
+ chip superio/winbond/w83977tf # Super I/O
+ device pnp 3f0.a off end # ACPI
+ end
+ end
+ end
+ end
+end
diff --git a/src/mainboard/asus/p3b-f/romstage.c b/src/mainboard/asus/p2b/variants/p3b-f/romstage.c
index 475da286d0..437a38fded 100644
--- a/src/mainboard/asus/p3b-f/romstage.c
+++ b/src/mainboard/asus/p2b/variants/p3b-f/romstage.c
@@ -4,12 +4,6 @@
#include <arch/io.h>
#include <southbridge/intel/i82371eb/i82371eb.h>
#include <northbridge/intel/i440bx/raminit.h>
-#include <superio/winbond/common/winbond.h>
-/* FIXME: The ASUS P3B-F has a Winbond W83977EF, actually. */
-#include <superio/winbond/w83977tf/w83977tf.h>
-
-/* FIXME: The ASUS P3B-F has a Winbond W83977EF, actually. */
-#define SERIAL_DEV PNP_DEV(0x3f0, W83977TF_SP1)
/*
* ASUS P3B-F specific SPD enable magic.
@@ -41,8 +35,3 @@ void disable_spd(void)
{
outb(0x67, PM_IO_BASE + 0x37);
}
-
-void mainboard_enable_serial(void)
-{
- winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE);
-}
diff --git a/src/mainboard/asus/p3b-f/Kconfig b/src/mainboard/asus/p3b-f/Kconfig
deleted file mode 100644
index 41989cacbd..0000000000
--- a/src/mainboard/asus/p3b-f/Kconfig
+++ /dev/null
@@ -1,31 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-##
-## SPDX-License-Identifier: GPL-2.0-only
-
-if BOARD_ASUS_P3B_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
- select SDRAMPWR_4DIMM
-
-config MAINBOARD_DIR
- string
- default "asus/p3b-f"
-
-config MAINBOARD_PART_NUMBER
- string
- default "P3B-F"
-
-config IRQ_SLOT_COUNT
- int
- default 8
-
-endif # BOARD_ASUS_P3B_F
diff --git a/src/mainboard/asus/p3b-f/Kconfig.name b/src/mainboard/asus/p3b-f/Kconfig.name
deleted file mode 100644
index cf1d9b50a7..0000000000
--- a/src/mainboard/asus/p3b-f/Kconfig.name
+++ /dev/null
@@ -1,2 +0,0 @@
-config BOARD_ASUS_P3B_F
- bool "P3B-F"
diff --git a/src/mainboard/asus/p3b-f/devicetree.cb b/src/mainboard/asus/p3b-f/devicetree.cb
deleted file mode 100644
index bc9ad17c93..0000000000
--- a/src/mainboard/asus/p3b-f/devicetree.cb
+++ /dev/null
@@ -1,59 +0,0 @@
-chip northbridge/intel/i440bx # Northbridge
- device cpu_cluster 0 on # APIC cluster
- chip cpu/intel/slot_1 # CPU
- device lapic 0 on end # APIC
- end
- end
- device domain 0 on # PCI domain
- device pci 0.0 on end # Host bridge
- device pci 1.0 on end # PCI/AGP bridge
- chip southbridge/intel/i82371eb # Southbridge
- device pci 4.0 on # ISA bridge
- chip superio/winbond/w83977tf # Super I/O (FIXME: It's W83977EF!)
- device pnp 3f0.0 on # Floppy
- io 0x60 = 0x3f0
- irq 0x70 = 6
- drq 0x74 = 2
- end
- device pnp 3f0.1 on # Parallel port
- io 0x60 = 0x378
- irq 0x70 = 7
- end
- device pnp 3f0.2 on # COM1
- io 0x60 = 0x3f8
- irq 0x70 = 4
- end
- device pnp 3f0.3 on # COM2 / IR
- io 0x60 = 0x2f8
- irq 0x70 = 3
- end
- device pnp 3f0.5 on # PS/2 keyboard
- io 0x60 = 0x60
- io 0x62 = 0x64
- irq 0x70 = 1 # PS/2 keyboard interrupt
- irq 0x72 = 12 # PS/2 mouse interrupt
- end
- device pnp 3f0.6 on # Consumer IR
- end
- device pnp 3f0.7 on # GPIO 1
- end
- device pnp 3f0.8 on # GPIO 2
- end
- device pnp 3f0.a on # ACPI
- end
- end
- end
- device pci 4.1 on end # IDE
- device pci 4.2 on end # USB
- device pci 4.3 on end # ACPI
- register "ide0_enable" = "1"
- register "ide1_enable" = "1"
- register "ide_legacy_enable" = "1"
- # Enable UDMA/33 for higher speed if your IDE device(s) support it.
- register "ide0_drive0_udma33_enable" = "0"
- register "ide0_drive1_udma33_enable" = "0"
- register "ide1_drive0_udma33_enable" = "0"
- register "ide1_drive1_udma33_enable" = "0"
- end
- end
-end
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 20:40:11 +0000