From 2398e5ff576c6f0de86856f4b116315d0b34556b Mon Sep 17 00:00:00 2001 From: Ye Li Date: Wed, 16 Mar 2016 14:39:06 +0800 Subject: 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 (cherry picked from commit 01cc7d9bc205251c13712418d51f3a4d7b20861b) --- board/freescale/mx6qarm2/imximage_mx6dl.cfg | 4 ++++ board/freescale/mx6qsabreauto/imximage.cfg | 4 ++++ board/freescale/mx6qsabreauto/mx6dl.cfg | 4 ++++ board/freescale/mx6qsabreauto/mx6qp.cfg | 4 ++++ board/freescale/mx6qsabreauto/mx6solo.cfg | 4 ++++ board/freescale/mx6sabresd/mx6dlsabresd.cfg | 4 ++++ board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg | 4 ++++ board/freescale/mx6sabresd/mx6qp.cfg | 4 ++++ board/freescale/mx6sabresd/mx6solo_4x_mt41j128.cfg | 4 ++++ board/freescale/mx6slevk/imximage.cfg | 4 ++++ board/freescale/mx6sxsabreauto/imximage.cfg | 4 ++++ board/freescale/mx6sxsabresd/imximage.cfg | 4 ++++ board/freescale/mx6ul_14x14_evk/imximage.cfg | 4 ++++ board/freescale/mx6ul_14x14_evk/imximage_lpddr2.cfg | 4 ++++ 14 files changed, 56 insertions(+) (limited to 'board') diff --git a/board/freescale/mx6qarm2/imximage_mx6dl.cfg b/board/freescale/mx6qarm2/imximage_mx6dl.cfg index b7769fe..e94918c 100644 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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) * -- cgit v1.1