summaryrefslogtreecommitdiff
path: root/src/mainboard/asus
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/asus')
-rw-r--r--src/mainboard/asus/p2b/Kconfig4
-rw-r--r--src/mainboard/asus/p2b/devicetree.cb5
-rw-r--r--src/mainboard/asus/p2b/variants/p2b-d/overridetree.cb (renamed from src/mainboard/asus/p2b/variants/p2b-d/devicetree.cb)32
-rw-r--r--src/mainboard/asus/p2b/variants/p2b-ds/overridetree.cb (renamed from src/mainboard/asus/p2b/variants/p2b-ds/devicetree.cb)32
-rw-r--r--src/mainboard/asus/p2b/variants/p2b-f/devicetree.cb59
-rw-r--r--src/mainboard/asus/p2b/variants/p2b-f/overridetree.cb14
-rw-r--r--src/mainboard/asus/p2b/variants/p2b-ls/devicetree.cb58
-rw-r--r--src/mainboard/asus/p2b/variants/p2b-ls/overridetree.cb12
-rw-r--r--src/mainboard/asus/p2b/variants/p2b/overridetree.cb15
9 files changed, 43 insertions, 188 deletions
diff --git a/src/mainboard/asus/p2b/Kconfig b/src/mainboard/asus/p2b/Kconfig
index 3895990eaa..0bee04f994 100644
--- a/src/mainboard/asus/p2b/Kconfig
+++ b/src/mainboard/asus/p2b/Kconfig
@@ -56,9 +56,9 @@ config VARIANT_DIR
default "p2b-f" if BOARD_ASUS_P2B_F
default "p2b-ls" if BOARD_ASUS_P2B_LS
-config DEVICETREE
+config OVERRIDE_DEVICETREE
string
- default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" if ! BOARD_ASUS_P2B
+ default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
config IRQ_SLOT_COUNT
int
diff --git a/src/mainboard/asus/p2b/devicetree.cb b/src/mainboard/asus/p2b/devicetree.cb
index 84f0c2962d..9dcd1da1db 100644
--- a/src/mainboard/asus/p2b/devicetree.cb
+++ b/src/mainboard/asus/p2b/devicetree.cb
@@ -37,10 +37,6 @@ chip northbridge/intel/i440bx # Northbridge
end
device pnp 3f0.8 on # GPIO 2
end
- device pnp 3f0.9 on # GPIO 3
- end
- device pnp 3f0.a on # ACPI
- end
end
end
device pci 4.1 on end # IDE
@@ -56,7 +52,6 @@ chip northbridge/intel/i440bx # Northbridge
register "ide1_drive1_udma33_enable" = "0"
register "thrm_polarity" = "1"
register "lid_polarity" = "1"
- register "gpo" = "0x7fffbbff"
end
end
end
diff --git a/src/mainboard/asus/p2b/variants/p2b-d/devicetree.cb b/src/mainboard/asus/p2b/variants/p2b-d/overridetree.cb
index fe82a0d74d..742414411b 100644
--- a/src/mainboard/asus/p2b/variants/p2b-d/devicetree.cb
+++ b/src/mainboard/asus/p2b/variants/p2b-d/overridetree.cb
@@ -8,47 +8,15 @@ chip northbridge/intel/i440bx # Northbridge
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
- 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 / mouse
- io 0x60 = 0x60
- io 0x62 = 0x64
- irq 0x70 = 1 # PS/2 keyboard interrupt
- irq 0x72 = 12 # PS/2 mouse interrupt
- end
- device pnp 3f0.7 on # GPIO 1
- end
- device pnp 3f0.8 on # GPIO 2
- end
device pnp 3f0.9 on # GPIO 3
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"
diff --git a/src/mainboard/asus/p2b/variants/p2b-ds/devicetree.cb b/src/mainboard/asus/p2b/variants/p2b-ds/overridetree.cb
index b8e9e8580f..6eabe5897b 100644
--- a/src/mainboard/asus/p2b/variants/p2b-ds/devicetree.cb
+++ b/src/mainboard/asus/p2b/variants/p2b-ds/overridetree.cb
@@ -8,47 +8,15 @@ chip northbridge/intel/i440bx # Northbridge
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
- 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 / mouse
- io 0x60 = 0x60
- io 0x62 = 0x64
- irq 0x70 = 1 # PS/2 keyboard interrupt
- irq 0x72 = 12 # PS/2 mouse interrupt
- end
- device pnp 3f0.7 on # GPIO 1
- end
- device pnp 3f0.8 on # GPIO 2
- end
device pnp 3f0.9 on # GPIO 3
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
device pci 6.0 on end # Onboard SCSI
register "ide0_enable" = "1"
register "ide1_enable" = "1"
diff --git a/src/mainboard/asus/p2b/variants/p2b-f/devicetree.cb b/src/mainboard/asus/p2b/variants/p2b-f/devicetree.cb
deleted file mode 100644
index 5bee5ae96a..0000000000
--- a/src/mainboard/asus/p2b/variants/p2b-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
diff --git a/src/mainboard/asus/p2b/variants/p2b-f/overridetree.cb b/src/mainboard/asus/p2b/variants/p2b-f/overridetree.cb
new file mode 100644
index 0000000000..f0fc054568
--- /dev/null
+++ b/src/mainboard/asus/p2b/variants/p2b-f/overridetree.cb
@@ -0,0 +1,14 @@
+chip northbridge/intel/i440bx # Northbridge
+ device domain 0 on # PCI domain
+ 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.6 on # Consumer IR
+ end
+ device pnp 3f0.a on # ACPI
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/src/mainboard/asus/p2b/variants/p2b-ls/devicetree.cb b/src/mainboard/asus/p2b/variants/p2b-ls/devicetree.cb
deleted file mode 100644
index a9901b4198..0000000000
--- a/src/mainboard/asus/p2b/variants/p2b-ls/devicetree.cb
+++ /dev/null
@@ -1,58 +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.7 on # GPIO 1
- end
- device pnp 3f0.8 on # GPIO 2
- end
- device pnp 3f0.a off # 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
- device pci 6.0 on end # Onboard SCSI
- 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
diff --git a/src/mainboard/asus/p2b/variants/p2b-ls/overridetree.cb b/src/mainboard/asus/p2b/variants/p2b-ls/overridetree.cb
new file mode 100644
index 0000000000..bb252c0b0b
--- /dev/null
+++ b/src/mainboard/asus/p2b/variants/p2b-ls/overridetree.cb
@@ -0,0 +1,12 @@
+chip northbridge/intel/i440bx # Northbridge
+ device domain 0 on # PCI domain
+ chip southbridge/intel/i82371eb # Southbridge
+ device pci 4.0 on # ISA bridge
+ chip superio/winbond/w83977tf # Super I/O
+ device pnp 3f0.a off # ACPI
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/src/mainboard/asus/p2b/variants/p2b/overridetree.cb b/src/mainboard/asus/p2b/variants/p2b/overridetree.cb
new file mode 100644
index 0000000000..6d471357e4
--- /dev/null
+++ b/src/mainboard/asus/p2b/variants/p2b/overridetree.cb
@@ -0,0 +1,15 @@
+chip northbridge/intel/i440bx # Northbridge
+ device domain 0 on # PCI domain
+ chip southbridge/intel/i82371eb # Southbridge
+ register "gpo" = "0x7fffbbff"
+ device pci 4.0 on # ISA bridge
+ chip superio/winbond/w83977tf # Super I/O
+ device pnp 3f0.9 on # GPIO 3
+ end
+ device pnp 3f0.a on # ACPI
+ end
+ end
+ end
+ end
+ end
+end
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 18:11:59 +0000