MLK-11059 imx: HAB unable to support Encrypted boot for 4096-bit keys

Abstracted the CSF size in imximage from a hardcoded value to a config
setting CONFIG_CSF_SIZE. This configuration is only enabled for secure
boot.
Increased the size of the CSF default allocation to 0x4000. This size
covers the event the worst case of 4906-bits keys.
(cherry picked from commit 50198ddbb3f8b34f9d4fc881a34dcd1715b1d61d)

24 files changed, 24 insertions, 24 deletions

diff --git a/board/freescale/mx6qarm2/imximage.cfg b/board/freescale/mx6qarm2/imximage.cfg
index 425f24a..1063f29 100644
--- a/board/freescale/mx6qarm2/imximage.cfg
+++ b/board/freescale/mx6qarm2/imximage.cfg
@@ -28,7 +28,7 @@ PLUGIN	board/freescale/mx6qarm2/plugin.bin 0x00907000
 #else
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*
diff --git a/board/freescale/mx6qarm2/imximage_mx6dl.cfg b/board/freescale/mx6qarm2/imximage_mx6dl.cfg
index 8d1b8bd..3f1d6c6 100644
--- a/board/freescale/mx6qarm2/imximage_mx6dl.cfg
+++ b/board/freescale/mx6qarm2/imximage_mx6dl.cfg
@@ -28,7 +28,7 @@ PLUGIN	board/freescale/mx6qarm2/plugin.bin 0x00907000
 #else
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*
diff --git a/board/freescale/mx6qsabreauto/imximage.cfg b/board/freescale/mx6qsabreauto/imximage.cfg
index dacbe80..76b35c3 100644
--- a/board/freescale/mx6qsabreauto/imximage.cfg
+++ b/board/freescale/mx6qsabreauto/imximage.cfg
@@ -36,7 +36,7 @@ PLUGIN	board/freescale/mx6qsabreauto/plugin.bin 0x00907000
 #else
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*
diff --git a/board/freescale/mx6qsabreauto/mx6dl.cfg b/board/freescale/mx6qsabreauto/mx6dl.cfg
index f7f4062..d6ba5b8 100644
--- a/board/freescale/mx6qsabreauto/mx6dl.cfg
+++ b/board/freescale/mx6qsabreauto/mx6dl.cfg
@@ -37,7 +37,7 @@ PLUGIN	board/freescale/mx6qsabreauto/plugin.bin 0x00907000
 #else
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*
diff --git a/board/freescale/mx6qsabreauto/mx6qp.cfg b/board/freescale/mx6qsabreauto/mx6qp.cfg
index 5d55bcc..0fef4b8 100644
--- a/board/freescale/mx6qsabreauto/mx6qp.cfg
+++ b/board/freescale/mx6qsabreauto/mx6qp.cfg
@@ -36,7 +36,7 @@ PLUGIN	board/freescale/mx6qsabreauto/plugin.bin 0x00907000
 #else
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*
diff --git a/board/freescale/mx6qsabreauto/mx6solo.cfg b/board/freescale/mx6qsabreauto/mx6solo.cfg
index 011042b..9c5d17f 100644
--- a/board/freescale/mx6qsabreauto/mx6solo.cfg
+++ b/board/freescale/mx6qsabreauto/mx6solo.cfg
@@ -34,7 +34,7 @@ PLUGIN	board/freescale/mx6qsabreauto/plugin.bin 0x00907000
 #else
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*
diff --git a/board/freescale/mx6sabresd/mx6dlsabresd.cfg b/board/freescale/mx6sabresd/mx6dlsabresd.cfg
index 0f77f7e..89a4648 100644
--- a/board/freescale/mx6sabresd/mx6dlsabresd.cfg
+++ b/board/freescale/mx6sabresd/mx6dlsabresd.cfg
@@ -27,7 +27,7 @@ PLUGIN board/freescale/mx6sabresd/plugin.bin 0x00907000
 #else
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*
diff --git a/board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg b/board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg
index aa897e9..8621ddd 100644
--- a/board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg
+++ b/board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg
@@ -32,7 +32,7 @@ PLUGIN	board/freescale/mx6sabresd/plugin.bin 0x00907000
 #else
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*
diff --git a/board/freescale/mx6sabresd/mx6solo_4x_mt41j128.cfg b/board/freescale/mx6sabresd/mx6solo_4x_mt41j128.cfg
index 6526db4..0b30251 100644
--- a/board/freescale/mx6sabresd/mx6solo_4x_mt41j128.cfg
+++ b/board/freescale/mx6sabresd/mx6solo_4x_mt41j128.cfg
@@ -33,7 +33,7 @@ PLUGIN board/freescale/mx6sabresd/plugin.bin 0x00907000
 #else
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*
diff --git a/board/freescale/mx6slevk/imximage.cfg b/board/freescale/mx6slevk/imximage.cfg
index 2dc5976..16576da 100644
--- a/board/freescale/mx6slevk/imximage.cfg
+++ b/board/freescale/mx6slevk/imximage.cfg
@@ -29,7 +29,7 @@ PLUGIN	board/freescale/mx6slevk/plugin.bin 0x00907000
 #else
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*
diff --git a/board/freescale/mx6sx_17x17_arm2/imximage.cfg b/board/freescale/mx6sx_17x17_arm2/imximage.cfg
index f98acb0..dbfe254 100644
--- a/board/freescale/mx6sx_17x17_arm2/imximage.cfg
+++ b/board/freescale/mx6sx_17x17_arm2/imximage.cfg
@@ -35,7 +35,7 @@ PLUGIN	board/freescale/mx6sx_17x17_arm2/plugin.bin 0x00907000
 #else
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*
diff --git a/board/freescale/mx6sx_17x17_arm2/imximage_wp.cfg b/board/freescale/mx6sx_17x17_arm2/imximage_wp.cfg
index fb7ba4f..1aa8966 100644
--- a/board/freescale/mx6sx_17x17_arm2/imximage_wp.cfg
+++ b/board/freescale/mx6sx_17x17_arm2/imximage_wp.cfg
@@ -30,7 +30,7 @@ BOOT_FROM	sd
 #endif
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*
diff --git a/board/freescale/mx6sx_17x17_arm2/mx6sx_14x14_lpddr2_arm2.cfg b/board/freescale/mx6sx_17x17_arm2/mx6sx_14x14_lpddr2_arm2.cfg
index e7379b0..afb780e 100644
--- a/board/freescale/mx6sx_17x17_arm2/mx6sx_14x14_lpddr2_arm2.cfg
+++ b/board/freescale/mx6sx_17x17_arm2/mx6sx_14x14_lpddr2_arm2.cfg
@@ -35,7 +35,7 @@ PLUGIN	board/freescale/mx6sx_17x17_arm2/plugin.bin 0x00907000
 #else
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*
diff --git a/board/freescale/mx6sx_19x19_arm2/imximage.cfg b/board/freescale/mx6sx_19x19_arm2/imximage.cfg
index 475127c..6707b73 100644
--- a/board/freescale/mx6sx_19x19_arm2/imximage.cfg
+++ b/board/freescale/mx6sx_19x19_arm2/imximage.cfg
@@ -35,7 +35,7 @@ PLUGIN	board/freescale/mx6sx_19x19_arm2/plugin.bin 0x00907000
 #else
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*
diff --git a/board/freescale/mx6sx_19x19_arm2/imximage_lpddr2.cfg b/board/freescale/mx6sx_19x19_arm2/imximage_lpddr2.cfg
index c8ab483..5488d22 100644
--- a/board/freescale/mx6sx_19x19_arm2/imximage_lpddr2.cfg
+++ b/board/freescale/mx6sx_19x19_arm2/imximage_lpddr2.cfg
@@ -35,7 +35,7 @@ PLUGIN	board/freescale/mx6sx_19x19_arm2/plugin.bin 0x00907000
 #else
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*
diff --git a/board/freescale/mx6sxsabreauto/imximage.cfg b/board/freescale/mx6sxsabreauto/imximage.cfg
index d431a2d..542cc7a 100644
--- a/board/freescale/mx6sxsabreauto/imximage.cfg
+++ b/board/freescale/mx6sxsabreauto/imximage.cfg
@@ -35,7 +35,7 @@ PLUGIN	board/freescale/mx6sxsabreauto/plugin.bin 0x00907000
 #else
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*
diff --git a/board/freescale/mx6sxsabresd/imximage.cfg b/board/freescale/mx6sxsabresd/imximage.cfg
index de48fcf..0b745b7 100644
--- a/board/freescale/mx6sxsabresd/imximage.cfg
+++ b/board/freescale/mx6sxsabresd/imximage.cfg
@@ -28,7 +28,7 @@ PLUGIN	board/freescale/mx6sxsabresd/plugin.bin 0x00907000
 #else
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*
diff --git a/board/freescale/mx6ul_14x14_ddr3_arm2/imximage.cfg b/board/freescale/mx6ul_14x14_ddr3_arm2/imximage.cfg
index 2272c86..100ce00 100644
--- a/board/freescale/mx6ul_14x14_ddr3_arm2/imximage.cfg
+++ b/board/freescale/mx6ul_14x14_ddr3_arm2/imximage.cfg
@@ -35,7 +35,7 @@ PLUGIN	board/freescale/mx6ul_14x14_ddr3_arm2/plugin.bin 0x00907000
 #else
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*
diff --git a/board/freescale/mx6ul_14x14_evk/imximage.cfg b/board/freescale/mx6ul_14x14_evk/imximage.cfg
index 53088d8..1164fdd 100644
--- a/board/freescale/mx6ul_14x14_evk/imximage.cfg
+++ b/board/freescale/mx6ul_14x14_evk/imximage.cfg
@@ -35,7 +35,7 @@ PLUGIN	board/freescale/mx6ul_14x14_evk/plugin.bin 0x00907000
 #else
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*
diff --git a/board/freescale/mx7d_12x12_ddr3_arm2/imximage.cfg b/board/freescale/mx7d_12x12_ddr3_arm2/imximage.cfg
index 619944c..ad7df84 100644
--- a/board/freescale/mx7d_12x12_ddr3_arm2/imximage.cfg
+++ b/board/freescale/mx7d_12x12_ddr3_arm2/imximage.cfg
@@ -33,7 +33,7 @@ PLUGIN	board/freescale/mx7d_12x12_ddr3_arm2/plugin.bin 0x00910000
 #else
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*
diff --git a/board/freescale/mx7d_12x12_lpddr3_arm2/imximage.cfg b/board/freescale/mx7d_12x12_lpddr3_arm2/imximage.cfg
index 47b2def..9f8d9eb 100644
--- a/board/freescale/mx7d_12x12_lpddr3_arm2/imximage.cfg
+++ b/board/freescale/mx7d_12x12_lpddr3_arm2/imximage.cfg
@@ -35,7 +35,7 @@ PLUGIN	board/freescale/mx7d_12x12_lpddr3_arm2/plugin.bin 0x00910000
 #else
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*
diff --git a/board/freescale/mx7d_19x19_ddr3_arm2/imximage.cfg b/board/freescale/mx7d_19x19_ddr3_arm2/imximage.cfg
index b8970d7..bb5cf95 100644
--- a/board/freescale/mx7d_19x19_ddr3_arm2/imximage.cfg
+++ b/board/freescale/mx7d_19x19_ddr3_arm2/imximage.cfg
@@ -35,7 +35,7 @@ PLUGIN	board/freescale/mx7d_19x19_ddr3_arm2/plugin.bin 0x00910000
 #else
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*
diff --git a/board/freescale/mx7d_19x19_lpddr3_arm2/imximage.cfg b/board/freescale/mx7d_19x19_lpddr3_arm2/imximage.cfg
index 737bf9a..ea8b446 100644
--- a/board/freescale/mx7d_19x19_lpddr3_arm2/imximage.cfg
+++ b/board/freescale/mx7d_19x19_lpddr3_arm2/imximage.cfg
@@ -35,7 +35,7 @@ PLUGIN	board/freescale/mx7d_19x19_lpddr3_arm2/plugin.bin 0x00910000
 #else
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*
diff --git a/board/freescale/mx7dsabresd/imximage.cfg b/board/freescale/mx7dsabresd/imximage.cfg
index 700e2a0..9b23949 100644
--- a/board/freescale/mx7dsabresd/imximage.cfg
+++ b/board/freescale/mx7dsabresd/imximage.cfg
@@ -35,7 +35,7 @@ PLUGIN	board/freescale/mx7dsabresd/plugin.bin 0x00910000
 #else
 
 #ifdef CONFIG_SECURE_BOOT
-CSF 0x2000
+CSF CONFIG_CSF_SIZE
 #endif
 
 /*