summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorEric Sun <jian.sun@freescale.com>2012-07-23 10:43:32 +0800
committerEric Sun <jian.sun@freescale.com>2012-07-23 10:43:32 +0800
commit06cfbf9be534c59c178957029084fe14148fd181 (patch)
treed62d09aa760ef9caf1ae8fe7313faca7e0b97b72 /include
parent5ced161d77fa54a87ad80d6245b839352c147c82 (diff)
ENGR00217764 MX6 Secure Boot : Fix NAND BOOT Failure due to secure patch
With the secure boot patch. MX6 NAND Boot is not functional. The root cause is that, the original secure boot patch fills "0xFF' to spacing regions, due to a issue in ROM code, read pages of all "0xff" will be treated as a critical error. Thus prevent the U-Boot from booting normally. The fix adjust image copy size in IVT so that when secure boot is not enabled, no unuseful data is copied by ROM code. Also the secure boot option is default disabled. The end user won't enable it unless they know what they are doing. These prevent the ROM code from copied pages of "0xff" data, and fix the issue. Signed-off-by: Eric Sun <jian.sun@freescale.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/mx6dl_arm2.h5
-rw-r--r--include/configs/mx6q_arm2.h5
-rw-r--r--include/configs/mx6sl_arm2.h5
3 files changed, 12 insertions, 3 deletions
diff --git a/include/configs/mx6dl_arm2.h b/include/configs/mx6dl_arm2.h
index 9b10aaab1f..7bc3d71213 100644
--- a/include/configs/mx6dl_arm2.h
+++ b/include/configs/mx6dl_arm2.h
@@ -35,7 +35,10 @@
#define CONFIG_FLASH_HEADER_OFFSET 0x400
#define CONFIG_MX6_CLK32 32768
-#define CONFIG_SECURE_BOOT
+/*
+ * #define CONFIG_SECURE_BOOT
+ * Enable Secure Boot. DO NOT TURN ON IT until you know what you are doing
+ */
#define CONFIG_SKIP_RELOCATE_UBOOT
diff --git a/include/configs/mx6q_arm2.h b/include/configs/mx6q_arm2.h
index 454852da35..a52ac558c7 100644
--- a/include/configs/mx6q_arm2.h
+++ b/include/configs/mx6q_arm2.h
@@ -33,7 +33,10 @@
#define CONFIG_FLASH_HEADER_OFFSET 0x400
#define CONFIG_MX6_CLK32 32768
-#define CONFIG_SECURE_BOOT
+/*
+ * #define CONFIG_SECURE_BOOT
+ * Enable Secure Boot. DO NOT TURN ON IT until you know what you are doing
+ */
#define CONFIG_SKIP_RELOCATE_UBOOT
diff --git a/include/configs/mx6sl_arm2.h b/include/configs/mx6sl_arm2.h
index ae23783c44..d24068e280 100644
--- a/include/configs/mx6sl_arm2.h
+++ b/include/configs/mx6sl_arm2.h
@@ -31,7 +31,10 @@
#define CONFIG_FLASH_HEADER_OFFSET 0x400
#define CONFIG_MX6_CLK32 32768
-#define CONFIG_SECURE_BOOT
+/*
+ * #define CONFIG_SECURE_BOOT
+ * Enable Secure Boot. DO NOT TURN ON IT until you know what you are doing
+ */
#include <asm/arch/mx6.h>