diff options
| author | Tom Rini <trini@konsulko.com> | 2019-12-04 17:13:35 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-04 17:13:35 -0500 |
| commit | c1c6e4a9da674bce5980d82f8a70a56e023e58c3 (patch) | |
| tree | 46548095b9e4baaa3a7de1d0ce8d07168ad3c01a /board/siemens/pxm2/mux.c | |
| parent | 94d022bb400890f22fe35220d2519c3bce73f05e (diff) | |
| parent | fb4384490df4e753dcac0478bdb5e912994ef9d6 (diff) | |
| download | u-boot-c1c6e4a9da674bce5980d82f8a70a56e023e58c3.tar.gz | |
Merge branch '2019-10-27-mtd-cleanup'
- Merge the series to clean up our MTD Kconfig and Makefile logic
Diffstat (limited to 'board/siemens/pxm2/mux.c')
| -rw-r--r-- | board/siemens/pxm2/mux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/siemens/pxm2/mux.c b/board/siemens/pxm2/mux.c index 9b69b6f5c4..2f35bb4a73 100644 --- a/board/siemens/pxm2/mux.c +++ b/board/siemens/pxm2/mux.c @@ -26,7 +26,7 @@ static struct module_pin_mux uart0_pin_mux[] = { {-1}, }; -#ifdef CONFIG_NAND +#ifdef CONFIG_MTD_RAW_NAND static struct module_pin_mux nand_pin_mux[] = { {OFFSET(gpmc_ad0), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD0 */ {OFFSET(gpmc_ad1), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD1 */ @@ -169,7 +169,7 @@ void enable_board_pin_mux(void) { configure_module_pin_mux(uart0_pin_mux); configure_module_pin_mux(i2c1_pin_mux); -#ifdef CONFIG_NAND +#ifdef CONFIG_MTD_RAW_NAND configure_module_pin_mux(nand_pin_mux); #endif #ifndef CONFIG_NO_ETH |