diff options
| author | Ye Li <ye.li@nxp.com> | 2016-03-10 17:18:57 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2016-03-25 16:01:45 +0800 |
| commit | f66842f79d4e33ace45762466eed23a86d367642 (patch) | |
| tree | ef2886bedf4e87462e3fa841d4e57912ee5007e2 /include | |
| parent | 43fe988af28c5e51fb23aa846e04bc9698256926 (diff) | |
| download | u-boot-imx-f66842f79d4e33ace45762466eed23a86d367642.zip u-boot-imx-f66842f79d4e33ace45762466eed23a86d367642.tar.gz u-boot-imx-f66842f79d4e33ace45762466eed23a86d367642.tar.bz2 | |
MLK-12531 mx6sxsabresd: Add CM4 fast boot up demo
This is a demo that CM4 will boot up by u-boot without typing any
command. It boots up at u-boot early init, try to minimize the time
from power up to the CM4 running.
Since CM4 runs on QSPI NOR XIP, we have to disable the QSPI driver in
u-boot to avoid conflict.
RDC for shared GPIO1 is added, but not enabled, because the kernel is
not ready for shared GPIO1. Users can uncomment the CONFIG_IMX_RDC to
enable it.
Some legacy codes in mx6sxsabreauto are removed. We only need this work
on mx6sxsabresd as a demo.
Signed-off-by: Ye Li <ye.li@nxp.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mx6sxsabreauto.h | 9 | ||||
| -rw-r--r-- | include/configs/mx6sxsabresd.h | 10 |
2 files changed, 6 insertions, 13 deletions
diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 049b821..d0f1751 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -40,9 +40,7 @@ #endif #define CONFIG_SYS_AUXCORE_BOOTDATA 0x68000000 /* Set to QSPI1 B flash at default */ -#ifndef CONFIG_SYS_AUXCORE_FASTUP -#define CONFIG_IMX_BOOTAUX /* Boot M4 by command, disable this when M4 fast up */ -#endif +#define CONFIG_IMX_BOOTAUX #ifdef CONFIG_IMX_BOOTAUX #define UPDATE_M4_ENV \ @@ -190,10 +188,7 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) -#ifdef CONFIG_SYS_AUXCORE_FASTUP -/*#define CONFIG_IMX_RDC*/ /* Disable the RDC temporarily, will enable it in future */ -#define CONFIG_ENV_IS_IN_MMC /* Must disable QSPI driver, because M4 run on QSPI */ -#elif defined CONFIG_SYS_BOOT_QSPI +#if defined CONFIG_SYS_BOOT_QSPI #define CONFIG_ENV_IS_IN_SPI_FLASH #elif defined CONFIG_SYS_BOOT_NAND #define CONFIG_ENV_IS_IN_NAND diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 862c553..21d74d7 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -41,13 +41,11 @@ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE -#define CONFIG_SYS_AUXCORE_BOOTDATA 0x78000000 -#ifndef CONFIG_SYS_AUXCORE_FASTUP +#define CONFIG_SYS_AUXCORE_BOOTDATA 0x78000000 /* Set to QSPI2 B flash at default */ #define CONFIG_IMX_BOOTAUX -/* Set to QSPI2 B flash at default */ -#endif -#ifdef CONFIG_IMX_BOOTAUX +/* When using M4 fastup demo, no need these M4 env, since QSPI is used by M4 */ +#ifndef CONFIG_SYS_AUXCORE_FASTUP #define UPDATE_M4_ENV \ "m4image=m4_qspi.bin\0" \ "loadm4image=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${m4image}\0" \ @@ -177,7 +175,7 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) #ifdef CONFIG_SYS_AUXCORE_FASTUP -/*#define CONFIG_IMX_RDC*/ /* Disable the RDC temporarily, will enable it in future */ +/* #define CONFIG_IMX_RDC */ /* Disable the RDC temporarily, will enable it in future */ #define CONFIG_ENV_IS_IN_MMC /* Must disable QSPI driver, because M4 run on QSPI */ #elif defined CONFIG_SYS_BOOT_QSPI #define CONFIG_FSL_QSPI |