diff options
| -rw-r--r-- | src/mainboard/pcengines/Kconfig | 6 | ||||
| -rw-r--r-- | src/mainboard/pcengines/alix2d/Kconfig (renamed from src/mainboard/pcengines/alix2d3/Kconfig) | 10 | ||||
| -rw-r--r-- | src/mainboard/pcengines/alix2d/chip.h (renamed from src/mainboard/pcengines/alix2d3/chip.h) | 0 | ||||
| -rw-r--r-- | src/mainboard/pcengines/alix2d/cmos.layout (renamed from src/mainboard/pcengines/alix2d3/cmos.layout) | 0 | ||||
| -rw-r--r-- | src/mainboard/pcengines/alix2d/devicetree.cb (renamed from src/mainboard/pcengines/alix2d3/devicetree.cb) | 0 | ||||
| -rw-r--r-- | src/mainboard/pcengines/alix2d/irq_tables.c (renamed from src/mainboard/pcengines/alix2d3/irq_tables.c) | 5 | ||||
| -rw-r--r-- | src/mainboard/pcengines/alix2d/mainboard.c (renamed from src/mainboard/pcengines/alix2d3/mainboard.c) | 6 | ||||
| -rw-r--r-- | src/mainboard/pcengines/alix2d/romstage.c (renamed from src/mainboard/pcengines/alix2d3/romstage.c) | 2 |
8 files changed, 16 insertions, 13 deletions
diff --git a/src/mainboard/pcengines/Kconfig b/src/mainboard/pcengines/Kconfig index bdcd869905..d5d700845c 100644 --- a/src/mainboard/pcengines/Kconfig +++ b/src/mainboard/pcengines/Kconfig @@ -5,13 +5,13 @@ choice config BOARD_PCENGINES_ALIX1C bool "ALIX.1C" -config BOARD_PCENGINES_ALIX2D3 - bool "ALIX.2D3" +config BOARD_PCENGINES_ALIX2D + bool "ALIX.2D2 or 2D3" endchoice source "src/mainboard/pcengines/alix1c/Kconfig" -source "src/mainboard/pcengines/alix2d3/Kconfig" +source "src/mainboard/pcengines/alix2d/Kconfig" config MAINBOARD_VENDOR string diff --git a/src/mainboard/pcengines/alix2d3/Kconfig b/src/mainboard/pcengines/alix2d/Kconfig index 9d57b9dff7..f0997fda5e 100644 --- a/src/mainboard/pcengines/alix2d3/Kconfig +++ b/src/mainboard/pcengines/alix2d/Kconfig @@ -1,4 +1,4 @@ -if BOARD_PCENGINES_ALIX2D3 +if BOARD_PCENGINES_ALIX2D config BOARD_SPECIFIC_OPTIONS # dummy def_bool y @@ -14,18 +14,18 @@ config BOARD_SPECIFIC_OPTIONS # dummy config MAINBOARD_DIR string - default pcengines/alix2d3 + default pcengines/alix2d config MAINBOARD_PART_NUMBER string - default "ALIX.2D3" + default "ALIX.2D" config IRQ_SLOT_COUNT int - default 6 + default 7 config RAMBASE hex default 0x4000 -endif # BOARD_PCENGINES_ALIX2D3 +endif # BOARD_PCENGINES_ALIX2D diff --git a/src/mainboard/pcengines/alix2d3/chip.h b/src/mainboard/pcengines/alix2d/chip.h index fb321d557e..fb321d557e 100644 --- a/src/mainboard/pcengines/alix2d3/chip.h +++ b/src/mainboard/pcengines/alix2d/chip.h diff --git a/src/mainboard/pcengines/alix2d3/cmos.layout b/src/mainboard/pcengines/alix2d/cmos.layout index c1354a2866..c1354a2866 100644 --- a/src/mainboard/pcengines/alix2d3/cmos.layout +++ b/src/mainboard/pcengines/alix2d/cmos.layout diff --git a/src/mainboard/pcengines/alix2d3/devicetree.cb b/src/mainboard/pcengines/alix2d/devicetree.cb index edcbc06623..edcbc06623 100644 --- a/src/mainboard/pcengines/alix2d3/devicetree.cb +++ b/src/mainboard/pcengines/alix2d/devicetree.cb diff --git a/src/mainboard/pcengines/alix2d3/irq_tables.c b/src/mainboard/pcengines/alix2d/irq_tables.c index 0dffcb6586..7b6b94ab52 100644 --- a/src/mainboard/pcengines/alix2d3/irq_tables.c +++ b/src/mainboard/pcengines/alix2d/irq_tables.c @@ -94,7 +94,7 @@ const struct irq_routing_table intel_irq_routing_table = { /* On-board ethernet (Left) */ {0x00, (0x09 << 3) | 0x0, {{L_PIRQB, M_PIRQB}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}}, 0x0, 0x0}, - /* On-board ethernet (Middle) */ + /* On-board ethernet (Middle, ALIX.2D3 only) */ {0x00, (0x0A << 3) | 0x0, {{L_PIRQC, M_PIRQC}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}}, 0x0, 0x0}, /* On-board ethernet (Right) */ @@ -103,6 +103,9 @@ const struct irq_routing_table intel_irq_routing_table = { /* Mini PCI (slot 1) */ {0x00, (0x0C << 3) | 0x0, {{L_PIRQA, M_PIRQA}, {L_PIRQB, M_PIRQB}, {0x00, 0x00}, {0x00, 0x00}}, 0x0, 0x0}, + /* Mini PCI (slot 2, ALIX.2D2 only) */ + {0x00, (0x0E << 3) | 0x0, {{L_PIRQC, M_PIRQC}, {L_PIRQD, M_PIRQD}, {0x00, 0x00}, {0x00, 0x00}}, 0x0, 0x0}, + /* Chipset slots -- f.3 wires to B, and f.4 and f.5 wires to D. */ {0x00, (0x0F << 3) | 0x0, {{L_PIRQA, M_PIRQA}, {L_PIRQB, M_PIRQB}, {L_PIRQC, M_PIRQC}, {L_PIRQD, M_PIRQD}}, 0x0, 0x0}, } diff --git a/src/mainboard/pcengines/alix2d3/mainboard.c b/src/mainboard/pcengines/alix2d/mainboard.c index 416e3b1264..b227d6611c 100644 --- a/src/mainboard/pcengines/alix2d3/mainboard.c +++ b/src/mainboard/pcengines/alix2d/mainboard.c @@ -23,8 +23,8 @@ static void init(struct device *dev) { - printk(BIOS_DEBUG, "ALIX.2D3 ENTER %s\n", __func__); - printk(BIOS_DEBUG, "ALIX.2D3 EXIT %s\n", __func__); + printk(BIOS_DEBUG, "ALIX.2D ENTER %s\n", __func__); + printk(BIOS_DEBUG, "ALIX.2D EXIT %s\n", __func__); } static void enable_dev(struct device *dev) @@ -33,7 +33,7 @@ static void enable_dev(struct device *dev) } struct chip_operations mainboard_ops = { - CHIP_NAME("PC Engines ALIX.2D3 Mainboard") + CHIP_NAME("PC Engines ALIX.2D Mainboard") .enable_dev = enable_dev, }; diff --git a/src/mainboard/pcengines/alix2d3/romstage.c b/src/mainboard/pcengines/alix2d/romstage.c index 3c2480abd2..1c00f8781e 100644 --- a/src/mainboard/pcengines/alix2d3/romstage.c +++ b/src/mainboard/pcengines/alix2d/romstage.c @@ -35,7 +35,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) -/* The ALIX.2D3 has no SMBus; the setup is hard-wired. */ +/* The ALIX.2D has no SMBus; the setup is hard-wired. */ static void cs5536_enable_smbus(void) { } |