summaryrefslogtreecommitdiff
path: root/board/freescale/mx6sabresd
diff options
context:
space:
mode:
authorYe.Li <B37916@freescale.com>2014-06-03 16:26:14 +0800
committerYe.Li <B37916@freescale.com>2014-06-17 11:13:39 +0800
commitbd29cd3e5d02a666f65b44daa975b59097cac15e (patch)
treebb7449d20f95db7063fa5fc82331c80da4ccb5d5 /board/freescale/mx6sabresd
parentfb12ded42fa0650d946ed1f4ada1482e61aefae5 (diff)
downloadu-boot-imx-bd29cd3e5d02a666f65b44daa975b59097cac15e.zip
u-boot-imx-bd29cd3e5d02a666f65b44daa975b59097cac15e.tar.gz
u-boot-imx-bd29cd3e5d02a666f65b44daa975b59097cac15e.tar.bz2
ENGR00315894-7 i.mx6q/dl/solo: sabresd/sabreauto: Add the SPI-NOR support
This patch adds the SPI-NOR support for the i.mx6q/dl/solo:sabresd/auto board: - Support the SPI-NOR function with sf command, - Support the enviroment from SPI-NOR when CONFIG_SYS_BOOT_SPINOR Signed-off-by: Jason Liu <r64343@freescale.com> Signed-off-by: Ye.Li <B37916@freescale.com>
Diffstat (limited to 'board/freescale/mx6sabresd')
-rw-r--r--board/freescale/mx6sabresd/mx6sabresd.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index 2800b57..2889b6c 100644
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -164,6 +164,7 @@ iomux_v3_cfg_t const usdhc4_pads[] = {
MX6_PAD_SD4_DAT7__SD4_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
};
+#ifdef CONFIG_SYS_USE_SPINOR
iomux_v3_cfg_t const ecspi1_pads[] = {
MX6_PAD_KEY_COL0__ECSPI1_SCLK | MUX_PAD_CTRL(SPI_PAD_CTRL),
MX6_PAD_KEY_COL1__ECSPI1_MISO | MUX_PAD_CTRL(SPI_PAD_CTRL),
@@ -171,10 +172,12 @@ iomux_v3_cfg_t const ecspi1_pads[] = {
MX6_PAD_KEY_ROW1__GPIO4_IO09 | MUX_PAD_CTRL(NO_PAD_CTRL),
};
-static void setup_spi(void)
+static void setup_spinor(void)
{
imx_iomux_v3_setup_multiple_pads(ecspi1_pads, ARRAY_SIZE(ecspi1_pads));
+ gpio_direction_output(IMX_GPIO_NR(4, 9), 0);
}
+#endif
iomux_v3_cfg_t const pcie_pads[] = {
MX6_PAD_EIM_D19__GPIO3_IO19 | MUX_PAD_CTRL(NO_PAD_CTRL), /* POWER */
@@ -758,8 +761,8 @@ int board_init(void)
/* address of boot parameters */
gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
-#ifdef CONFIG_MXC_SPI
- setup_spi();
+#ifdef CONFIG_SYS_USE_SPINOR
+ setup_spinor();
#endif
#if defined(CONFIG_MX6DL) && defined(CONFIG_MXC_EPDC)