MLK-12500-2 HAB: Add commented secure boot configurations

CONFIG_SECURE_BOOT is used for signed image building, this configuration is
not enabled at default. Comment it in mx6/mx7 common header file. Users can
uncomment it to enable.

Also add CONFIG_CSF_SIZE for defining the CSF reserved size and resize
the CONFIG_CSF_SIZE to 0x4000 to align with v2016.03.

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 01cc7d9bc205251c13712418d51f3a4d7b20861b)

diff --git a/board/freescale/mx6qarm2/imximage_mx6dl.cfg b/board/freescale/mx6qarm2/imximage_mx6dl.cfg
index b7769fe..e94918c 100644 (file)
--- a/board/freescale/mx6qarm2/imximage_mx6dl.cfg
+++ b/board/freescale/mx6qarm2/imximage_mx6dl.cfg
@@ -27,6 +27,10 @@ BOOT_FROM    sd
 PLUGIN board/freescale/mx6qarm2/plugin.bin 0x00907000
 #else
 
+#ifdef CONFIG_SECURE_BOOT
+CSF CONFIG_CSF_SIZE
+#endif
+
 /*
  * Device Configuration Data (DCD)
  *

diff --git a/board/freescale/mx6qsabreauto/imximage.cfg b/board/freescale/mx6qsabreauto/imximage.cfg
index 0a9b26d..bb0727f 100644 (file)
--- a/board/freescale/mx6qsabreauto/imximage.cfg
+++ b/board/freescale/mx6qsabreauto/imximage.cfg
@@ -27,6 +27,10 @@ BOOT_FROM    sd
 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 2cfb81a..ce532ac 100644 (file)
--- a/board/freescale/mx6qsabreauto/mx6dl.cfg
+++ b/board/freescale/mx6qsabreauto/mx6dl.cfg
@@ -28,6 +28,10 @@ BOOT_FROM    sd
 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/mx6qp.cfg b/board/freescale/mx6qsabreauto/mx6qp.cfg
index 846d3e6..9c6a2c5 100644 (file)
--- a/board/freescale/mx6qsabreauto/mx6qp.cfg
+++ b/board/freescale/mx6qsabreauto/mx6qp.cfg
@@ -30,6 +30,10 @@ BOOT_FROM    sd
 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/mx6solo.cfg b/board/freescale/mx6qsabreauto/mx6solo.cfg
index 584e15a..9be5cdc 100644 (file)
--- a/board/freescale/mx6qsabreauto/mx6solo.cfg
+++ b/board/freescale/mx6qsabreauto/mx6solo.cfg
@@ -31,6 +31,10 @@ IMAGE_VERSION 2
 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/mx6sabresd/mx6dlsabresd.cfg b/board/freescale/mx6sabresd/mx6dlsabresd.cfg
index 9e2cbee..6dc93ea 100644 (file)
--- a/board/freescale/mx6sabresd/mx6dlsabresd.cfg
+++ b/board/freescale/mx6sabresd/mx6dlsabresd.cfg
@@ -28,6 +28,10 @@ BOOT_FROM    sd
 PLUGIN board/freescale/mx6sabresd/plugin.bin 0x00907000
 #else
 
+#ifdef CONFIG_SECURE_BOOT
+CSF CONFIG_CSF_SIZE
+#endif
+
 /*
  * Device Configuration Data (DCD)
  *

diff --git a/board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg b/board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg
index 53014e1..dc3cc2e 100644 (file)
--- a/board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg
+++ b/board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg
@@ -27,6 +27,10 @@ BOOT_FROM      sd
 PLUGIN board/freescale/mx6sabresd/plugin.bin 0x00907000
 #else
 
+#ifdef CONFIG_SECURE_BOOT
+CSF CONFIG_CSF_SIZE
+#endif
+
 /*
  * Device Configuration Data (DCD)
  *

diff --git a/board/freescale/mx6sabresd/mx6qp.cfg b/board/freescale/mx6sabresd/mx6qp.cfg
index e50f194..e97863d 100644 (file)
--- a/board/freescale/mx6sabresd/mx6qp.cfg
+++ b/board/freescale/mx6sabresd/mx6qp.cfg
@@ -25,6 +25,10 @@ BOOT_FROM      sd
 PLUGIN board/freescale/mx6sabresd/plugin.bin 0x00907000
 #else
 
+#ifdef CONFIG_SECURE_BOOT
+CSF CONFIG_CSF_SIZE
+#endif
+
 /*
  * Device Configuration Data (DCD)
  *

diff --git a/board/freescale/mx6sabresd/mx6solo_4x_mt41j128.cfg b/board/freescale/mx6sabresd/mx6solo_4x_mt41j128.cfg
index b792225..6e6539f 100644 (file)
--- a/board/freescale/mx6sabresd/mx6solo_4x_mt41j128.cfg
+++ b/board/freescale/mx6sabresd/mx6solo_4x_mt41j128.cfg
@@ -27,6 +27,10 @@ BOOT_FROM      sd
 PLUGIN board/freescale/mx6sabresd/plugin.bin 0x00907000
 #else
 
+#ifdef CONFIG_SECURE_BOOT
+CSF CONFIG_CSF_SIZE
+#endif
+
 /*
  * Device Configuration Data (DCD)
  *

diff --git a/board/freescale/mx6slevk/imximage.cfg b/board/freescale/mx6slevk/imximage.cfg
index a8c940e..c6492b9 100644 (file)
--- a/board/freescale/mx6slevk/imximage.cfg
+++ b/board/freescale/mx6slevk/imximage.cfg
@@ -28,6 +28,10 @@ BOOT_FROM    sd
 PLUGIN  board/freescale/mx6slevk/plugin.bin 0x00907000
 #else
 
+#ifdef CONFIG_SECURE_BOOT
+CSF CONFIG_CSF_SIZE
+#endif
+
 /*
  * Device Configuration Data (DCD)
  *

diff --git a/board/freescale/mx6sxsabreauto/imximage.cfg b/board/freescale/mx6sxsabreauto/imximage.cfg
index 2c65d54..f13ebf9 100644 (file)
--- a/board/freescale/mx6sxsabreauto/imximage.cfg
+++ b/board/freescale/mx6sxsabreauto/imximage.cfg
@@ -23,6 +23,10 @@ BOOT_FROM    sd
 PLUGIN  board/freescale/mx6sxsabreauto/plugin.bin 0x00907000
 #else
 
+#ifdef CONFIG_SECURE_BOOT
+CSF CONFIG_CSF_SIZE
+#endif
+
 /*
  * Device Configuration Data (DCD)
  *

diff --git a/board/freescale/mx6sxsabresd/imximage.cfg b/board/freescale/mx6sxsabresd/imximage.cfg
index 7a94399..11f790b 100644 (file)
--- a/board/freescale/mx6sxsabresd/imximage.cfg
+++ b/board/freescale/mx6sxsabresd/imximage.cfg
@@ -23,6 +23,10 @@ BOOT_FROM    sd
 PLUGIN  board/freescale/mx6sxsabresd/plugin.bin 0x00907000
 #else
 
+#ifdef CONFIG_SECURE_BOOT
+CSF CONFIG_CSF_SIZE
+#endif
+
 /*
  * Device Configuration Data (DCD)
  *

diff --git a/board/freescale/mx6ul_14x14_evk/imximage.cfg b/board/freescale/mx6ul_14x14_evk/imximage.cfg
index c311593..07406d4 100644 (file)
--- a/board/freescale/mx6ul_14x14_evk/imximage.cfg
+++ b/board/freescale/mx6ul_14x14_evk/imximage.cfg
@@ -27,6 +27,10 @@ BOOT_FROM    sd
 PLUGIN board/freescale/mx6ul_14x14_evk/plugin.bin 0x00907000
 #else
 
+#ifdef CONFIG_SECURE_BOOT
+CSF CONFIG_CSF_SIZE
+#endif
+
 /*
  * Device Configuration Data (DCD)
  *

diff --git a/board/freescale/mx6ul_14x14_evk/imximage_lpddr2.cfg b/board/freescale/mx6ul_14x14_evk/imximage_lpddr2.cfg
index a6486b1..b76ba54 100644 (file)
--- a/board/freescale/mx6ul_14x14_evk/imximage_lpddr2.cfg
+++ b/board/freescale/mx6ul_14x14_evk/imximage_lpddr2.cfg
@@ -27,6 +27,10 @@ BOOT_FROM    sd
 PLUGIN board/freescale/mx6ul_14x14_evk/plugin.bin 0x00907000
 #else
 
+#ifdef CONFIG_SECURE_BOOT
+CSF CONFIG_CSF_SIZE
+#endif
+
 /*
  * Device Configuration Data (DCD)
  *

diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
index f62a7df..ccc7c2c 100644 (file)
--- a/include/configs/mx6_common.h
+++ b/include/configs/mx6_common.h
@@ -100,6 +100,9 @@ defined(CONFIG_MX6DL)) && !defined(CONFIG_MX6S)
 #define CONFIG_CMD_FUSE
 #define CONFIG_MXC_OCOTP
 
+/* uncomment for SECURE mode support */
+/* #define CONFIG_SECURE_BOOT */
+
 /* Secure boot (HAB) support */
 #ifdef CONFIG_SECURE_BOOT
 #define CONFIG_CSF_SIZE                        0x2000

diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index b10b7f1..26894cb 100644 (file)
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -65,6 +65,9 @@
 
 #define CONFIG_ARMV7_SECURE_BASE       0x00900000
 
+/* uncomment for SECURE mode support */
+/* #define CONFIG_SECURE_BOOT */
+
 /* Secure boot (HAB) support */
 #ifdef CONFIG_SECURE_BOOT
 #define CONFIG_CSF_SIZE                        0x2000