From: Peng Fan Date: Sat, 4 Mar 2017 02:45:42 +0000 (+0800) Subject: imx: mx6slevk: use SPI_BOOT X-Git-Tag: v2017.05-rc2~9^2~24 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6b2781f67970728354174c021c740626a2d620e8;p=u-boot imx: mx6slevk: use SPI_BOOT Use SPI_BOOT instead of SYS_BOOT_SPINOR. Signed-off-by: Peng Fan Cc: Stefano Babic --- diff --git a/configs/mx6slevk_spinor_defconfig b/configs/mx6slevk_spinor_defconfig index 7c0a3a801a..e1c9118afd 100644 --- a/configs/mx6slevk_spinor_defconfig +++ b/configs/mx6slevk_spinor_defconfig @@ -1,7 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6SLEVK=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL,SYS_BOOT_SPINOR" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL" +CONFIG_SPI_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 3e7e5a3997..19dcc5cfb7 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -145,7 +145,7 @@ /* Environment organization */ #define CONFIG_ENV_SIZE SZ_8K -#if defined CONFIG_SYS_BOOT_SPINOR +#if defined CONFIG_SPI_BOOT #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_OFFSET (768 * 1024) #define CONFIG_ENV_SECT_SIZE (64 * 1024)