From 65806cc76e64b26349defafe0fd1825e37bcb2c3 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Tue, 5 Jan 2016 14:03:36 +0800 Subject: imx: mx6ulevk: change mtest memory size to 128M To i.MX6UL 14x14 EVK, system memory is 512M; to i.MX6UL 9x9 EVK, system memory is 256M. If setting mtest size to 256M, mtest will crash uboot for i.MX6UL 9x9 evk. So change mtest size to 128M. Signed-off-by: Peng Fan Cc: Stefano Babic --- include/configs/mx6ul_14x14_evk.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index c946176..1a537f1 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -156,7 +156,7 @@ /* Miscellaneous configurable options */ #define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x80000000 -#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x10000000) +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x8000000) #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 -- cgit v1.1 From 1ecd2eaa88b9e7ec976559606ec32c92358b2528 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Mon, 4 Jan 2016 15:27:22 +0800 Subject: imx: mx6/7 enlarge CONFIG_SYS_BOOTM_LEN to 16M Support uncompressing zImage which is larger than 8M. Signed-off-by: Peng Fan Cc: Peter Robinson Cc: Volodymyr Riazantsev Cc: Fabio Estevam Cc: Adrian Alonso Cc: Stefano Babic --- include/configs/mx6_common.h | 2 ++ include/configs/mx7_common.h | 2 ++ 2 files changed, 4 insertions(+) (limited to 'include') diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 174ea08..179b4f9 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -25,6 +25,8 @@ #define CONFIG_SYS_NO_FLASH +#define CONFIG_SYS_BOOTM_LEN 0x1000000 + #include #include #include diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index d507fb4..fac7c3f 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -23,6 +23,8 @@ #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */ #define CONFIG_SYS_FSL_CLK +#define CONFIG_SYS_BOOTM_LEN 0x1000000 + /* Enable iomux-lpsr support */ #define CONFIG_IOMUX_LPSR #define CONFIG_IMX_FIXED_IVT_OFFSET -- cgit v1.1 From c6d3d812fefabd0807fca485fef89e0c32ed4190 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Tue, 19 Jan 2016 15:13:52 +0800 Subject: imx: mx6ulevk: add CONFIG_SPI_FLASH_STMICRO Add CONFIG_SPI_FLASH_STMICRO to let qspi driver can detect the qspi chips. " => sf probe SF: Detected N25Q256 with page size 256 Bytes, erase size 64 KiB, total 32 MiB " Signed-off-by: Peng Fan Cc: Jagan Teki Cc: Stefano Babic Reviewed-by: Stefano Babic --- include/configs/mx6ul_14x14_evk.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 1a537f1..4374c3a 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -203,6 +203,7 @@ #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 40000000 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 +#define CONFIG_SPI_FLASH_STMICRO #define FSL_QSPI_FLASH_NUM 1 #define FSL_QSPI_FLASH_SIZE SZ_32M #endif -- cgit v1.1 From 6e1a41cd6a08e3ac0dafb79479d7513144d3cefa Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Tue, 22 Dec 2015 17:04:24 +0800 Subject: imx: mx7dsabresd: support nand Add pinmux settings. Add related macro definitions. Nand pin conflicts with emmc, so if want to enable nand, need to do hardware rework. After hardware rework, define CONFIG_NAND_MXS in board header file. Signed-off-by: Peng Fan Cc: Stefano Babic --- include/configs/mx7dsabresd.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'include') diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 22e515c..d23e4f3 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -179,8 +179,33 @@ #define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_SIZE SZ_8K #define CONFIG_ENV_IS_IN_MMC + +/* + * If want to use nand, define CONFIG_NAND_MXS and rework board + * to support nand, since emmc has pin conflicts with nand + */ +#ifdef CONFIG_NAND_MXS +#define CONFIG_CMD_NAND +#define CONFIG_CMD_NAND_TRIMFFS + +/* NAND stuff */ +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define CONFIG_SYS_NAND_BASE 0x40000000 +#define CONFIG_SYS_NAND_5_ADDR_CYCLE +#define CONFIG_SYS_NAND_ONFI_DETECTION + +/* DMA stuff, needed for GPMI/MXS NAND support */ +#define CONFIG_APBH_DMA +#define CONFIG_APBH_DMA_BURST +#define CONFIG_APBH_DMA_BURST8 +#endif + #define CONFIG_ENV_OFFSET (8 * SZ_64K) +#ifdef CONFIG_NAND_MXS +#define CONFIG_SYS_FSL_USDHC_NUM 1 +#else #define CONFIG_SYS_FSL_USDHC_NUM 2 +#endif #define CONFIG_SYS_MMC_ENV_DEV 0 /* USDHC1 */ #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ -- cgit v1.1 From ed3fb1fb22fb9e0e786c58c2d80cd030b89b9b7d Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Mon, 4 Jan 2016 20:27:27 +0800 Subject: imx: spl: enable CONFIG_SPL_WATCHDOG_SUPPORT This commit 4bdcbe60a142b08eefccb0e326a37ba81d3389e8 removes reset_cpu which breaks SPL build when DEBUG macro defined. " arch/arm/lib/built-in.o: In function `do_reset': ~/uboot/arch/arm/lib/reset.c:45: undefined reference to `reset_cpu' scripts/Makefile.spl:244: recipe for target 'spl/u-boot-spl' failed " Enable CONFIG_SPL_WATCHDOG_SUPPORT to fix this issue. Signed-off-by: Peng Fan Cc: Stefano Babic Cc: Fabio Estevam Cc: Marek Vasut Cc: Tim Harvey Acked-by: Eric Nelson --- include/configs/imx6_spl.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h index 43ce7fe..68d3fd7 100644 --- a/include/configs/imx6_spl.h +++ b/include/configs/imx6_spl.h @@ -34,6 +34,7 @@ #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT +#define CONFIG_SPL_WATCHDOG_SUPPORT /* NAND support */ #if defined(CONFIG_SPL_NAND_SUPPORT) -- cgit v1.1