From: Tom Rini Date: Wed, 8 Oct 2014 21:10:27 +0000 (-0400) Subject: am335x_boneblack: Only modify NAND/NOR/MMC1 pinmux on BBB in boneblack builds. X-Git-Tag: v2015.01-rc1~125^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b6ab550413b6b64d0024e9dec8bf6017653127e4;p=platform%2Fkernel%2Fu-boot.git am335x_boneblack: Only modify NAND/NOR/MMC1 pinmux on BBB in boneblack builds. In the case of Beaglebone Black we only want to set the NAND or NOR cape pinmux when the config has been specifically modified by the user for this non-default case. Make the default be to set the MMC1 (eMMC) pinmux. We don't need similar changes for Beaglebone White as there is nothing on MMC1 by default there. Signed-off-by: Tom Rini --- diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c index f4bb9f8..680f656 100644 --- a/board/ti/am335x/mux.c +++ b/board/ti/am335x/mux.c @@ -359,9 +359,9 @@ void enable_board_pin_mux(struct am335x_baseboard_id *header) configure_module_pin_mux(i2c1_pin_mux); configure_module_pin_mux(mii1_pin_mux); configure_module_pin_mux(mmc0_pin_mux); -#if defined(CONFIG_NAND) +#if defined(CONFIG_NAND) && defined(CONFIG_EMMC_BOOT) configure_module_pin_mux(nand_pin_mux); -#elif defined(CONFIG_NOR) +#elif defined(CONFIG_NOR) && defined(CONFIG_EMMC_BOOT) configure_module_pin_mux(bone_norcape_pin_mux); #else configure_module_pin_mux(mmc1_pin_mux);