[U-Boot] ARM: imx6q_logic: Enable SPL Booting from NAND

[sbabic at denx.de]

> This patch fixes a few values that were incorrect, and this
> now lets SPL boot from NAND.
> Signed-off-by: Adam Ford <aford173 at gmail.com>
> diff --git a/configs/imx6q_logic_defconfig b/configs/imx6q_logic_defconfig
> index 457366a664..f56f532631 100644
> --- a/configs/imx6q_logic_defconfig
> +++ b/configs/imx6q_logic_defconfig
> @@ -16,6 +16,7 @@ CONFIG_BOOTDELAY=3
>  # CONFIG_USE_BOOTCOMMAND is not set
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> +CONFIG_SPL_RAW_IMAGE_SUPPORT=y
>  CONFIG_SPL_SEPARATE_BSS=y
>  # CONFIG_TPL_BANNER_PRINT is not set
>  # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
> @@ -30,7 +31,8 @@ CONFIG_SPL_USB_SDP_SUPPORT=y
>  CONFIG_SPL_WATCHDOG_SUPPORT=y
>  CONFIG_SYS_PROMPT="i.MX6 Logic # "
>  CONFIG_CMD_SPL=y
> -CONFIG_CMD_SPL_WRITE_SIZE=0x20000
> +CONFIG_CMD_SPL_NAND_OFS=0x1500000
> +CONFIG_CMD_SPL_WRITE_SIZE=0x00100000
>  CONFIG_CMD_MEMTEST=y
>  # CONFIG_CMD_FLASH is not set
>  CONFIG_CMD_GPIO=y
> diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
> index e55941408c..70cc63fc1b 100644
> --- a/include/configs/imx6_logic.h
> +++ b/include/configs/imx6_logic.h
> @@ -144,6 +144,8 @@
>  #define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
>  #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x200000
>  #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00500000
> +#define CONFIG_SYS_NAND_USE_FLASH_BBT
> +
>  /* MTD device */
>  
>  /* DMA stuff, needed for GPMI/MXS NAND support */
> @@ -162,7 +164,7 @@
>  /* Falcon Mode */
>  #define CONFIG_SPL_FS_LOAD_ARGS_NAME	"args"
>  #define CONFIG_SPL_FS_LOAD_KERNEL_NAME	"uImage"
> -#define CONFIG_SYS_SPL_ARGS_ADDR       0x15000000
> +#define CONFIG_SYS_SPL_ARGS_ADDR       0x18000000
>  
>  /* Falcon Mode - MMC support: args at 1MB kernel at 2MB */
>  #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR  0x800   /* 1MB */

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================