GNUBoot/coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pcengines/apu1: Rename Kconfig variables for pinmux

Browse source 
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>
This commit is contained in:
Kyösti Mälkki 2016-05-27 13:07:50 +03:00
parent e0849350aa
commit 1716375507
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/mainboard/pcengines/apu1/Kconfig
View file

@ -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

8
src/mainboard/pcengines/apu1/mainboard.c
View file

@ -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;
}
/**