summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-10-08 17:10:27 -0400
committerTom Rini <trini@ti.com>2014-10-23 11:53:01 -0400
commitb6ab550413b6b64d0024e9dec8bf6017653127e4 (patch)
tree4a794732b0f6f2e77d7f4920cd47f53a6cad2a57 /board
parent76bfd1625a27d72bcfeec6c1b239b70495f5fa78 (diff)
downloadblackbird-obmc-uboot-b6ab550413b6b64d0024e9dec8bf6017653127e4.tar.gz
blackbird-obmc-uboot-b6ab550413b6b64d0024e9dec8bf6017653127e4.zip
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 <trini@ti.com>
Diffstat (limited to 'board')
-rw-r--r--board/ti/am335x/mux.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c
index f4bb9f890b..680f6560f2 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);
OpenPOWER on IntegriCloud