diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2016-05-27 13:07:50 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2016-05-30 15:15:24 +0200 |
| commit | 17163755075149f36c37458af0cb5f398d2a6766 (patch) | |
| tree | d09edf42d195f99a7f584c54ed38a56d3d9b2e46 | |
| parent | e0849350aa74c58751675da389d717a93c365030 (diff) | |
| download | coreboot-17163755075149f36c37458af0cb5f398d2a6766.tar.xz | |
pcengines/apu1: Rename Kconfig variables for pinmux
Add APU1 prefix because Kconfig throws errors if we try to
define the same variables as choice-entry for APU2 board.
Change-Id: Ic071600dd88e391a8a278d63aad13abd01fd3c9d
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/14988
Tested-by: build bot (Jenkins)
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
| -rw-r--r-- | src/mainboard/pcengines/apu1/Kconfig | 16 | ||||
| -rw-r--r-- | src/mainboard/pcengines/apu1/mainboard.c | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/mainboard/pcengines/apu1/Kconfig b/src/mainboard/pcengines/apu1/Kconfig index 23287762e9..e9aab8cbfe 100644 --- a/src/mainboard/pcengines/apu1/Kconfig +++ b/src/mainboard/pcengines/apu1/Kconfig @@ -82,30 +82,30 @@ config DRIVERS_PS2_KEYBOARD choice prompt "J19 pins 1-10" - default PINMUX_OFF_C + default APU1_PINMUX_OFF_C -config PINMUX_OFF_C +config APU1_PINMUX_OFF_C bool "disable" -config PINMUX_GPIO0 +config APU1_PINMUX_GPIO0 bool "GPIO" -config PINMUX_UART_C +config APU1_PINMUX_UART_C bool "UART 0x3e8" endchoice choice prompt "J19 pins 11-20" - default PINMUX_OFF_D + default APU1_PINMUX_OFF_D -config PINMUX_OFF_D +config APU1_PINMUX_OFF_D bool "disable" -config PINMUX_GPIO1 +config APU1_PINMUX_GPIO1 bool "GPIO" -config PINMUX_UART_D +config APU1_PINMUX_UART_D bool "UART 0x2e8" endchoice diff --git a/src/mainboard/pcengines/apu1/mainboard.c b/src/mainboard/pcengines/apu1/mainboard.c index f11d94b116..2ebdc752cb 100644 --- a/src/mainboard/pcengines/apu1/mainboard.c +++ b/src/mainboard/pcengines/apu1/mainboard.c @@ -146,16 +146,16 @@ static void config_gpio_mux(void) uart = dev_find_slot_pnp(SIO_PORT, NCT5104D_SP3); gpio = dev_find_slot_pnp(SIO_PORT, NCT5104D_GPIO0); if (uart) - uart->enabled = CONFIG_PINMUX_UART_C; + uart->enabled = CONFIG_APU1_PINMUX_UART_C; if (gpio) - gpio->enabled = CONFIG_PINMUX_GPIO0; + gpio->enabled = CONFIG_APU1_PINMUX_GPIO0; uart = dev_find_slot_pnp(SIO_PORT, NCT5104D_SP4); gpio = dev_find_slot_pnp(SIO_PORT, NCT5104D_GPIO1); if (uart) - uart->enabled = CONFIG_PINMUX_UART_D; + uart->enabled = CONFIG_APU1_PINMUX_UART_D; if (gpio) - gpio->enabled = CONFIG_PINMUX_GPIO1; + gpio->enabled = CONFIG_APU1_PINMUX_GPIO1; } /** |