diff options
| author | Peng Fan <peng.fan@nxp.com> | 2016-02-24 19:47:05 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2016-03-25 14:26:19 +0800 |
| commit | c71c266af75c2aff169c61a4a8a6c8da825b8d9f (patch) | |
| tree | 455c8edfd86c7218648a2347a95ac4511ae5eaf7 | |
| parent | b06ddb7a09346bf21028a239e77d5bf92469a284 (diff) | |
| download | u-boot-imx-c71c266af75c2aff169c61a4a8a6c8da825b8d9f.zip u-boot-imx-c71c266af75c2aff169c61a4a8a6c8da825b8d9f.tar.gz u-boot-imx-c71c266af75c2aff169c61a4a8a6c8da825b8d9f.tar.bz2 | |
MLK-12436-5: imx: mx6qsabreauto: update ddr script file
Align script file with imx_v2015.04.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
| -rw-r--r-- | board/freescale/mx6qsabreauto/imximage.cfg | 20 | ||||
| -rw-r--r-- | board/freescale/mx6qsabreauto/mx6dl.cfg | 20 |
2 files changed, 36 insertions, 4 deletions
diff --git a/board/freescale/mx6qsabreauto/imximage.cfg b/board/freescale/mx6qsabreauto/imximage.cfg index 8791aa8..020a1d1 100644 --- a/board/freescale/mx6qsabreauto/imximage.cfg +++ b/board/freescale/mx6qsabreauto/imximage.cfg @@ -10,19 +10,35 @@ */ /* image version */ +#define __ASSEMBLY__ +#include <config.h> + IMAGE_VERSION 2 /* - * Boot Device : one of - * spi, sd (the board has no nand neither onenand) + * Boot Device : one of spi, sd, eimnor, nand, sata: + * spinor: flash_offset: 0x0400 + * nand: flash_offset: 0x0400 + * sata: flash_offset: 0x0400 + * sd/mmc: flash_offset: 0x0400 + * eimnor: flash_offset: 0x1000 */ + +#if defined(CONFIG_SYS_BOOT_EIMNOR) +BOOT_FROM nor +#else /* others has the same flash_offset as sd */ BOOT_FROM sd +#endif #ifdef CONFIG_USE_PLUGIN /*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/ PLUGIN board/freescale/mx6qsabreauto/plugin.bin 0x00907000 #else +#ifdef CONFIG_SECURE_BOOT +CSF CONFIG_CSF_SIZE +#endif + /* * Device Configuration Data (DCD) * diff --git a/board/freescale/mx6qsabreauto/mx6dl.cfg b/board/freescale/mx6qsabreauto/mx6dl.cfg index dfb19d5..958dec2 100644 --- a/board/freescale/mx6qsabreauto/mx6dl.cfg +++ b/board/freescale/mx6qsabreauto/mx6dl.cfg @@ -11,19 +11,35 @@ */ /* image version */ +#define __ASSEMBLY__ +#include <config.h> + IMAGE_VERSION 2 /* - * Boot Device : one of - * spi, sd (the board has no nand neither onenand) + * Boot Device : one of spi, sd, eimnor, nand, sata: + * spinor: flash_offset: 0x0400 + * nand: flash_offset: 0x0400 + * sata: flash_offset: 0x0400 + * sd/mmc: flash_offset: 0x0400 + * eimnor: flash_offset: 0x1000 */ + +#if defined(CONFIG_SYS_BOOT_EIMNOR) +BOOT_FROM nor +#else /* others has the same flash_offset as sd */ BOOT_FROM sd +#endif #ifdef CONFIG_USE_PLUGIN /*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/ PLUGIN board/freescale/mx6qsabreauto/plugin.bin 0x00907000 #else +#ifdef CONFIG_SECURE_BOOT +CSF CONFIG_CSF_SIZE +#endif + /* * Device Configuration Data (DCD) * |