From: Peng Fan Date: Tue, 30 Dec 2014 03:14:51 +0000 (+0800) Subject: imx:mx6slevk add spi nor boot support X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=be2fde60b0de7723d29035ba952a970d9e1ca94d;p=u-boot.git imx:mx6slevk add spi nor boot support Add spi nor boot support for mx6slevk board. Signed-off-by: Peng Fan Reviewed-by: Jagannadha Sutradharudu Teki --- diff --git a/board/freescale/mx6slevk/MAINTAINERS b/board/freescale/mx6slevk/MAINTAINERS index 660af91aee..18d31a8d8b 100644 --- a/board/freescale/mx6slevk/MAINTAINERS +++ b/board/freescale/mx6slevk/MAINTAINERS @@ -4,3 +4,4 @@ S: Maintained F: board/freescale/mx6slevk/ F: include/configs/mx6slevk.h F: configs/mx6slevk_defconfig +F: configs/mx6slevk_spinor_defconfig diff --git a/configs/mx6slevk_spinor_defconfig b/configs/mx6slevk_spinor_defconfig new file mode 100644 index 0000000000..93efe73014 --- /dev/null +++ b/configs/mx6slevk_spinor_defconfig @@ -0,0 +1,3 @@ +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL,SYS_BOOT_SPINOR" +CONFIG_ARM=y +CONFIG_TARGET_MX6SLEVK=y diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index e3e7f7686b..e6c41306a3 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -187,9 +187,20 @@ /* FLASH and environment organization */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_ENV_OFFSET (6 * SZ_64K) #define CONFIG_ENV_SIZE SZ_8K + +#if defined CONFIG_SYS_BOOT_SPINOR +#define CONFIG_ENV_IS_IN_SPI_FLASH +#define CONFIG_ENV_OFFSET (768 * 1024) +#define CONFIG_ENV_SECT_SIZE (64 * 1024) +#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS +#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS +#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE +#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED +#else +#define CONFIG_ENV_OFFSET (6 * SZ_64K) #define CONFIG_ENV_IS_IN_MMC +#endif #define CONFIG_OF_LIBFDT #define CONFIG_CMD_BOOTZ