Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-23 05:08:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

imx: ventana: skip nand init for nandless boards

Browse source 
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
This commit is contained in:
Tim Harvey 2019-02-04 13:10:52 -08:00 • committed by Stefano Babic
parent b81c07bcc3
commit fd10b3b176
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
board/gateworks/gw_ventana/common.c
View file

@ -859,6 +859,7 @@ struct ventana gpio_cfg[GW_UNKNOWN] = {
.vidin_en = IMX_GPIO_NR(5, 20), .vidin_en = IMX_GPIO_NR(5, 20),
.wdis = IMX_GPIO_NR(7, 12), .wdis = IMX_GPIO_NR(7, 12),
.otgpwr_en = IMX_GPIO_NR(3, 22), .otgpwr_en = IMX_GPIO_NR(3, 22),
.nand = true,
}, },
/* GW52xx */ /* GW52xx */
@ -884,6 +885,7 @@ struct ventana gpio_cfg[GW_UNKNOWN] = {
.otgpwr_en = IMX_GPIO_NR(3, 22), .otgpwr_en = IMX_GPIO_NR(3, 22),
.vsel_pin = IMX_GPIO_NR(6, 14), .vsel_pin = IMX_GPIO_NR(6, 14),
.mmc_cd = IMX_GPIO_NR(7, 0), .mmc_cd = IMX_GPIO_NR(7, 0),
.nand = true,
}, },
/* GW53xx */ /* GW53xx */
@ -908,6 +910,7 @@ struct ventana gpio_cfg[GW_UNKNOWN] = {
.otgpwr_en = IMX_GPIO_NR(3, 22), .otgpwr_en = IMX_GPIO_NR(3, 22),
.vsel_pin = IMX_GPIO_NR(6, 14), .vsel_pin = IMX_GPIO_NR(6, 14),
.mmc_cd = IMX_GPIO_NR(7, 0), .mmc_cd = IMX_GPIO_NR(7, 0),
.nand = true,
}, },
/* GW54xx */ /* GW54xx */
@ -934,6 +937,7 @@ struct ventana gpio_cfg[GW_UNKNOWN] = {
.otgpwr_en = IMX_GPIO_NR(3, 22), .otgpwr_en = IMX_GPIO_NR(3, 22),
.vsel_pin = IMX_GPIO_NR(6, 14), .vsel_pin = IMX_GPIO_NR(6, 14),
.mmc_cd = IMX_GPIO_NR(7, 0), .mmc_cd = IMX_GPIO_NR(7, 0),
.nand = true,
}, },
/* GW551x */ /* GW551x */
@ -947,6 +951,7 @@ struct ventana gpio_cfg[GW_UNKNOWN] = {
}, },
.pcie_rst = IMX_GPIO_NR(1, 0), .pcie_rst = IMX_GPIO_NR(1, 0),
.wdis = IMX_GPIO_NR(7, 12), .wdis = IMX_GPIO_NR(7, 12),
.nand = true,
}, },
/* GW552x */ /* GW552x */
@ -964,6 +969,7 @@ struct ventana gpio_cfg[GW_UNKNOWN] = {
.usb_sel = IMX_GPIO_NR(1, 7), .usb_sel = IMX_GPIO_NR(1, 7),
.wdis = IMX_GPIO_NR(7, 12), .wdis = IMX_GPIO_NR(7, 12),
.msata_en = GP_MSATA_SEL, .msata_en = GP_MSATA_SEL,
.nand = true,
}, },
/* GW553x */ /* GW553x */
@ -982,6 +988,7 @@ struct ventana gpio_cfg[GW_UNKNOWN] = {
.otgpwr_en = IMX_GPIO_NR(3, 22), .otgpwr_en = IMX_GPIO_NR(3, 22),
.vsel_pin = IMX_GPIO_NR(6, 14), .vsel_pin = IMX_GPIO_NR(6, 14),
.mmc_cd = IMX_GPIO_NR(7, 0), .mmc_cd = IMX_GPIO_NR(7, 0),
.nand = true,
}, },
/* GW560x */ /* GW560x */

1
board/gateworks/gw_ventana/common.h
View file

@ -80,6 +80,7 @@ struct ventana {
int mmc_cd; int mmc_cd;
/* various features */ /* various features */
bool usd_vsel; bool usd_vsel;
bool nand;
}; };
extern struct ventana gpio_cfg[GW_UNKNOWN]; extern struct ventana gpio_cfg[GW_UNKNOWN];

10
board/gateworks/gw_ventana/gw_ventana.c
View file

@ -647,21 +647,23 @@ int board_init(void)
/* address of linux boot parameters */ /* address of linux boot parameters */
gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
/* read Gateworks EEPROM into global struct (used later) */
setup_ventana_i2c(0);
board_type = read_eeprom(CONFIG_I2C_GSC, &ventana_info);
#ifdef CONFIG_CMD_NAND #ifdef CONFIG_CMD_NAND
setup_gpmi_nand(); if (gpio_cfg[board_type].nand)
setup_gpmi_nand();
#endif #endif
#ifdef CONFIG_MXC_SPI #ifdef CONFIG_MXC_SPI
setup_spi(); setup_spi();
#endif #endif
setup_ventana_i2c(0);
setup_ventana_i2c(1); setup_ventana_i2c(1);
setup_ventana_i2c(2); setup_ventana_i2c(2);
#ifdef CONFIG_SATA #ifdef CONFIG_SATA
setup_sata(); setup_sata();
#endif #endif
/* read Gateworks EEPROM into global struct (used later) */
board_type = read_eeprom(CONFIG_I2C_GSC, &ventana_info);
setup_iomux_gpio(board_type, &ventana_info); setup_iomux_gpio(board_type, &ventana_info);