Index: src/mainboard/pcengines/alix2/Kconfig =================================================================== --- src/mainboard/pcengines/alix2/Kconfig (revision 5766) +++ src/mainboard/pcengines/alix2/Kconfig (working copy) @@ -1,4 +1,4 @@ -if BOARD_PCENGINES_ALIX2D +if BOARD_PCENGINES_ALIX2 config BOARD_SPECIFIC_OPTIONS # dummy def_bool y @@ -14,18 +14,38 @@ config MAINBOARD_DIR string - default pcengines/alix2d + default pcengines/alix2 config MAINBOARD_PART_NUMBER string - default "ALIX.2D" + default "ALIX.2" config IRQ_SLOT_COUNT int default 7 -config RAMBASE - hex - default 0x4000 +# Alix-specific options -endif # BOARD_PCENGINES_ALIX2D +menu "ALIX.2 Onboard LEDs boot-up status" + +config ALIX2_LEDSTATE_LED1 + bool "LED 1" + default 1 + help + Should LED 1 be lit at boot ? + +config ALIX2_LEDSTATE_LED2 + bool "LED 2" + default 0 + help + Should LED 2 be lit at boot ? + +config ALIX2_LEDSTATE_LED3 + bool "LED 3" + default 0 + help + Should LED 3 be lit at boot ? + +endmenu + +endif # BOARD_PCENGINES_ALIX2 Index: src/mainboard/pcengines/alix2/devicetree.cb =================================================================== --- src/mainboard/pcengines/alix2/devicetree.cb (revision 5766) +++ src/mainboard/pcengines/alix2/devicetree.cb (working copy) @@ -21,7 +21,7 @@ register "com1_enable" = "1" register "com1_address" = "0x3F8" register "com1_irq" = "4" - register "com2_enable" = "1" # Wired on Alix.2D13 only + register "com2_enable" = "1" # Wired only on Alix.2D13 internal header register "com2_address" = "0x2F8" register "com2_irq" = "3" register "unwanted_vpci[0]" = "0x80000900" # Disable VGA controller (not wired) Index: src/mainboard/pcengines/alix2/romstage.c =================================================================== --- src/mainboard/pcengines/alix2/romstage.c (revision 5766) +++ src/mainboard/pcengines/alix2/romstage.c (working copy) @@ -138,15 +138,22 @@ * This resets the GPIO I/O space to 0x6100. * This may break other things, though. */ + + /* First, set the output values according to config */ +#ifndef CONFIG_ALIX2_LEDSTATE_LED1 + outl(1 << 6, GPIO_IO_BASE + GPIOL_OUTPUT_VALUE); /* Disable Led 1 */ +#endif +#ifndef CONFIG_ALIX2_LEDSTATE_LED2 + outl(1 << 9, GPIO_IO_BASE + GPIOH_OUTPUT_VALUE); /* Disabled Led 2 */ +#endif +#ifndef CONFIG_ALIX2_LEDSTATE_LED3 + outl(1 << 11, GPIO_IO_BASE + GPIOH_OUTPUT_VALUE); /* Disabled Led 3 */ +#endif + + /* Next, enable the outputs (they are high-impedance on reset) */ outl(1 << 6, GPIO_IO_BASE + GPIOL_OUTPUT_ENABLE); outl(1 << 9, GPIO_IO_BASE + GPIOH_OUTPUT_ENABLE); outl(1 << 11, GPIO_IO_BASE + GPIOH_OUTPUT_ENABLE); - - /* outl(1 << 6, GPIO_IO_BASE + GPIOL_OUTPUT_VALUE); */ /* Led 1 enabled */ - outl(1 << 9, GPIO_IO_BASE + GPIOH_OUTPUT_VALUE); /* Led 2 disabled */ - outl(1 << 11, GPIO_IO_BASE + GPIOH_OUTPUT_VALUE); /* Led 3 disabled */ - - } void main(unsigned long bist) Index: src/mainboard/pcengines/alix2/irq_tables.c =================================================================== --- src/mainboard/pcengines/alix2/irq_tables.c (revision 5766) +++ src/mainboard/pcengines/alix2/irq_tables.c (working copy) @@ -41,34 +41,37 @@ #define L_PIRQD 4 /* Means Slot INTx# Connects To Chipset INTD# */ /* - * ALIX.2D3 interrupt wiring. + * ALIX.2[CD][23] interrupt wiring. * * Devices are: * 00:01.0 Host bridge [0600]: Advanced Micro Devices [AMD] CS5536 [Geode companion] Host Bridge [1022:2080] (rev 33) * 00:01.2 Entertainment encryption device [1010]: Advanced Micro Devices [AMD] Geode LX AES Security Block [1022:2082] * 00:09.0 Ethernet controller [0200]: VIA Technologies, Inc. VT6105M [Rhine-III] [1106:3053] (rev 96) - * 00:0a.0 Ethernet controller [0200]: VIA Technologies, Inc. VT6105M [Rhine-III] [1106:3053] (rev 96) * 00:0b.0 Ethernet controller [0200]: VIA Technologies, Inc. VT6105M [Rhine-III] [1106:3053] (rev 96) * 00:0f.0 ISA bridge [0601]: Advanced Micro Devices [AMD] CS5536 [Geode companion] ISA [1022:2090] (rev 03) * 00:0f.2 IDE interface [0101]: Advanced Micro Devices [AMD] CS5536 [Geode companion] IDE [1022:209a] (rev 01) * 00:0f.4 USB Controller [0c03]: Advanced Micro Devices [AMD] CS5536 [Geode companion] OHC [1022:2094] (rev 02) * 00:0f.5 USB Controller [0c03]: Advanced Micro Devices [AMD] CS5536 [Geode companion] EHC [1022:2095] (rev 02) - - * The only devices that interrupt are: * + * Alix 2C3 and 2D(1)3 also have: + * 00:0a.0 Ethernet controller [0200]: VIA Technologies, Inc. VT6105M [Rhine-III] [1106:3053] (rev 96) + * + * Interrupt routing table: + * * What Device IRQ PIN PIN WIRED TO * ------------------------------------------------- * AES 00:01.2 0a 01 A A - * eth0 00:09.0 0b 01 A B + * eth0 00:09.0 0a 01 A B * eth1 00:0a.0 0b 01 A C - * eth2 00:0b.0 0b 01 A D - * mpci 00:0c.0 0a 01 A A - * mpci 00:0c.0 0b 02 B B + * eth2 00:0b.0 09 01 A D + * mpci 00:0c.0 ?? 1,2 A,B A,B + * mpci 00:0e.0 ?? 1,2 A,B C,D * usb 00:0f.4 0b 04 D D * usb 00:0f.5 0b 04 D D * - * The only swizzled interrupts are the ethernet controllers, where INTA is wired to - * interrupt controller lines B, C and D. + * Swizzled interrupts: + * - Ethernet controllers, where INTA is wired to interrupt controller lines B, C and D. + * - MiniPCI Slot 2, where A and B are wired to C and D. */ const struct irq_routing_table intel_irq_routing_table = { @@ -94,7 +97,7 @@ /* On-board ethernet (Left) */ {0x00, (0x09 << 3) | 0x0, {{L_PIRQB, M_PIRQB}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}}, 0x0, 0x0}, - /* On-board ethernet (Middle, ALIX.2D3 only) */ + /* On-board ethernet (Middle, ALIX 2C3 and 2D(1)3 only) */ {0x00, (0x0A << 3) | 0x0, {{L_PIRQC, M_PIRQC}, {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x00}}, 0x0, 0x0}, /* On-board ethernet (Right) */ @@ -103,7 +106,7 @@ /* 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) */ + /* Mini PCI (slot 2, ALIX 2C2 and 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. */ Index: src/mainboard/pcengines/alix2/mainboard.c =================================================================== --- src/mainboard/pcengines/alix2/mainboard.c (revision 5766) +++ src/mainboard/pcengines/alix2/mainboard.c (working copy) @@ -23,8 +23,8 @@ static void init(struct device *dev) { - printk(BIOS_DEBUG, "ALIX.2D ENTER %s\n", __func__); - printk(BIOS_DEBUG, "ALIX.2D EXIT %s\n", __func__); + printk(BIOS_DEBUG, "ALIX.2 ENTER %s\n", __func__); + printk(BIOS_DEBUG, "ALIX.2 EXIT %s\n", __func__); } static void enable_dev(struct device *dev) @@ -33,7 +33,7 @@ } struct chip_operations mainboard_ops = { - CHIP_NAME("PC Engines ALIX.2D Mainboard") + CHIP_NAME("PC Engines ALIX.2 Mainboard") .enable_dev = enable_dev, }; Index: src/mainboard/pcengines/Kconfig =================================================================== --- src/mainboard/pcengines/Kconfig (revision 5766) +++ src/mainboard/pcengines/Kconfig (working copy) @@ -5,13 +5,20 @@ config BOARD_PCENGINES_ALIX1C bool "ALIX.1C" -config BOARD_PCENGINES_ALIX2D - bool "ALIX.2D2 or 2D3" +config BOARD_PCENGINES_ALIX2 + bool "ALIX.2 series" + help + Supported mainboards: + - ALIX.2c2 + - ALIX.2c3 + - ALIX.2d2 + - ALIX.2d3 + - ALIX.2d13 endchoice source "src/mainboard/pcengines/alix1c/Kconfig" -source "src/mainboard/pcengines/alix2d/Kconfig" +source "src/mainboard/pcengines/alix2/Kconfig" config MAINBOARD_VENDOR string