diff options
author | Adam Ford | 2018-10-14 15:53:17 -0500 |
---|---|---|
committer | Tom Rini | 2018-10-22 08:18:49 -0500 |
commit | 290097fe2736dd23bfb926658d188db533b59779 (patch) | |
tree | 65f07d59b7e09f9ac22df0bb60328ea620e89fdd /configs | |
parent | e18333e50147a7ba6715a7012f1b03ed5009f628 (diff) | |
download | u-boot-290097fe2736dd23bfb926658d188db533b59779.tar.gz u-boot-290097fe2736dd23bfb926658d188db533b59779.tar.xz u-boot-290097fe2736dd23bfb926658d188db533b59779.zip |
ARM: omap3_logic: Add NOR Flash Support for SOM-LV
The DM37 and OMAP35 SOM-LV SOM-LV products both support a NOR
flash part connected to CS2 in addition to the NAND part on CS0.
This patch setups the GPMC timings for the MT28 NOR Flash and
enables the CFI-Flash driver now that the CFI stuff is in Kconfig
Signed-off-by: Adam Ford <aford173@gmail.com>
Diffstat (limited to 'configs')
-rw-r--r-- | configs/omap35_logic_somlv_defconfig | 10 | ||||
-rw-r--r-- | configs/omap3_logic_somlv_defconfig | 11 |
2 files changed, 16 insertions, 5 deletions
diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig index 4521aedb2a..2b7dececf7 100644 --- a/configs/omap35_logic_somlv_defconfig +++ b/configs/omap35_logic_somlv_defconfig | |||
@@ -24,8 +24,8 @@ CONFIG_CMD_SPL_WRITE_SIZE=0x20000 | |||
24 | CONFIG_CMD_NAND=y | 24 | CONFIG_CMD_NAND=y |
25 | CONFIG_CMD_NAND_LOCK_UNLOCK=y | 25 | CONFIG_CMD_NAND_LOCK_UNLOCK=y |
26 | CONFIG_CMD_CACHE=y | 26 | CONFIG_CMD_CACHE=y |
27 | CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" | 27 | CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0,nor0=physmap-flash.0" |
28 | CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs)" | 28 | CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs);physmap-flash.0:-(nor)" |
29 | CONFIG_CMD_UBI=y | 29 | CONFIG_CMD_UBI=y |
30 | CONFIG_OF_CONTROL=y | 30 | CONFIG_OF_CONTROL=y |
31 | CONFIG_SPL_OF_CONTROL=y | 31 | CONFIG_SPL_OF_CONTROL=y |
@@ -39,6 +39,12 @@ CONFIG_FASTBOOT_BUF_ADDR=0x82000000 | |||
39 | CONFIG_DM_I2C=y | 39 | CONFIG_DM_I2C=y |
40 | CONFIG_DM_MMC=y | 40 | CONFIG_DM_MMC=y |
41 | CONFIG_MMC_OMAP_HS=y | 41 | CONFIG_MMC_OMAP_HS=y |
42 | CONFIG_MTD_NOR_FLASH=y | ||
43 | CONFIG_FLASH_CFI_DRIVER=y | ||
44 | CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y | ||
45 | CONFIG_FLASH_CFI_MTD=y | ||
46 | CONFIG_SYS_FLASH_PROTECTION=y | ||
47 | CONFIG_SYS_FLASH_CFI=y | ||
42 | CONFIG_NAND=y | 48 | CONFIG_NAND=y |
43 | CONFIG_SYS_NAND_BUSWIDTH_16BIT=y | 49 | CONFIG_SYS_NAND_BUSWIDTH_16BIT=y |
44 | CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y | 50 | CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y |
diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig index d29621d8ce..16351ba41c 100644 --- a/configs/omap3_logic_somlv_defconfig +++ b/configs/omap3_logic_somlv_defconfig | |||
@@ -20,12 +20,11 @@ CONFIG_CMD_SPL=y | |||
20 | CONFIG_CMD_SPL_NAND_OFS=0x240000 | 20 | CONFIG_CMD_SPL_NAND_OFS=0x240000 |
21 | CONFIG_CMD_SPL_WRITE_SIZE=0x20000 | 21 | CONFIG_CMD_SPL_WRITE_SIZE=0x20000 |
22 | # CONFIG_CMD_EEPROM is not set | 22 | # CONFIG_CMD_EEPROM is not set |
23 | # CONFIG_CMD_FLASH is not set | ||
24 | CONFIG_CMD_NAND=y | 23 | CONFIG_CMD_NAND=y |
25 | CONFIG_CMD_NAND_LOCK_UNLOCK=y | 24 | CONFIG_CMD_NAND_LOCK_UNLOCK=y |
26 | CONFIG_CMD_CACHE=y | 25 | CONFIG_CMD_CACHE=y |
27 | CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" | 26 | CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0,nor0=physmap-flash.0" |
28 | CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs)" | 27 | CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs);physmap-flash.0:-(nor)" |
29 | CONFIG_CMD_UBI=y | 28 | CONFIG_CMD_UBI=y |
30 | CONFIG_OF_CONTROL=y | 29 | CONFIG_OF_CONTROL=y |
31 | CONFIG_SPL_OF_CONTROL=y | 30 | CONFIG_SPL_OF_CONTROL=y |
@@ -40,6 +39,12 @@ CONFIG_DM_I2C=y | |||
40 | CONFIG_DM_MMC=y | 39 | CONFIG_DM_MMC=y |
41 | CONFIG_MMC_OMAP_HS=y | 40 | CONFIG_MMC_OMAP_HS=y |
42 | CONFIG_MMC_OMAP36XX_PINS=y | 41 | CONFIG_MMC_OMAP36XX_PINS=y |
42 | CONFIG_MTD_NOR_FLASH=y | ||
43 | CONFIG_FLASH_CFI_DRIVER=y | ||
44 | CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y | ||
45 | CONFIG_FLASH_CFI_MTD=y | ||
46 | CONFIG_SYS_FLASH_PROTECTION=y | ||
47 | CONFIG_SYS_FLASH_CFI=y | ||
43 | CONFIG_NAND=y | 48 | CONFIG_NAND=y |
44 | CONFIG_SYS_NAND_BUSWIDTH_16BIT=y | 49 | CONFIG_SYS_NAND_BUSWIDTH_16BIT=y |
45 | CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y | 50 | CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y |