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/ti/am335x/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/ti/am335x/mux.c')
| -rw-r--r-- | board/ti/am335x/mux.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c index 6e1ede3933..6fb2c009ba 100644 --- a/board/ti/am335x/mux.c +++ b/board/ti/am335x/mux.c @@ -195,7 +195,7 @@ static struct module_pin_mux rmii1_pin_mux[] = { {-1}, }; -#ifdef CONFIG_NAND +#ifdef CONFIG_MTD_RAW_NAND static struct module_pin_mux nand_pin_mux[] = { {OFFSET(gpmc_ad0), (MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD0 */ {OFFSET(gpmc_ad1), (MODE(0) | PULLUDDIS | RXACTIVE)}, /* AD1 */ @@ -360,7 +360,7 @@ void enable_board_pin_mux(void) /* Beaglebone pinmux */ configure_module_pin_mux(mii1_pin_mux); configure_module_pin_mux(mmc0_pin_mux); -#if defined(CONFIG_NAND) +#if defined(CONFIG_MTD_RAW_NAND) configure_module_pin_mux(nand_pin_mux); #elif defined(CONFIG_NOR) configure_module_pin_mux(bone_norcape_pin_mux); @@ -376,7 +376,7 @@ void enable_board_pin_mux(void) if (profile & ~PROFILE_2) configure_module_pin_mux(i2c1_pin_mux); /* Profiles 2 & 3 don't have NAND */ -#ifdef CONFIG_NAND +#ifdef CONFIG_MTD_RAW_NAND if (profile & ~(PROFILE_2 | PROFILE_3)) configure_module_pin_mux(nand_pin_mux); #endif @@ -404,7 +404,7 @@ void enable_board_pin_mux(void) } /* Beaglebone LT pinmux */ configure_module_pin_mux(mmc0_pin_mux); -#if defined(CONFIG_NAND) && defined(CONFIG_EMMC_BOOT) +#if defined(CONFIG_MTD_RAW_NAND) && defined(CONFIG_EMMC_BOOT) configure_module_pin_mux(nand_pin_mux); #elif defined(CONFIG_NOR) && defined(CONFIG_EMMC_BOOT) configure_module_pin_mux(bone_norcape_pin_mux); |