summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Liu <r64343@freescale.com>2013-08-14 15:21:02 +0800
committerJason Liu <r64343@freescale.com>2013-08-21 14:54:17 +0800
commit13a9232928680adb794e4d60487391f95941f107 (patch)
tree28febebe46ed212ce15357deadecac6b72b75b6a
parentade289156605c94f693aeeb4062acb2bba543bcd (diff)
downloadu-boot-imx-13a9232928680adb794e4d60487391f95941f107.zip
u-boot-imx-13a9232928680adb794e4d60487391f95941f107.tar.gz
u-boot-imx-13a9232928680adb794e4d60487391f95941f107.tar.bz2
ENGR00275348-9 imx6/sabre{sd,auto}: add the secureboot support
In order to support the secureboot, please turn on the CONFIG_SECURE_BOOT in include/configs/mx6qsabre_common.h By default, the CONFIG_SECURE_BOOT is disabled. Signed-off-by: Jason Liu <r64343@freescale.com>
-rw-r--r--board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg5
-rw-r--r--board/freescale/mx6qsabreauto/mx6dl.cfg5
-rw-r--r--board/freescale/mx6qsabreauto/mx6q.cfg5
-rw-r--r--board/freescale/mx6qsabreauto/mx6solo.cfg5
-rw-r--r--board/freescale/mx6qsabresd/mx6dl_4x_mt41j128.cfg5
-rw-r--r--board/freescale/mx6qsabresd/mx6solo_4x_mt41j128.cfg5
-rw-r--r--include/configs/mx6qsabre_common.h5
7 files changed, 35 insertions, 0 deletions
diff --git a/board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg b/board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
index ff106ac..fe92070 100644
--- a/board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
+++ b/board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg
@@ -44,6 +44,11 @@ BOOT_FROM sd
/*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/
PLUGIN board/freescale/mx6qsabresd/plugin.bin 0x00907000
#else
+
+#ifdef CONFIG_SECURE_BOOT
+SECURE_BOOT
+#endif
+
/*
* Device Configuration Data (DCD)
*
diff --git a/board/freescale/mx6qsabreauto/mx6dl.cfg b/board/freescale/mx6qsabreauto/mx6dl.cfg
index 3dfae4f..97027f4 100644
--- a/board/freescale/mx6qsabreauto/mx6dl.cfg
+++ b/board/freescale/mx6qsabreauto/mx6dl.cfg
@@ -49,6 +49,11 @@ BOOT_FROM sd
/*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/
PLUGIN board/freescale/mx6qsabreauto/plugin.bin 0x00907000
#else
+
+#ifdef CONFIG_SECURE_BOOT
+SECURE_BOOT
+#endif
+
/*
* Device Configuration Data (DCD)
*
diff --git a/board/freescale/mx6qsabreauto/mx6q.cfg b/board/freescale/mx6qsabreauto/mx6q.cfg
index 93e3680..bdc022b 100644
--- a/board/freescale/mx6qsabreauto/mx6q.cfg
+++ b/board/freescale/mx6qsabreauto/mx6q.cfg
@@ -48,6 +48,11 @@ BOOT_FROM sd
/*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/
PLUGIN board/freescale/mx6qsabreauto/plugin.bin 0x00907000
#else
+
+#ifdef CONFIG_SECURE_BOOT
+SECURE_BOOT
+#endif
+
/*
* Device Configuration Data (DCD)
*
diff --git a/board/freescale/mx6qsabreauto/mx6solo.cfg b/board/freescale/mx6qsabreauto/mx6solo.cfg
index 287bb1f..a584a14 100644
--- a/board/freescale/mx6qsabreauto/mx6solo.cfg
+++ b/board/freescale/mx6qsabreauto/mx6solo.cfg
@@ -39,6 +39,11 @@ BOOT_FROM sd
/*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/
PLUGIN board/freescale/mx6qsabreauto/plugin.bin 0x00907000
#else
+
+#ifdef CONFIG_SECURE_BOOT
+SECURE_BOOT
+#endif
+
/*
* Device Configuration Data (DCD)
*
diff --git a/board/freescale/mx6qsabresd/mx6dl_4x_mt41j128.cfg b/board/freescale/mx6qsabresd/mx6dl_4x_mt41j128.cfg
index f88db33..87aa56c 100644
--- a/board/freescale/mx6qsabresd/mx6dl_4x_mt41j128.cfg
+++ b/board/freescale/mx6qsabresd/mx6dl_4x_mt41j128.cfg
@@ -42,6 +42,11 @@ BOOT_FROM sd
/*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/
PLUGIN board/freescale/mx6qsabresd/plugin.bin 0x00907000
#else
+
+#ifdef CONFIG_SECURE_BOOT
+SECURE_BOOT
+#endif
+
/*
* Device Configuration Data (DCD)
*
diff --git a/board/freescale/mx6qsabresd/mx6solo_4x_mt41j128.cfg b/board/freescale/mx6qsabresd/mx6solo_4x_mt41j128.cfg
index 2a4e83b..9a05762 100644
--- a/board/freescale/mx6qsabresd/mx6solo_4x_mt41j128.cfg
+++ b/board/freescale/mx6qsabresd/mx6solo_4x_mt41j128.cfg
@@ -42,6 +42,11 @@ BOOT_FROM sd
/*PLUGIN plugin-binary-file IRAM_FREE_START_ADDR*/
PLUGIN board/freescale/mx6qsabresd/plugin.bin 0x00907000
#else
+
+#ifdef CONFIG_SECURE_BOOT
+SECURE_BOOT
+#endif
+
/*
* Device Configuration Data (DCD)
*
diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h
index 3d01d2a..e2795cc 100644
--- a/include/configs/mx6qsabre_common.h
+++ b/include/configs/mx6qsabre_common.h
@@ -30,6 +30,11 @@
/* uncomment for PLUGIN mode support */
/* #define CONFIG_USE_PLUGIN */
+#define CONFIG_ARCH_MISC_INIT
+
+/* uncomment for SECURE mode support */
+/* #define CONFIG_SECURE_BOOT */
+
#include "mx6_common.h"
#define CONFIG_DISPLAY_CPUINFO