From 2091a5fee3fb93989631fa59e30cf8298c399acf Mon Sep 17 00:00:00 2001 From: Anson Huang Date: Tue, 26 Apr 2016 17:46:33 +0800 Subject: MLK-12705-1 ARM: imx: add support for i.MX7D TO1.2 i.MX7D TO1.2 uses same DDR script as TO1.0, TO1.1 uses dedicated DDR script. Signed-off-by: Anson Huang (cherry picked from commit 527d57e02b05eb0166dcaa1929e46dd2357a8720) --- board/freescale/mx7d_12x12_ddr3_arm2/imximage.cfg | 13 +-- .../mx7d_12x12_ddr3_arm2/imximage_TO_1_0.cfg | 107 ----------------- .../mx7d_12x12_ddr3_arm2/imximage_TO_1_1.cfg | 118 +++++++++++++++++++ .../freescale/mx7d_12x12_lpddr3_arm2/imximage.cfg | 5 - .../mx7d_12x12_lpddr3_arm2/imximage_TO_1_0.cfg | 121 -------------------- .../mx7d_12x12_lpddr3_arm2/imximage_TO_1_1.cfg | 126 ++++++++++++++++++++ board/freescale/mx7d_12x12_lpddr3_arm2/plugin.S | 6 +- board/freescale/mx7d_19x19_ddr3_arm2/imximage.cfg | 13 +-- .../mx7d_19x19_ddr3_arm2/imximage_TO_1_0.cfg | 110 ------------------ .../mx7d_19x19_ddr3_arm2/imximage_TO_1_1.cfg | 121 ++++++++++++++++++++ .../freescale/mx7d_19x19_lpddr3_arm2/imximage.cfg | 5 - .../mx7d_19x19_lpddr3_arm2/imximage_TO_1_0.cfg | 118 ------------------- .../mx7d_19x19_lpddr3_arm2/imximage_TO_1_1.cfg | 123 ++++++++++++++++++++ .../mx7d_19x19_lpddr3_arm2/imximage_lpddr2.cfg | 7 +- .../imximage_lpddr2_TO_1_0.cfg | 119 ------------------- .../imximage_lpddr2_TO_1_1.cfg | 124 ++++++++++++++++++++ board/freescale/mx7dsabresd/imximage.cfg | 13 +-- board/freescale/mx7dsabresd/imximage_TO_1_0.cfg | 116 ------------------- board/freescale/mx7dsabresd/imximage_TO_1_1.cfg | 127 +++++++++++++++++++++ 19 files changed, 746 insertions(+), 746 deletions(-) delete mode 100644 board/freescale/mx7d_12x12_ddr3_arm2/imximage_TO_1_0.cfg create mode 100644 board/freescale/mx7d_12x12_ddr3_arm2/imximage_TO_1_1.cfg delete mode 100644 board/freescale/mx7d_12x12_lpddr3_arm2/imximage_TO_1_0.cfg create mode 100644 board/freescale/mx7d_12x12_lpddr3_arm2/imximage_TO_1_1.cfg delete mode 100644 board/freescale/mx7d_19x19_ddr3_arm2/imximage_TO_1_0.cfg create mode 100644 board/freescale/mx7d_19x19_ddr3_arm2/imximage_TO_1_1.cfg delete mode 100644 board/freescale/mx7d_19x19_lpddr3_arm2/imximage_TO_1_0.cfg create mode 100644 board/freescale/mx7d_19x19_lpddr3_arm2/imximage_TO_1_1.cfg delete mode 100644 board/freescale/mx7d_19x19_lpddr3_arm2/imximage_lpddr2_TO_1_0.cfg create mode 100644 board/freescale/mx7d_19x19_lpddr3_arm2/imximage_lpddr2_TO_1_1.cfg delete mode 100644 board/freescale/mx7dsabresd/imximage_TO_1_0.cfg create mode 100644 board/freescale/mx7dsabresd/imximage_TO_1_1.cfg (limited to 'board') diff --git a/board/freescale/mx7d_12x12_ddr3_arm2/imximage.cfg b/board/freescale/mx7d_12x12_ddr3_arm2/imximage.cfg index c6ec80c..cbb8ce2 100644 --- a/board/freescale/mx7d_12x12_ddr3_arm2/imximage.cfg +++ b/board/freescale/mx7d_12x12_ddr3_arm2/imximage.cfg @@ -48,12 +48,6 @@ CSF CONFIG_CSF_SIZE * value value to be stored in the register */ -DATA 4 0x30360070 0x00703021 -DATA 4 0x30360090 0x0 -DATA 4 0x30360070 0x00603021 -CHECK_BITS_SET 4 0x30360070 0x80000000 -DATA 4 0x30389880 0x1 - DATA 4 0x30340004 0x4F400005 DATA 4 0x30391000 0x00000002 @@ -89,12 +83,7 @@ DATA 4 0x30391000 0x00000000 DATA 4 0x30790000 0x17420f40 DATA 4 0x30790004 0x10210100 DATA 4 0x30790010 0x00060807 -DATA 4 0x3079009c 0x00000dee -DATA 4 0x3079007c 0x18181818 -DATA 4 0x30790080 0x18181818 -DATA 4 0x30790084 0x40401818 -DATA 4 0x30790088 0x00000040 -DATA 4 0x3079006c 0x40404040 +DATA 4 0x3079009c 0x00000d6e DATA 4 0x30790020 0x08080808 DATA 4 0x30790030 0x08080808 DATA 4 0x30790050 0x01000010 diff --git a/board/freescale/mx7d_12x12_ddr3_arm2/imximage_TO_1_0.cfg b/board/freescale/mx7d_12x12_ddr3_arm2/imximage_TO_1_0.cfg deleted file mode 100644 index cbb8ce2..0000000 --- a/board/freescale/mx7d_12x12_ddr3_arm2/imximage_TO_1_0.cfg +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright (C) 2015-2016 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ - * - * Refer docs/README.imxmage for more details about how-to configure - * and create imximage boot image - * - * The syntax is taken as close as possible with the kwbimage - */ - -#define __ASSEMBLY__ -#include - -/* image version */ - -IMAGE_VERSION 2 - -/* - * Boot Device : one of - * sd/onenand, nor - */ - -#ifdef CONFIG_SYS_BOOT_EIMNOR -BOOT_FROM nor -#else -BOOT_FROM sd -#endif - -#ifdef CONFIG_USE_PLUGIN -/*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/ -PLUGIN board/freescale/mx7d_12x12_ddr3_arm2/plugin.bin 0x00910000 -#else - -#ifdef CONFIG_SECURE_BOOT -CSF CONFIG_CSF_SIZE -#endif - -/* - * Device Configuration Data (DCD) - * - * Each entry must have the format: - * Addr-type Address Value - * - * where: - * Addr-type register length (1,2 or 4 bytes) - * Address absolute address of the register - * value value to be stored in the register - */ - -DATA 4 0x30340004 0x4F400005 - -DATA 4 0x30391000 0x00000002 -DATA 4 0x307a0000 0x03040001 -DATA 4 0x307a01a0 0x80400003 -DATA 4 0x307a01a4 0x00100020 -DATA 4 0x307a01a8 0x80100004 -DATA 4 0x307a0064 0x0040005e -DATA 4 0x307a0490 0x00000001 -DATA 4 0x307a00d0 0x00020001 -DATA 4 0x307a00d4 0x00010000 -DATA 4 0x307a00dc 0x09300004 -DATA 4 0x307a00e0 0x04080000 -DATA 4 0x307a00e4 0x00090004 -DATA 4 0x307a00f4 0x0000033f -DATA 4 0x307a0100 0x0908120a -DATA 4 0x307a0104 0x0002020e -DATA 4 0x307a0108 0x03040407 -DATA 4 0x307a010c 0x00002006 -DATA 4 0x307a0110 0x04020204 -DATA 4 0x307a0114 0x03030202 -DATA 4 0x307a0120 0x03030803 -DATA 4 0x307a0180 0x00800020 -DATA 4 0x307a0190 0x02098204 -DATA 4 0x307a0194 0x00030303 -DATA 4 0x307a0200 0x00000016 -DATA 4 0x307a0204 0x00171717 -DATA 4 0x307a0214 0x04040404 -DATA 4 0x307a0218 0x00040404 -DATA 4 0x307a0240 0x06000601 -DATA 4 0x307a0244 0x00001323 -DATA 4 0x30391000 0x00000000 -DATA 4 0x30790000 0x17420f40 -DATA 4 0x30790004 0x10210100 -DATA 4 0x30790010 0x00060807 -DATA 4 0x3079009c 0x00000d6e -DATA 4 0x30790020 0x08080808 -DATA 4 0x30790030 0x08080808 -DATA 4 0x30790050 0x01000010 -DATA 4 0x30790050 0x00000010 - -DATA 4 0x307900c0 0x0e407304 -DATA 4 0x307900c0 0x0e447304 -DATA 4 0x307900c0 0x0e447306 - -CHECK_BITS_SET 4 0x307900c4 0x1 - -DATA 4 0x307900c0 0x0e447304 -DATA 4 0x307900c0 0x0e407304 - -DATA 4 0x30384130 0x00000000 -DATA 4 0x30340020 0x00000178 -DATA 4 0x30384130 0x00000002 -DATA 4 0x30790018 0x0000000f - -CHECK_BITS_SET 4 0x307a0004 0x1 -#endif diff --git a/board/freescale/mx7d_12x12_ddr3_arm2/imximage_TO_1_1.cfg b/board/freescale/mx7d_12x12_ddr3_arm2/imximage_TO_1_1.cfg new file mode 100644 index 0000000..c6ec80c --- /dev/null +++ b/board/freescale/mx7d_12x12_ddr3_arm2/imximage_TO_1_1.cfg @@ -0,0 +1,118 @@ +/* + * Copyright (C) 2015-2016 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + * + * Refer docs/README.imxmage for more details about how-to configure + * and create imximage boot image + * + * The syntax is taken as close as possible with the kwbimage + */ + +#define __ASSEMBLY__ +#include + +/* image version */ + +IMAGE_VERSION 2 + +/* + * Boot Device : one of + * sd/onenand, nor + */ + +#ifdef CONFIG_SYS_BOOT_EIMNOR +BOOT_FROM nor +#else +BOOT_FROM sd +#endif + +#ifdef CONFIG_USE_PLUGIN +/*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/ +PLUGIN board/freescale/mx7d_12x12_ddr3_arm2/plugin.bin 0x00910000 +#else + +#ifdef CONFIG_SECURE_BOOT +CSF CONFIG_CSF_SIZE +#endif + +/* + * Device Configuration Data (DCD) + * + * Each entry must have the format: + * Addr-type Address Value + * + * where: + * Addr-type register length (1,2 or 4 bytes) + * Address absolute address of the register + * value value to be stored in the register + */ + +DATA 4 0x30360070 0x00703021 +DATA 4 0x30360090 0x0 +DATA 4 0x30360070 0x00603021 +CHECK_BITS_SET 4 0x30360070 0x80000000 +DATA 4 0x30389880 0x1 + +DATA 4 0x30340004 0x4F400005 + +DATA 4 0x30391000 0x00000002 +DATA 4 0x307a0000 0x03040001 +DATA 4 0x307a01a0 0x80400003 +DATA 4 0x307a01a4 0x00100020 +DATA 4 0x307a01a8 0x80100004 +DATA 4 0x307a0064 0x0040005e +DATA 4 0x307a0490 0x00000001 +DATA 4 0x307a00d0 0x00020001 +DATA 4 0x307a00d4 0x00010000 +DATA 4 0x307a00dc 0x09300004 +DATA 4 0x307a00e0 0x04080000 +DATA 4 0x307a00e4 0x00090004 +DATA 4 0x307a00f4 0x0000033f +DATA 4 0x307a0100 0x0908120a +DATA 4 0x307a0104 0x0002020e +DATA 4 0x307a0108 0x03040407 +DATA 4 0x307a010c 0x00002006 +DATA 4 0x307a0110 0x04020204 +DATA 4 0x307a0114 0x03030202 +DATA 4 0x307a0120 0x03030803 +DATA 4 0x307a0180 0x00800020 +DATA 4 0x307a0190 0x02098204 +DATA 4 0x307a0194 0x00030303 +DATA 4 0x307a0200 0x00000016 +DATA 4 0x307a0204 0x00171717 +DATA 4 0x307a0214 0x04040404 +DATA 4 0x307a0218 0x00040404 +DATA 4 0x307a0240 0x06000601 +DATA 4 0x307a0244 0x00001323 +DATA 4 0x30391000 0x00000000 +DATA 4 0x30790000 0x17420f40 +DATA 4 0x30790004 0x10210100 +DATA 4 0x30790010 0x00060807 +DATA 4 0x3079009c 0x00000dee +DATA 4 0x3079007c 0x18181818 +DATA 4 0x30790080 0x18181818 +DATA 4 0x30790084 0x40401818 +DATA 4 0x30790088 0x00000040 +DATA 4 0x3079006c 0x40404040 +DATA 4 0x30790020 0x08080808 +DATA 4 0x30790030 0x08080808 +DATA 4 0x30790050 0x01000010 +DATA 4 0x30790050 0x00000010 + +DATA 4 0x307900c0 0x0e407304 +DATA 4 0x307900c0 0x0e447304 +DATA 4 0x307900c0 0x0e447306 + +CHECK_BITS_SET 4 0x307900c4 0x1 + +DATA 4 0x307900c0 0x0e447304 +DATA 4 0x307900c0 0x0e407304 + +DATA 4 0x30384130 0x00000000 +DATA 4 0x30340020 0x00000178 +DATA 4 0x30384130 0x00000002 +DATA 4 0x30790018 0x0000000f + +CHECK_BITS_SET 4 0x307a0004 0x1 +#endif diff --git a/board/freescale/mx7d_12x12_lpddr3_arm2/imximage.cfg b/board/freescale/mx7d_12x12_lpddr3_arm2/imximage.cfg index e38c44c..c0da271 100644 --- a/board/freescale/mx7d_12x12_lpddr3_arm2/imximage.cfg +++ b/board/freescale/mx7d_12x12_lpddr3_arm2/imximage.cfg @@ -95,11 +95,6 @@ DATA 4 0x30790000 0x17421e40 DATA 4 0x30790004 0x10210100 DATA 4 0x30790008 0x00010000 DATA 4 0x30790010 0x0007080c -DATA 4 0x3079007c 0x1c1c1c1c -DATA 4 0x30790080 0x1c1c1c1c -DATA 4 0x30790084 0x30301c1c -DATA 4 0x30790088 0x00000030 -DATA 4 0x3079006c 0x30303030 DATA 4 0x307900b0 0x1010007e DATA 4 0x3079001C 0x01010000 diff --git a/board/freescale/mx7d_12x12_lpddr3_arm2/imximage_TO_1_0.cfg b/board/freescale/mx7d_12x12_lpddr3_arm2/imximage_TO_1_0.cfg deleted file mode 100644 index c0da271..0000000 --- a/board/freescale/mx7d_12x12_lpddr3_arm2/imximage_TO_1_0.cfg +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Copyright (C) 2014-2016 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ - * - * Refer docs/README.imxmage for more details about how-to configure - * and create imximage boot image - * - * The syntax is taken as close as possible with the kwbimage - */ - -#define __ASSEMBLY__ -#include - -/* image version */ - -IMAGE_VERSION 2 - -/* - * Boot Device : one of - * spi/sd/nand/onenand, qspi/nor - */ - -#ifdef CONFIG_SYS_BOOT_QSPI -BOOT_FROM qspi -#elif defined(CONFIG_SYS_BOOT_EIMNOR) -BOOT_FROM nor -#else -BOOT_FROM sd -#endif - -#ifdef CONFIG_USE_PLUGIN -/*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/ -PLUGIN board/freescale/mx7d_12x12_lpddr3_arm2/plugin.bin 0x00910000 -#else - -#ifdef CONFIG_SECURE_BOOT -CSF CONFIG_CSF_SIZE -#endif - -/* - * Device Configuration Data (DCD) - * - * Each entry must have the format: - * Addr-type Address Value - * - * where: - * Addr-type register length (1,2 or 4 bytes) - * Address absolute address of the register - * value value to be stored in the register - */ - -DATA 4 0x30340004 0x4F400005 -/* Clear then set bit30 to ensure exit from DDR retention */ -DATA 4 0x30360388 0x40000000 -DATA 4 0x30360384 0x40000000 - -DATA 4 0x30391000 0x00000002 -DATA 4 0x307a0000 0x03040008 -DATA 4 0x307a0064 0x00200038 -DATA 4 0x307a0490 0x00000001 -DATA 4 0x307a00d0 0x00350001 -DATA 4 0x307a00dc 0x00c3000a -DATA 4 0x307a00e0 0x00010000 -DATA 4 0x307a00e4 0x00110006 -DATA 4 0x307a00f4 0x0000033f -DATA 4 0x307a0100 0x0a0e110b -DATA 4 0x307a0104 0x00020211 -DATA 4 0x307a0108 0x03060708 -DATA 4 0x307a010c 0x00a0500c -DATA 4 0x307a0110 0x05020307 -DATA 4 0x307a0114 0x02020404 -DATA 4 0x307a0118 0x02020003 -DATA 4 0x307a011c 0x00000202 -DATA 4 0x307a0120 0x00000202 - -DATA 4 0x307a0180 0x00600018 -DATA 4 0x307a0184 0x00e00100 -DATA 4 0x307a0190 0x02098205 -DATA 4 0x307a0194 0x00060303 -DATA 4 0x307a01a0 0x80400003 -DATA 4 0x307a01a4 0x00100020 -DATA 4 0x307a01a8 0x80100004 - -DATA 4 0x307a0200 0x00000016 -DATA 4 0x307a0204 0x00171717 -DATA 4 0x307a0210 0x00000f00 -DATA 4 0x307a0214 0x05050505 -DATA 4 0x307a0218 0x0f0f0505 - -DATA 4 0x307a0240 0x06000601 -DATA 4 0x307a0244 0x00000000 -DATA 4 0x30391000 0x00000000 -DATA 4 0x30790000 0x17421e40 -DATA 4 0x30790004 0x10210100 -DATA 4 0x30790008 0x00010000 -DATA 4 0x30790010 0x0007080c -DATA 4 0x307900b0 0x1010007e - -DATA 4 0x3079001C 0x01010000 -DATA 4 0x3079009c 0x0db60d6e - -DATA 4 0x30790030 0x06060606 -DATA 4 0x30790020 0x0a0a0a0a -DATA 4 0x30790050 0x01000008 -DATA 4 0x30790050 0x00000008 -DATA 4 0x30790018 0x0000000f -DATA 4 0x307900c0 0x1e487304 -DATA 4 0x307900c0 0x1e487304 -DATA 4 0x307900c0 0x1e487306 -DATA 4 0x307900c0 0x1e4c7304 -CHECK_BITS_SET 4 0x307900c4 0x1 - -DATA 4 0x307900c0 0x1e487304 - -DATA 4 0x30384130 0x00000000 -DATA 4 0x30340020 0x00000178 -DATA 4 0x30384130 0x00000002 - -CHECK_BITS_SET 4 0x307a0004 0x1 -#endif diff --git a/board/freescale/mx7d_12x12_lpddr3_arm2/imximage_TO_1_1.cfg b/board/freescale/mx7d_12x12_lpddr3_arm2/imximage_TO_1_1.cfg new file mode 100644 index 0000000..e38c44c --- /dev/null +++ b/board/freescale/mx7d_12x12_lpddr3_arm2/imximage_TO_1_1.cfg @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2014-2016 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + * + * Refer docs/README.imxmage for more details about how-to configure + * and create imximage boot image + * + * The syntax is taken as close as possible with the kwbimage + */ + +#define __ASSEMBLY__ +#include + +/* image version */ + +IMAGE_VERSION 2 + +/* + * Boot Device : one of + * spi/sd/nand/onenand, qspi/nor + */ + +#ifdef CONFIG_SYS_BOOT_QSPI +BOOT_FROM qspi +#elif defined(CONFIG_SYS_BOOT_EIMNOR) +BOOT_FROM nor +#else +BOOT_FROM sd +#endif + +#ifdef CONFIG_USE_PLUGIN +/*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/ +PLUGIN board/freescale/mx7d_12x12_lpddr3_arm2/plugin.bin 0x00910000 +#else + +#ifdef CONFIG_SECURE_BOOT +CSF CONFIG_CSF_SIZE +#endif + +/* + * Device Configuration Data (DCD) + * + * Each entry must have the format: + * Addr-type Address Value + * + * where: + * Addr-type register length (1,2 or 4 bytes) + * Address absolute address of the register + * value value to be stored in the register + */ + +DATA 4 0x30340004 0x4F400005 +/* Clear then set bit30 to ensure exit from DDR retention */ +DATA 4 0x30360388 0x40000000 +DATA 4 0x30360384 0x40000000 + +DATA 4 0x30391000 0x00000002 +DATA 4 0x307a0000 0x03040008 +DATA 4 0x307a0064 0x00200038 +DATA 4 0x307a0490 0x00000001 +DATA 4 0x307a00d0 0x00350001 +DATA 4 0x307a00dc 0x00c3000a +DATA 4 0x307a00e0 0x00010000 +DATA 4 0x307a00e4 0x00110006 +DATA 4 0x307a00f4 0x0000033f +DATA 4 0x307a0100 0x0a0e110b +DATA 4 0x307a0104 0x00020211 +DATA 4 0x307a0108 0x03060708 +DATA 4 0x307a010c 0x00a0500c +DATA 4 0x307a0110 0x05020307 +DATA 4 0x307a0114 0x02020404 +DATA 4 0x307a0118 0x02020003 +DATA 4 0x307a011c 0x00000202 +DATA 4 0x307a0120 0x00000202 + +DATA 4 0x307a0180 0x00600018 +DATA 4 0x307a0184 0x00e00100 +DATA 4 0x307a0190 0x02098205 +DATA 4 0x307a0194 0x00060303 +DATA 4 0x307a01a0 0x80400003 +DATA 4 0x307a01a4 0x00100020 +DATA 4 0x307a01a8 0x80100004 + +DATA 4 0x307a0200 0x00000016 +DATA 4 0x307a0204 0x00171717 +DATA 4 0x307a0210 0x00000f00 +DATA 4 0x307a0214 0x05050505 +DATA 4 0x307a0218 0x0f0f0505 + +DATA 4 0x307a0240 0x06000601 +DATA 4 0x307a0244 0x00000000 +DATA 4 0x30391000 0x00000000 +DATA 4 0x30790000 0x17421e40 +DATA 4 0x30790004 0x10210100 +DATA 4 0x30790008 0x00010000 +DATA 4 0x30790010 0x0007080c +DATA 4 0x3079007c 0x1c1c1c1c +DATA 4 0x30790080 0x1c1c1c1c +DATA 4 0x30790084 0x30301c1c +DATA 4 0x30790088 0x00000030 +DATA 4 0x3079006c 0x30303030 +DATA 4 0x307900b0 0x1010007e + +DATA 4 0x3079001C 0x01010000 +DATA 4 0x3079009c 0x0db60d6e + +DATA 4 0x30790030 0x06060606 +DATA 4 0x30790020 0x0a0a0a0a +DATA 4 0x30790050 0x01000008 +DATA 4 0x30790050 0x00000008 +DATA 4 0x30790018 0x0000000f +DATA 4 0x307900c0 0x1e487304 +DATA 4 0x307900c0 0x1e487304 +DATA 4 0x307900c0 0x1e487306 +DATA 4 0x307900c0 0x1e4c7304 +CHECK_BITS_SET 4 0x307900c4 0x1 + +DATA 4 0x307900c0 0x1e487304 + +DATA 4 0x30384130 0x00000000 +DATA 4 0x30340020 0x00000178 +DATA 4 0x30384130 0x00000002 + +CHECK_BITS_SET 4 0x307a0004 0x1 +#endif diff --git a/board/freescale/mx7d_12x12_lpddr3_arm2/plugin.S b/board/freescale/mx7d_12x12_lpddr3_arm2/plugin.S index d5d116e..41ceb69 100644 --- a/board/freescale/mx7d_12x12_lpddr3_arm2/plugin.S +++ b/board/freescale/mx7d_12x12_lpddr3_arm2/plugin.S @@ -230,7 +230,7 @@ TUNE_END: cmp r7, #0x10 beq 2f - /* TO1.1 */ + /* from TO1.1 */ ldr r7, [r11] bic r7, r7, #(1 << 27) str r7, [r11] @@ -269,8 +269,8 @@ TUNE_END: ldr r7, [r1, #0x800] and r7, r7, #0xFF - cmp r7, #0x10 - beq 4f + cmp r7, #0x11 + bne 4f ldr r6, =0x7c ldr r7, =0x1c1c1c1c diff --git a/board/freescale/mx7d_19x19_ddr3_arm2/imximage.cfg b/board/freescale/mx7d_19x19_ddr3_arm2/imximage.cfg index 29007f5..2d6c025 100644 --- a/board/freescale/mx7d_19x19_ddr3_arm2/imximage.cfg +++ b/board/freescale/mx7d_19x19_ddr3_arm2/imximage.cfg @@ -50,12 +50,6 @@ CSF CONFIG_CSF_SIZE * value value to be stored in the register */ -DATA 4 0x30360070 0x00703021 -DATA 4 0x30360090 0x0 -DATA 4 0x30360070 0x00603021 -CHECK_BITS_SET 4 0x30360070 0x80000000 -DATA 4 0x30389880 0x1 - DATA 4 0x30340004 0x4F400005 DATA 4 0x30391000 0x00000002 @@ -91,12 +85,7 @@ DATA 4 0x30391000 0x00000000 DATA 4 0x30790000 0x17420f40 DATA 4 0x30790004 0x10210100 DATA 4 0x30790010 0x00060807 -DATA 4 0x3079009c 0x00000dee -DATA 4 0x3079007c 0x18181818 -DATA 4 0x30790080 0x18181818 -DATA 4 0x30790084 0x40401818 -DATA 4 0x30790088 0x00000040 -DATA 4 0x3079006c 0x40404040 +DATA 4 0x3079009c 0x00000d6e DATA 4 0x30790020 0x08080808 DATA 4 0x30790030 0x08080808 DATA 4 0x30790050 0x01000010 diff --git a/board/freescale/mx7d_19x19_ddr3_arm2/imximage_TO_1_0.cfg b/board/freescale/mx7d_19x19_ddr3_arm2/imximage_TO_1_0.cfg deleted file mode 100644 index 2d6c025..0000000 --- a/board/freescale/mx7d_19x19_ddr3_arm2/imximage_TO_1_0.cfg +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright (C) 2014-2016 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ - * - * Refer docs/README.imxmage for more details about how-to configure - * and create imximage boot image - * - * The syntax is taken as close as possible with the kwbimage - */ - -#define __ASSEMBLY__ -#include - -/* image version */ - -IMAGE_VERSION 2 - -/* - * Boot Device : one of - * spi/sd/nand/onenand, qspi/nor - */ - -#ifdef CONFIG_SYS_BOOT_QSPI -BOOT_FROM qspi -#elif defined(CONFIG_SYS_BOOT_EIMNOR) -BOOT_FROM nor -#else -BOOT_FROM sd -#endif - -#ifdef CONFIG_USE_PLUGIN -/*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/ -PLUGIN board/freescale/mx7d_19x19_ddr3_arm2/plugin.bin 0x00910000 -#else - -#ifdef CONFIG_SECURE_BOOT -CSF CONFIG_CSF_SIZE -#endif - -/* - * Device Configuration Data (DCD) - * - * Each entry must have the format: - * Addr-type Address Value - * - * where: - * Addr-type register length (1,2 or 4 bytes) - * Address absolute address of the register - * value value to be stored in the register - */ - -DATA 4 0x30340004 0x4F400005 - -DATA 4 0x30391000 0x00000002 -DATA 4 0x307a0000 0x03040001 -DATA 4 0x307a01a0 0x80400003 -DATA 4 0x307a01a4 0x00100020 -DATA 4 0x307a01a8 0x80100004 -DATA 4 0x307a0064 0x0040005e -DATA 4 0x307a0490 0x00000001 -DATA 4 0x307a00d0 0x00020001 -DATA 4 0x307a00d4 0x00010000 -DATA 4 0x307a00dc 0x09300004 -DATA 4 0x307a00e0 0x04080000 -DATA 4 0x307a00e4 0x00090004 -DATA 4 0x307a00f4 0x0000033f -DATA 4 0x307a0100 0x0908120a -DATA 4 0x307a0104 0x0002020e -DATA 4 0x307a0108 0x03040407 -DATA 4 0x307a010c 0x00002006 -DATA 4 0x307a0110 0x04020204 -DATA 4 0x307a0114 0x03030202 -DATA 4 0x307a0120 0x03030803 -DATA 4 0x307a0180 0x00800020 -DATA 4 0x307a0190 0x02098204 -DATA 4 0x307a0194 0x00030303 -DATA 4 0x307a0200 0x00000016 -DATA 4 0x307a0204 0x00171717 -DATA 4 0x307a0214 0x04040404 -DATA 4 0x307a0218 0x00040404 -DATA 4 0x307a0240 0x06000601 -DATA 4 0x307a0244 0x00001323 -DATA 4 0x30391000 0x00000000 -DATA 4 0x30790000 0x17420f40 -DATA 4 0x30790004 0x10210100 -DATA 4 0x30790010 0x00060807 -DATA 4 0x3079009c 0x00000d6e -DATA 4 0x30790020 0x08080808 -DATA 4 0x30790030 0x08080808 -DATA 4 0x30790050 0x01000010 -DATA 4 0x30790050 0x00000010 - -DATA 4 0x307900c0 0x0e407304 -DATA 4 0x307900c0 0x0e447304 -DATA 4 0x307900c0 0x0e447306 - -CHECK_BITS_SET 4 0x307900c4 0x1 - -DATA 4 0x307900c0 0x0e447304 -DATA 4 0x307900c0 0x0e407304 - - -DATA 4 0x30384130 0x00000000 -DATA 4 0x30340020 0x00000178 -DATA 4 0x30384130 0x00000002 -DATA 4 0x30790018 0x0000000f - -CHECK_BITS_SET 4 0x307a0004 0x1 -#endif diff --git a/board/freescale/mx7d_19x19_ddr3_arm2/imximage_TO_1_1.cfg b/board/freescale/mx7d_19x19_ddr3_arm2/imximage_TO_1_1.cfg new file mode 100644 index 0000000..29007f5 --- /dev/null +++ b/board/freescale/mx7d_19x19_ddr3_arm2/imximage_TO_1_1.cfg @@ -0,0 +1,121 @@ +/* + * Copyright (C) 2014-2016 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + * + * Refer docs/README.imxmage for more details about how-to configure + * and create imximage boot image + * + * The syntax is taken as close as possible with the kwbimage + */ + +#define __ASSEMBLY__ +#include + +/* image version */ + +IMAGE_VERSION 2 + +/* + * Boot Device : one of + * spi/sd/nand/onenand, qspi/nor + */ + +#ifdef CONFIG_SYS_BOOT_QSPI +BOOT_FROM qspi +#elif defined(CONFIG_SYS_BOOT_EIMNOR) +BOOT_FROM nor +#else +BOOT_FROM sd +#endif + +#ifdef CONFIG_USE_PLUGIN +/*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/ +PLUGIN board/freescale/mx7d_19x19_ddr3_arm2/plugin.bin 0x00910000 +#else + +#ifdef CONFIG_SECURE_BOOT +CSF CONFIG_CSF_SIZE +#endif + +/* + * Device Configuration Data (DCD) + * + * Each entry must have the format: + * Addr-type Address Value + * + * where: + * Addr-type register length (1,2 or 4 bytes) + * Address absolute address of the register + * value value to be stored in the register + */ + +DATA 4 0x30360070 0x00703021 +DATA 4 0x30360090 0x0 +DATA 4 0x30360070 0x00603021 +CHECK_BITS_SET 4 0x30360070 0x80000000 +DATA 4 0x30389880 0x1 + +DATA 4 0x30340004 0x4F400005 + +DATA 4 0x30391000 0x00000002 +DATA 4 0x307a0000 0x03040001 +DATA 4 0x307a01a0 0x80400003 +DATA 4 0x307a01a4 0x00100020 +DATA 4 0x307a01a8 0x80100004 +DATA 4 0x307a0064 0x0040005e +DATA 4 0x307a0490 0x00000001 +DATA 4 0x307a00d0 0x00020001 +DATA 4 0x307a00d4 0x00010000 +DATA 4 0x307a00dc 0x09300004 +DATA 4 0x307a00e0 0x04080000 +DATA 4 0x307a00e4 0x00090004 +DATA 4 0x307a00f4 0x0000033f +DATA 4 0x307a0100 0x0908120a +DATA 4 0x307a0104 0x0002020e +DATA 4 0x307a0108 0x03040407 +DATA 4 0x307a010c 0x00002006 +DATA 4 0x307a0110 0x04020204 +DATA 4 0x307a0114 0x03030202 +DATA 4 0x307a0120 0x03030803 +DATA 4 0x307a0180 0x00800020 +DATA 4 0x307a0190 0x02098204 +DATA 4 0x307a0194 0x00030303 +DATA 4 0x307a0200 0x00000016 +DATA 4 0x307a0204 0x00171717 +DATA 4 0x307a0214 0x04040404 +DATA 4 0x307a0218 0x00040404 +DATA 4 0x307a0240 0x06000601 +DATA 4 0x307a0244 0x00001323 +DATA 4 0x30391000 0x00000000 +DATA 4 0x30790000 0x17420f40 +DATA 4 0x30790004 0x10210100 +DATA 4 0x30790010 0x00060807 +DATA 4 0x3079009c 0x00000dee +DATA 4 0x3079007c 0x18181818 +DATA 4 0x30790080 0x18181818 +DATA 4 0x30790084 0x40401818 +DATA 4 0x30790088 0x00000040 +DATA 4 0x3079006c 0x40404040 +DATA 4 0x30790020 0x08080808 +DATA 4 0x30790030 0x08080808 +DATA 4 0x30790050 0x01000010 +DATA 4 0x30790050 0x00000010 + +DATA 4 0x307900c0 0x0e407304 +DATA 4 0x307900c0 0x0e447304 +DATA 4 0x307900c0 0x0e447306 + +CHECK_BITS_SET 4 0x307900c4 0x1 + +DATA 4 0x307900c0 0x0e447304 +DATA 4 0x307900c0 0x0e407304 + + +DATA 4 0x30384130 0x00000000 +DATA 4 0x30340020 0x00000178 +DATA 4 0x30384130 0x00000002 +DATA 4 0x30790018 0x0000000f + +CHECK_BITS_SET 4 0x307a0004 0x1 +#endif diff --git a/board/freescale/mx7d_19x19_lpddr3_arm2/imximage.cfg b/board/freescale/mx7d_19x19_lpddr3_arm2/imximage.cfg index 253b7cd..dd16856 100644 --- a/board/freescale/mx7d_19x19_lpddr3_arm2/imximage.cfg +++ b/board/freescale/mx7d_19x19_lpddr3_arm2/imximage.cfg @@ -92,11 +92,6 @@ DATA 4 0x30790000 0x17421e40 DATA 4 0x30790004 0x10210100 DATA 4 0x30790008 0x00010000 DATA 4 0x30790010 0x0007080c -DATA 4 0x3079007c 0x1c1c1c1c -DATA 4 0x30790080 0x1c1c1c1c -DATA 4 0x30790084 0x30301c1c -DATA 4 0x30790088 0x00000030 -DATA 4 0x3079006c 0x30303030 DATA 4 0x307900b0 0x1010007e DATA 4 0x3079001C 0x01010000 diff --git a/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_TO_1_0.cfg b/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_TO_1_0.cfg deleted file mode 100644 index dd16856..0000000 --- a/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_TO_1_0.cfg +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright (C) 2015-2016 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ - * - * Refer docs/README.imxmage for more details about how-to configure - * and create imximage boot image - * - * The syntax is taken as close as possible with the kwbimage - */ - -#define __ASSEMBLY__ -#include - -/* image version */ - -IMAGE_VERSION 2 - -/* - * Boot Device : one of - * spi/sd/nand/onenand, qspi/nor - */ - -#ifdef CONFIG_SYS_BOOT_QSPI -BOOT_FROM qspi -#elif defined(CONFIG_SYS_BOOT_EIMNOR) -BOOT_FROM nor -#else -BOOT_FROM sd -#endif - -#ifdef CONFIG_USE_PLUGIN -/*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/ -PLUGIN board/freescale/mx7d_19x19_lpddr3_arm2/plugin.bin 0x00910000 -#else - -#ifdef CONFIG_SECURE_BOOT -CSF CONFIG_CSF_SIZE -#endif - -/* - * Device Configuration Data (DCD) - * - * Each entry must have the format: - * Addr-type Address Value - * - * where: - * Addr-type register length (1,2 or 4 bytes) - * Address absolute address of the register - * value value to be stored in the register - */ - -DATA 4 0x30340004 0x4F400005 - -DATA 4 0x30391000 0x00000002 -DATA 4 0x307a0000 0x03040008 -DATA 4 0x307a0064 0x00200038 -DATA 4 0x307a0490 0x00000001 -DATA 4 0x307a00d0 0x00350001 -DATA 4 0x307a00dc 0x00c3000a -DATA 4 0x307a00e0 0x00010000 -DATA 4 0x307a00e4 0x00110006 -DATA 4 0x307a00f4 0x0000033f -DATA 4 0x307a0100 0x0a0e110b -DATA 4 0x307a0104 0x00020211 -DATA 4 0x307a0108 0x03060708 -DATA 4 0x307a010c 0x00a0500c -DATA 4 0x307a0110 0x05020307 -DATA 4 0x307a0114 0x02020404 -DATA 4 0x307a0118 0x02020003 -DATA 4 0x307a011c 0x00000202 -DATA 4 0x307a0120 0x00000202 - -DATA 4 0x307a0180 0x00600018 -DATA 4 0x307a0184 0x00e00100 -DATA 4 0x307a0190 0x02098205 -DATA 4 0x307a0194 0x00060303 -DATA 4 0x307a01a0 0x80400003 -DATA 4 0x307a01a4 0x00100020 -DATA 4 0x307a01a8 0x80100004 - -DATA 4 0x307a0200 0x00000016 -DATA 4 0x307a0204 0x00171717 -DATA 4 0x307a0210 0x00000f00 -DATA 4 0x307a0214 0x05050505 -DATA 4 0x307a0218 0x0f0f0505 - -DATA 4 0x307a0240 0x06000601 -DATA 4 0x307a0244 0x00000000 -DATA 4 0x30391000 0x00000000 -DATA 4 0x30790000 0x17421e40 -DATA 4 0x30790004 0x10210100 -DATA 4 0x30790008 0x00010000 -DATA 4 0x30790010 0x0007080c -DATA 4 0x307900b0 0x1010007e - -DATA 4 0x3079001C 0x01010000 -DATA 4 0x3079009c 0x0db60d6e - -DATA 4 0x30790030 0x06060606 -DATA 4 0x30790020 0x0a0a0a0a -DATA 4 0x30790050 0x01000008 -DATA 4 0x30790050 0x00000008 -DATA 4 0x30790018 0x0000000f -DATA 4 0x307900c0 0x1e487304 -DATA 4 0x307900c0 0x1e487304 -DATA 4 0x307900c0 0x1e487306 -DATA 4 0x307900c0 0x1e4c7304 -CHECK_BITS_SET 4 0x307900c4 0x1 - -DATA 4 0x307900c0 0x1e487304 - -DATA 4 0x30384130 0x00000000 -DATA 4 0x30340020 0x00000178 -DATA 4 0x30384130 0x00000002 - -CHECK_BITS_SET 4 0x307a0004 0x1 -#endif diff --git a/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_TO_1_1.cfg b/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_TO_1_1.cfg new file mode 100644 index 0000000..253b7cd --- /dev/null +++ b/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_TO_1_1.cfg @@ -0,0 +1,123 @@ +/* + * Copyright (C) 2015-2016 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + * + * Refer docs/README.imxmage for more details about how-to configure + * and create imximage boot image + * + * The syntax is taken as close as possible with the kwbimage + */ + +#define __ASSEMBLY__ +#include + +/* image version */ + +IMAGE_VERSION 2 + +/* + * Boot Device : one of + * spi/sd/nand/onenand, qspi/nor + */ + +#ifdef CONFIG_SYS_BOOT_QSPI +BOOT_FROM qspi +#elif defined(CONFIG_SYS_BOOT_EIMNOR) +BOOT_FROM nor +#else +BOOT_FROM sd +#endif + +#ifdef CONFIG_USE_PLUGIN +/*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/ +PLUGIN board/freescale/mx7d_19x19_lpddr3_arm2/plugin.bin 0x00910000 +#else + +#ifdef CONFIG_SECURE_BOOT +CSF CONFIG_CSF_SIZE +#endif + +/* + * Device Configuration Data (DCD) + * + * Each entry must have the format: + * Addr-type Address Value + * + * where: + * Addr-type register length (1,2 or 4 bytes) + * Address absolute address of the register + * value value to be stored in the register + */ + +DATA 4 0x30340004 0x4F400005 + +DATA 4 0x30391000 0x00000002 +DATA 4 0x307a0000 0x03040008 +DATA 4 0x307a0064 0x00200038 +DATA 4 0x307a0490 0x00000001 +DATA 4 0x307a00d0 0x00350001 +DATA 4 0x307a00dc 0x00c3000a +DATA 4 0x307a00e0 0x00010000 +DATA 4 0x307a00e4 0x00110006 +DATA 4 0x307a00f4 0x0000033f +DATA 4 0x307a0100 0x0a0e110b +DATA 4 0x307a0104 0x00020211 +DATA 4 0x307a0108 0x03060708 +DATA 4 0x307a010c 0x00a0500c +DATA 4 0x307a0110 0x05020307 +DATA 4 0x307a0114 0x02020404 +DATA 4 0x307a0118 0x02020003 +DATA 4 0x307a011c 0x00000202 +DATA 4 0x307a0120 0x00000202 + +DATA 4 0x307a0180 0x00600018 +DATA 4 0x307a0184 0x00e00100 +DATA 4 0x307a0190 0x02098205 +DATA 4 0x307a0194 0x00060303 +DATA 4 0x307a01a0 0x80400003 +DATA 4 0x307a01a4 0x00100020 +DATA 4 0x307a01a8 0x80100004 + +DATA 4 0x307a0200 0x00000016 +DATA 4 0x307a0204 0x00171717 +DATA 4 0x307a0210 0x00000f00 +DATA 4 0x307a0214 0x05050505 +DATA 4 0x307a0218 0x0f0f0505 + +DATA 4 0x307a0240 0x06000601 +DATA 4 0x307a0244 0x00000000 +DATA 4 0x30391000 0x00000000 +DATA 4 0x30790000 0x17421e40 +DATA 4 0x30790004 0x10210100 +DATA 4 0x30790008 0x00010000 +DATA 4 0x30790010 0x0007080c +DATA 4 0x3079007c 0x1c1c1c1c +DATA 4 0x30790080 0x1c1c1c1c +DATA 4 0x30790084 0x30301c1c +DATA 4 0x30790088 0x00000030 +DATA 4 0x3079006c 0x30303030 +DATA 4 0x307900b0 0x1010007e + +DATA 4 0x3079001C 0x01010000 +DATA 4 0x3079009c 0x0db60d6e + +DATA 4 0x30790030 0x06060606 +DATA 4 0x30790020 0x0a0a0a0a +DATA 4 0x30790050 0x01000008 +DATA 4 0x30790050 0x00000008 +DATA 4 0x30790018 0x0000000f +DATA 4 0x307900c0 0x1e487304 +DATA 4 0x307900c0 0x1e487304 +DATA 4 0x307900c0 0x1e487306 +DATA 4 0x307900c0 0x1e4c7304 +CHECK_BITS_SET 4 0x307900c4 0x1 + +DATA 4 0x307900c0 0x1e487304 + +DATA 4 0x30384130 0x00000000 +DATA 4 0x30340020 0x00000178 +DATA 4 0x30384130 0x00000002 + +CHECK_BITS_SET 4 0x307a0004 0x1 +#endif diff --git a/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_lpddr2.cfg b/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_lpddr2.cfg index ab49d57..171d2ad 100644 --- a/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_lpddr2.cfg +++ b/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_lpddr2.cfg @@ -96,12 +96,7 @@ DATA 4 0x30790010 0x00050408 DATA 4 0x307900b0 0x1010007e DATA 4 0x3079001C 0x01010000 -DATA 4 0x3079009C 0x00000dee -DATA 4 0x3079007c 0x08080808 -DATA 4 0x30790080 0x08080808 -DATA 4 0x30790084 0x0a0a0808 -DATA 4 0x30790088 0x0000000a -DATA 4 0x3079006c 0x0a0a0a0a +DATA 4 0x3079009C 0x00000d6e DATA 4 0x30790018 0x0000000f DATA 4 0x30790030 0x06060606 diff --git a/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_lpddr2_TO_1_0.cfg b/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_lpddr2_TO_1_0.cfg deleted file mode 100644 index 171d2ad..0000000 --- a/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_lpddr2_TO_1_0.cfg +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Copyright (C) 2015-2016 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ - * - * Refer docs/README.imxmage for more details about how-to configure - * and create imximage boot image - * - * The syntax is taken as close as possible with the kwbimage - */ - -#define __ASSEMBLY__ -#include - -/* image version */ - -IMAGE_VERSION 2 - -/* - * Boot Device : one of - * spi/sd/nand/onenand, qspi/nor - */ - -#ifdef CONFIG_SYS_BOOT_QSPI -BOOT_FROM qspi -#elif defined(CONFIG_SYS_BOOT_EIMNOR) -BOOT_FROM nor -#else -BOOT_FROM sd -#endif - -#ifdef CONFIG_USE_PLUGIN -/*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/ -PLUGIN board/freescale/mx7d_19x19_lpddr3_arm2/plugin.bin 0x00910000 -#else - -#ifdef CONFIG_SECURE_BOOT -CSF CONFIG_CSF_SIZE -#endif - -/* - * Device Configuration Data (DCD) - * - * Each entry must have the format: - * Addr-type Address Value - * - * where: - * Addr-type register length (1,2 or 4 bytes) - * Address absolute address of the register - * value value to be stored in the register - */ - -DATA 4 0x30340004 0x4F400005 - -DATA 4 0x30391000 0x00000002 -DATA 4 0x307a0000 0x03020004 -DATA 4 0x307a01a0 0x80400003 -DATA 4 0x307a01a4 0x00100020 -DATA 4 0x307a01a8 0x80100004 -DATA 4 0x307a0064 0x00200023 -DATA 4 0x307a0490 0x00000001 -DATA 4 0x307a00d0 0x00350001 -DATA 4 0x307a00d8 0x00001105 -DATA 4 0x307a00dc 0x00c20006 -DATA 4 0x307a00e0 0x00020000 -DATA 4 0x307a00e4 0x00110006 -DATA 4 0x307a00f4 0x0000033f -DATA 4 0x307a0100 0x080e110b -DATA 4 0x307a0104 0x00020211 -DATA 4 0x307a0108 0x02040706 -DATA 4 0x307a010c 0x00504000 -DATA 4 0x307a0110 0x05010307 -DATA 4 0x307a0114 0x02020404 -DATA 4 0x307a0118 0x02020003 -DATA 4 0x307a011c 0x00000202 -DATA 4 0x307a0120 0x00000202 - -DATA 4 0x307a0180 0x00600018 -DATA 4 0x307a0184 0x00e00100 -DATA 4 0x307a0190 0x02098203 -DATA 4 0x307a0194 0x00060303 - -DATA 4 0x307a0200 0x00000015 -DATA 4 0x307a0204 0x00161616 -DATA 4 0x307a0210 0x00000f0f -DATA 4 0x307a0214 0x04040404 -DATA 4 0x307a0218 0x0f0f0404 - -DATA 4 0x307a0240 0x06000600 -DATA 4 0x307a0244 0x00000000 -DATA 4 0x30391000 0x00000000 -DATA 4 0x30790000 0x17421640 -DATA 4 0x30790004 0x10210100 -DATA 4 0x30790008 0x00010000 -DATA 4 0x30790010 0x00050408 -DATA 4 0x307900b0 0x1010007e - -DATA 4 0x3079001C 0x01010000 -DATA 4 0x3079009C 0x00000d6e -DATA 4 0x30790018 0x0000000f - -DATA 4 0x30790030 0x06060606 -DATA 4 0x30790020 0x0a0a0a0a -DATA 4 0x30790050 0x01000008 -DATA 4 0x30790050 0x00000008 -DATA 4 0x307900c0 0x0e487304 -DATA 4 0x307900c0 0x0e4c7304 -DATA 4 0x307900c0 0x0e4c7306 -CHECK_BITS_SET 4 0x307900c4 0x1 - -DATA 4 0x307900c0 0x0e4c7304 -DATA 4 0x307900c0 0x0e487304 - -DATA 4 0x30384130 0x00000000 -DATA 4 0x30340020 0x000001f8 -DATA 4 0x30384130 0x00000002 - -CHECK_BITS_SET 4 0x307a0004 0x1 -#endif diff --git a/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_lpddr2_TO_1_1.cfg b/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_lpddr2_TO_1_1.cfg new file mode 100644 index 0000000..ab49d57 --- /dev/null +++ b/board/freescale/mx7d_19x19_lpddr3_arm2/imximage_lpddr2_TO_1_1.cfg @@ -0,0 +1,124 @@ +/* + * Copyright (C) 2015-2016 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + * + * Refer docs/README.imxmage for more details about how-to configure + * and create imximage boot image + * + * The syntax is taken as close as possible with the kwbimage + */ + +#define __ASSEMBLY__ +#include + +/* image version */ + +IMAGE_VERSION 2 + +/* + * Boot Device : one of + * spi/sd/nand/onenand, qspi/nor + */ + +#ifdef CONFIG_SYS_BOOT_QSPI +BOOT_FROM qspi +#elif defined(CONFIG_SYS_BOOT_EIMNOR) +BOOT_FROM nor +#else +BOOT_FROM sd +#endif + +#ifdef CONFIG_USE_PLUGIN +/*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/ +PLUGIN board/freescale/mx7d_19x19_lpddr3_arm2/plugin.bin 0x00910000 +#else + +#ifdef CONFIG_SECURE_BOOT +CSF CONFIG_CSF_SIZE +#endif + +/* + * Device Configuration Data (DCD) + * + * Each entry must have the format: + * Addr-type Address Value + * + * where: + * Addr-type register length (1,2 or 4 bytes) + * Address absolute address of the register + * value value to be stored in the register + */ + +DATA 4 0x30340004 0x4F400005 + +DATA 4 0x30391000 0x00000002 +DATA 4 0x307a0000 0x03020004 +DATA 4 0x307a01a0 0x80400003 +DATA 4 0x307a01a4 0x00100020 +DATA 4 0x307a01a8 0x80100004 +DATA 4 0x307a0064 0x00200023 +DATA 4 0x307a0490 0x00000001 +DATA 4 0x307a00d0 0x00350001 +DATA 4 0x307a00d8 0x00001105 +DATA 4 0x307a00dc 0x00c20006 +DATA 4 0x307a00e0 0x00020000 +DATA 4 0x307a00e4 0x00110006 +DATA 4 0x307a00f4 0x0000033f +DATA 4 0x307a0100 0x080e110b +DATA 4 0x307a0104 0x00020211 +DATA 4 0x307a0108 0x02040706 +DATA 4 0x307a010c 0x00504000 +DATA 4 0x307a0110 0x05010307 +DATA 4 0x307a0114 0x02020404 +DATA 4 0x307a0118 0x02020003 +DATA 4 0x307a011c 0x00000202 +DATA 4 0x307a0120 0x00000202 + +DATA 4 0x307a0180 0x00600018 +DATA 4 0x307a0184 0x00e00100 +DATA 4 0x307a0190 0x02098203 +DATA 4 0x307a0194 0x00060303 + +DATA 4 0x307a0200 0x00000015 +DATA 4 0x307a0204 0x00161616 +DATA 4 0x307a0210 0x00000f0f +DATA 4 0x307a0214 0x04040404 +DATA 4 0x307a0218 0x0f0f0404 + +DATA 4 0x307a0240 0x06000600 +DATA 4 0x307a0244 0x00000000 +DATA 4 0x30391000 0x00000000 +DATA 4 0x30790000 0x17421640 +DATA 4 0x30790004 0x10210100 +DATA 4 0x30790008 0x00010000 +DATA 4 0x30790010 0x00050408 +DATA 4 0x307900b0 0x1010007e + +DATA 4 0x3079001C 0x01010000 +DATA 4 0x3079009C 0x00000dee +DATA 4 0x3079007c 0x08080808 +DATA 4 0x30790080 0x08080808 +DATA 4 0x30790084 0x0a0a0808 +DATA 4 0x30790088 0x0000000a +DATA 4 0x3079006c 0x0a0a0a0a +DATA 4 0x30790018 0x0000000f + +DATA 4 0x30790030 0x06060606 +DATA 4 0x30790020 0x0a0a0a0a +DATA 4 0x30790050 0x01000008 +DATA 4 0x30790050 0x00000008 +DATA 4 0x307900c0 0x0e487304 +DATA 4 0x307900c0 0x0e4c7304 +DATA 4 0x307900c0 0x0e4c7306 +CHECK_BITS_SET 4 0x307900c4 0x1 + +DATA 4 0x307900c0 0x0e4c7304 +DATA 4 0x307900c0 0x0e487304 + +DATA 4 0x30384130 0x00000000 +DATA 4 0x30340020 0x000001f8 +DATA 4 0x30384130 0x00000002 + +CHECK_BITS_SET 4 0x307a0004 0x1 +#endif diff --git a/board/freescale/mx7dsabresd/imximage.cfg b/board/freescale/mx7dsabresd/imximage.cfg index 1182613..ccf639c 100644 --- a/board/freescale/mx7dsabresd/imximage.cfg +++ b/board/freescale/mx7dsabresd/imximage.cfg @@ -50,12 +50,6 @@ CSF CONFIG_CSF_SIZE * value value to be stored in the register */ -DATA 4 0x30360070 0x00703021 -DATA 4 0x30360090 0x0 -DATA 4 0x30360070 0x00603021 -CHECK_BITS_SET 4 0x30360070 0x80000000 -DATA 4 0x30389880 0x1 - DATA 4 0x30340004 0x4F400005 /* Clear then set bit30 to ensure exit from DDR retention */ DATA 4 0x30360388 0x40000000 @@ -96,12 +90,7 @@ DATA 4 0x30790000 0x17420f40 DATA 4 0x30790004 0x10210100 DATA 4 0x30790010 0x00060807 DATA 4 0x307900b0 0x1010007e -DATA 4 0x3079009c 0x00000dee -DATA 4 0x3079007c 0x18181818 -DATA 4 0x30790080 0x18181818 -DATA 4 0x30790084 0x40401818 -DATA 4 0x30790088 0x00000040 -DATA 4 0x3079006c 0x40404040 +DATA 4 0x3079009c 0x00000d6e DATA 4 0x30790020 0x08080808 DATA 4 0x30790030 0x08080808 DATA 4 0x30790050 0x01000010 diff --git a/board/freescale/mx7dsabresd/imximage_TO_1_0.cfg b/board/freescale/mx7dsabresd/imximage_TO_1_0.cfg deleted file mode 100644 index 588474f..0000000 --- a/board/freescale/mx7dsabresd/imximage_TO_1_0.cfg +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (C) 2014-2016 Freescale Semiconductor, Inc. - * - * SPDX-License-Identifier: GPL-2.0+ - * - * Refer docs/README.imxmage for more details about how-to configure - * and create imximage boot image - * - * The syntax is taken as close as possible with the kwbimage - */ - -#define __ASSEMBLY__ -#include - -/* image version */ - -IMAGE_VERSION 2 - -/* - * Boot Device : one of - * spi/sd/nand/onenand, qspi/nor - */ - -#ifdef CONFIG_SYS_BOOT_QSPI -BOOT_FROM qspi -#elif defined(CONFIG_SYS_BOOT_EIMNOR) -BOOT_FROM nor -#else -BOOT_FROM sd -#endif - -#ifdef CONFIG_USE_PLUGIN -/*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/ -PLUGIN board/freescale/mx7dsabresd/plugin.bin 0x00910000 -#else - -#ifdef CONFIG_SECURE_BOOT -CSF CONFIG_CSF_SIZE -#endif - -/* - * Device Configuration Data (DCD) - * - * Each entry must have the format: - * Addr-type Address Value - * - * where: - * Addr-type register length (1,2 or 4 bytes) - * Address absolute address of the register - * value value to be stored in the register - */ - -DATA 4 0x30340004 0x4F400005 -/* Clear then set bit30 to ensure exit from DDR retention */ -DATA 4 0x30360388 0x40000000 -DATA 4 0x30360384 0x40000000 - -DATA 4 0x30391000 0x00000002 -DATA 4 0x307a0000 0x01040001 -DATA 4 0x307a01a0 0x80400003 -DATA 4 0x307a01a4 0x00100020 -DATA 4 0x307a01a8 0x80100004 -DATA 4 0x307a0064 0x00400046 -DATA 4 0x307a0490 0x00000001 -DATA 4 0x307a00d0 0x00020083 -DATA 4 0x307a00d4 0x00690000 -DATA 4 0x307a00dc 0x09300004 -DATA 4 0x307a00e0 0x04080000 -DATA 4 0x307a00e4 0x00100004 -DATA 4 0x307a00f4 0x0000033f -DATA 4 0x307a0100 0x09081109 -DATA 4 0x307a0104 0x0007020d -DATA 4 0x307a0108 0x03040407 -DATA 4 0x307a010c 0x00002006 -DATA 4 0x307a0110 0x04020205 -DATA 4 0x307a0114 0x03030202 -DATA 4 0x307a0120 0x00000803 -DATA 4 0x307a0180 0x00800020 -DATA 4 0x307a0184 0x02000100 -DATA 4 0x307a0190 0x02098204 -DATA 4 0x307a0194 0x00030303 -DATA 4 0x307a0200 0x00000016 -DATA 4 0x307a0204 0x00171717 -DATA 4 0x307a0214 0x04040404 -DATA 4 0x307a0218 0x0f040404 -DATA 4 0x307a0240 0x06000604 -DATA 4 0x307a0244 0x00000001 -DATA 4 0x30391000 0x00000000 -DATA 4 0x30790000 0x17420f40 -DATA 4 0x30790004 0x10210100 -DATA 4 0x30790010 0x00060807 -DATA 4 0x307900b0 0x1010007e -DATA 4 0x3079009c 0x00000d6e -DATA 4 0x30790020 0x08080808 -DATA 4 0x30790030 0x08080808 -DATA 4 0x30790050 0x01000010 -DATA 4 0x30790050 0x00000010 - -DATA 4 0x307900c0 0x0e407304 -DATA 4 0x307900c0 0x0e447304 -DATA 4 0x307900c0 0x0e447306 - -CHECK_BITS_SET 4 0x307900c4 0x1 - -DATA 4 0x307900c0 0x0e447304 -DATA 4 0x307900c0 0x0e407304 - - -DATA 4 0x30384130 0x00000000 -DATA 4 0x30340020 0x00000178 -DATA 4 0x30384130 0x00000002 -DATA 4 0x30790018 0x0000000f - -CHECK_BITS_SET 4 0x307a0004 0x1 - -#endif diff --git a/board/freescale/mx7dsabresd/imximage_TO_1_1.cfg b/board/freescale/mx7dsabresd/imximage_TO_1_1.cfg new file mode 100644 index 0000000..106c277 --- /dev/null +++ b/board/freescale/mx7dsabresd/imximage_TO_1_1.cfg @@ -0,0 +1,127 @@ +/* + * Copyright (C) 2014-2016 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + * + * Refer docs/README.imxmage for more details about how-to configure + * and create imximage boot image + * + * The syntax is taken as close as possible with the kwbimage + */ + +#define __ASSEMBLY__ +#include + +/* image version */ + +IMAGE_VERSION 2 + +/* + * Boot Device : one of + * spi/sd/nand/onenand, qspi/nor + */ + +#ifdef CONFIG_SYS_BOOT_QSPI +BOOT_FROM qspi +#elif defined(CONFIG_SYS_BOOT_EIMNOR) +BOOT_FROM nor +#else +BOOT_FROM sd +#endif + +#ifdef CONFIG_USE_PLUGIN +/*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/ +PLUGIN board/freescale/mx7dsabresd/plugin.bin 0x00910000 +#else + +#ifdef CONFIG_SECURE_BOOT +CSF CONFIG_CSF_SIZE +#endif + +/* + * Device Configuration Data (DCD) + * + * Each entry must have the format: + * Addr-type Address Value + * + * where: + * Addr-type register length (1,2 or 4 bytes) + * Address absolute address of the register + * value value to be stored in the register + */ + +DATA 4 0x30360070 0x00703021 +DATA 4 0x30360090 0x0 +DATA 4 0x30360070 0x00603021 +CHECK_BITS_SET 4 0x30360070 0x80000000 +DATA 4 0x30389880 0x1 + +DATA 4 0x30340004 0x4F400005 +/* Clear then set bit30 to ensure exit from DDR retention */ +DATA 4 0x30360388 0x40000000 +DATA 4 0x30360384 0x40000000 + +DATA 4 0x30391000 0x00000002 +DATA 4 0x307a0000 0x01040001 +DATA 4 0x307a01a0 0x80400003 +DATA 4 0x307a01a4 0x00100020 +DATA 4 0x307a01a8 0x80100004 +DATA 4 0x307a0064 0x00400046 +DATA 4 0x307a0490 0x00000001 +DATA 4 0x307a00d0 0x00020083 +DATA 4 0x307a00d4 0x00690000 +DATA 4 0x307a00dc 0x09300004 +DATA 4 0x307a00e0 0x04080000 +DATA 4 0x307a00e4 0x00100004 +DATA 4 0x307a00f4 0x0000033f +DATA 4 0x307a0100 0x09081109 +DATA 4 0x307a0104 0x0007020d +DATA 4 0x307a0108 0x03040407 +DATA 4 0x307a010c 0x00002006 +DATA 4 0x307a0110 0x04020205 +DATA 4 0x307a0114 0x03030202 +DATA 4 0x307a0120 0x00000803 +DATA 4 0x307a0180 0x00800020 +DATA 4 0x307a0184 0x02000100 +DATA 4 0x307a0190 0x02098204 +DATA 4 0x307a0194 0x00030303 +DATA 4 0x307a0200 0x00000016 +DATA 4 0x307a0204 0x00171717 +DATA 4 0x307a0214 0x04040404 +DATA 4 0x307a0218 0x0f040404 +DATA 4 0x307a0240 0x06000604 +DATA 4 0x307a0244 0x00000001 +DATA 4 0x30391000 0x00000000 +DATA 4 0x30790000 0x17420f40 +DATA 4 0x30790004 0x10210100 +DATA 4 0x30790010 0x00060807 +DATA 4 0x307900b0 0x1010007e +DATA 4 0x3079009c 0x00000dee +DATA 4 0x3079007c 0x18181818 +DATA 4 0x30790080 0x18181818 +DATA 4 0x30790084 0x40401818 +DATA 4 0x30790088 0x00000040 +DATA 4 0x3079006c 0x40404040 +DATA 4 0x30790020 0x08080808 +DATA 4 0x30790030 0x08080808 +DATA 4 0x30790050 0x01000010 +DATA 4 0x30790050 0x00000010 + +DATA 4 0x307900c0 0x0e407304 +DATA 4 0x307900c0 0x0e447304 +DATA 4 0x307900c0 0x0e447306 + +CHECK_BITS_SET 4 0x307900c4 0x1 + +DATA 4 0x307900c0 0x0e447304 +DATA 4 0x307900c0 0x0e407304 + + +DATA 4 0x30384130 0x00000000 +DATA 4 0x30340020 0x00000178 +DATA 4 0x30384130 0x00000002 +DATA 4 0x30790018 0x0000000f + +CHECK_BITS_SET 4 0x307a0004 0x1 + +#endif -- cgit v1.1