aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard/arima
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/arima')
-rw-r--r--src/mainboard/arima/Kconfig2
-rw-r--r--src/mainboard/arima/hdama/debug.c18
-rw-r--r--src/mainboard/arima/hdama/devicetree.cb44
-rw-r--r--src/mainboard/arima/hdama/irq_tables.c2
-rw-r--r--src/mainboard/arima/hdama/mptable.c10
5 files changed, 38 insertions, 38 deletions
diff --git a/src/mainboard/arima/Kconfig b/src/mainboard/arima/Kconfig
index d1979b00a2..8895433a55 100644
--- a/src/mainboard/arima/Kconfig
+++ b/src/mainboard/arima/Kconfig
@@ -1,7 +1,7 @@
choice
prompt "Mainboard model"
depends on VENDOR_ARIMA
-
+
source "src/mainboard/arima/hdama/Kconfig"
endchoice
diff --git a/src/mainboard/arima/hdama/debug.c b/src/mainboard/arima/hdama/debug.c
index 0db327c5c6..a6f0d558a8 100644
--- a/src/mainboard/arima/hdama/debug.c
+++ b/src/mainboard/arima/hdama/debug.c
@@ -12,8 +12,8 @@ static void print_debug_pci_dev(unsigned dev)
static void print_pci_devices(void)
{
device_t dev;
- for(dev = PCI_DEV(0, 0, 0);
- dev <= PCI_DEV(0, 0x1f, 0x7);
+ for(dev = PCI_DEV(0, 0, 0);
+ dev <= PCI_DEV(0, 0x1f, 0x7);
dev += PCI_DEV(0,0,1)) {
uint32_t id;
id = pci_read_config32(dev, PCI_VENDOR_ID);
@@ -32,7 +32,7 @@ static void dump_pci_device(unsigned dev)
int i;
print_debug_pci_dev(dev);
print_debug("\n");
-
+
for(i = 0; i <= 255; i++) {
unsigned char val;
if ((i & 0x0f) == 0) {
@@ -51,8 +51,8 @@ static void dump_pci_device(unsigned dev)
static void dump_pci_devices(void)
{
device_t dev;
- for(dev = PCI_DEV(0, 0, 0);
- dev <= PCI_DEV(0, 0x1f, 0x7);
+ for(dev = PCI_DEV(0, 0, 0);
+ dev <= PCI_DEV(0, 0x1f, 0x7);
dev += PCI_DEV(0,0,1)) {
uint32_t id;
id = pci_read_config32(dev, PCI_VENDOR_ID);
@@ -77,10 +77,10 @@ static void dump_spd_registers(int controllers, const struct mem_controller *ctr
device = ctrl[n].channel0[i];
if (device) {
int j;
- print_debug("dimm: ");
+ print_debug("dimm: ");
print_debug_hex8(n);
print_debug_char('.');
- print_debug_hex8(i);
+ print_debug_hex8(i);
print_debug(".0: ");
print_debug_hex8(device);
for(j = 0; j < 256; j++) {
@@ -109,10 +109,10 @@ static void dump_spd_registers(int controllers, const struct mem_controller *ctr
device = ctrl[n].channel1[i];
if (device) {
int j;
- print_debug("dimm: ");
+ print_debug("dimm: ");
print_debug_hex8(n);
print_debug_char('.');
- print_debug_hex8(i);
+ print_debug_hex8(i);
print_debug(".1: ");
print_debug_hex8(device);
for(j = 0; j < 256; j++) {
diff --git a/src/mainboard/arima/hdama/devicetree.cb b/src/mainboard/arima/hdama/devicetree.cb
index a812814782..0ab47a4f0b 100644
--- a/src/mainboard/arima/hdama/devicetree.cb
+++ b/src/mainboard/arima/hdama/devicetree.cb
@@ -6,14 +6,14 @@ chip northbridge/amd/amdk8/root_complex
end
device pci_domain 0 on
chip northbridge/amd/amdk8
- device pci 18.0 on # northbridge
- # devices on link 0, link 0 == LDT 0
+ device pci 18.0 on # northbridge
+ # devices on link 0, link 0 == LDT 0
chip southbridge/amd/amd8131
# the on/off keyword is mandatory
device pci 0.0 on # PCIX bridge
## On board NIC A
#chip drivers/generic/generic
- # device pci 3.0 on
+ # device pci 3.0 on
# irq 0 = 0x13
# end
#end
@@ -31,7 +31,7 @@ chip northbridge/amd/amdk8/root_complex
# irq 2 = 0x13
# irq 3 = 0x10
# end
- #end
+ #end
## PCI Slot 4
#chip drivers/generic/generic
# device pci 2.0 on
@@ -40,7 +40,7 @@ chip northbridge/amd/amdk8/root_complex
# irq 2 = 0x10
# irq 3 = 0x11
# end
- #end
+ #end
end
device pci 0.1 on end # IOAPIC
device pci 1.0 on # PCIX bridge
@@ -61,7 +61,7 @@ chip northbridge/amd/amdk8/root_complex
# irq 2 = 0x10
# irq 3 = 0x11
# end
- #end
+ #end
end
device pci 1.1 on end # IOAPIC
end
@@ -82,7 +82,7 @@ chip northbridge/amd/amdk8/root_complex
# irq 2 = 0x13
# irq 3 = 0x10
# end
- #end
+ #end
## PCI Slot 6 (correct?)
#chip drivers/generic/generic
# device pci 4.0 on
@@ -91,13 +91,13 @@ chip northbridge/amd/amdk8/root_complex
# irq 2 = 0x12
# irq 3 = 0x13
# end
- #end
+ #end
end
# LPC bridge
device pci 1.0 on
chip superio/nsc/pc87360
- device pnp 2e.0 off # Floppy
+ device pnp 2e.0 off # Floppy
io 0x60 = 0x3f0
irq 0x70 = 6
drq 0x74 = 2
@@ -124,7 +124,7 @@ chip northbridge/amd/amdk8/root_complex
device pnp 2e.7 off end # GPIO
device pnp 2e.8 off end # ACB
device pnp 2e.9 off end # FSCM
- device pnp 2e.a off end # WDT
+ device pnp 2e.a off end # WDT
end
end
device pci 1.1 on end # IDE
@@ -132,8 +132,8 @@ chip northbridge/amd/amdk8/root_complex
device pci 1.3 on # System Management
chip drivers/generic/generic
#phillips pca9545 smbus mux
- device i2c 70 on
- # analog_devices adm1026
+ device i2c 70 on
+ # analog_devices adm1026
chip drivers/generic/generic
device i2c 2c on end
end
@@ -147,33 +147,33 @@ chip northbridge/amd/amdk8/root_complex
end
chip drivers/generic/generic #dimm 0-0-1
device i2c 51 on end
- end
+ end
chip drivers/generic/generic #dimm 0-1-0
device i2c 52 on end
- end
+ end
chip drivers/generic/generic #dimm 0-1-1
device i2c 53 on end
- end
+ end
chip drivers/generic/generic #dimm 1-0-0
- device i2c 54 on end
+ device i2c 54 on end
end
chip drivers/generic/generic #dimm 1-0-1
device i2c 55 on end
- end
+ end
chip drivers/generic/generic #dimm 1-1-0
device i2c 56 on end
- end
+ end
chip drivers/generic/generic #dimm 1-1-1
device i2c 57 on end
- end
+ end
end
device pci 1.5 off end # AC97 Audio
device pci 1.6 on end # AC97 Modem
register "ide0_enable" = "1"
register "ide1_enable" = "1"
end
- end # device pci 18.0
-
+ end # device pci 18.0
+
device pci 18.0 on end # LDT1
device pci 18.0 on end # LDT2
device pci 18.1 on end
@@ -188,6 +188,6 @@ chip northbridge/amd/amdk8/root_complex
device pci 19.2 on end
device pci 19.3 on end
end
- end
+ end
end
diff --git a/src/mainboard/arima/hdama/irq_tables.c b/src/mainboard/arima/hdama/irq_tables.c
index 2ca98066d0..ba516f88e2 100644
--- a/src/mainboard/arima/hdama/irq_tables.c
+++ b/src/mainboard/arima/hdama/irq_tables.c
@@ -12,7 +12,7 @@
{linkc, AVAILABLE_IRQS}, {linkd, AVAILABLE_IRQS}}, slot, 0}
/* Each IRQ_SLOT entry consists of:
- * bus, devfn, {link, bitmap}, {link, bitmap}, {link, bitmap}, {link, bitmap}, slot, rfu
+ * bus, devfn, {link, bitmap}, {link, bitmap}, {link, bitmap}, {link, bitmap}, slot, rfu
*/
const struct irq_routing_table intel_irq_routing_table = {
diff --git a/src/mainboard/arima/hdama/mptable.c b/src/mainboard/arima/hdama/mptable.c
index 643dfabd5d..11b8063f95 100644
--- a/src/mainboard/arima/hdama/mptable.c
+++ b/src/mainboard/arima/hdama/mptable.c
@@ -4,7 +4,7 @@
#include <string.h>
#include <stdint.h>
#include <cpu/x86/lapic.h>
-#include <arch/cpu.h>
+#include <arch/cpu.h>
#include <arch/io.h>
#define HT_INIT_CONTROL 0x6c
@@ -26,7 +26,7 @@ static void smp_write_processors_inorder(struct mp_config_table *mc)
unsigned cpu_feature_flags;
struct cpuid_result result;
device_t cpu;
-
+
boot_apic_id = lapicid();
apic_version = lapic_read(LAPIC_LVR) & 0xff;
result = cpuid(1);
@@ -57,7 +57,7 @@ static void smp_write_processors_inorder(struct mp_config_table *mc)
}
}
}
-
+
static unsigned node_link_to_bus(unsigned node, unsigned link)
{
device_t dev;
@@ -79,12 +79,12 @@ static unsigned node_link_to_bus(unsigned node, unsigned link)
dst_node = (config_map >> 4) & 7;
dst_link = (config_map >> 8) & 3;
bus_base = (config_map >> 16) & 0xff;
-#if 0
+#if 0
printk(BIOS_DEBUG, "node.link=bus: %d.%d=%d 0x%2x->0x%08x\n",
dst_node, dst_link, bus_base,
reg, config_map);
#endif
- if ((dst_node == node) && (dst_link == link))
+ if ((dst_node == node) && (dst_link == link))
{
return bus_base;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 18:41:12 +0000