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.

24 files changed, 24 insertions, 24 deletions

diff --git a/board/freescale/mx6qarm2/imximage.cfg b/board/freescale/mx6qarm2/imximage.cfg
index 425f24a5c94..1063f298770 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 8d1b8bd3aa6..3f1d6c65a4e 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 dacbe80c5e0..76b35c3f1e6 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 f7f40620d7f..d6ba5b80ee2 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 5d55bccdc5d..0fef4b8bcae 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 011042b4a5c..9c5d17f7c57 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 0f77f7e7fe6..89a46481aac 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 aa897e947d2..8621dddd35a 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 6526db46a28..0b302511edf 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 2dc59760b60..16576dadebe 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 f98acb09078..dbfe2543186 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 fb7ba4f6a0e..1aa89662041 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 e7379b046b1..afb780e79b7 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 475127cacaa..6707b7335c7 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 c8ab4839e5b..5488d220a53 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 d431a2d01c9..542cc7a8287 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 de48fcff87a..0b745b727a0 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 2272c8683ce..100ce006689 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 53088d8e94f..1164fdd25d9 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 619944c1db9..ad7df841b1b 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 47b2defbef0..9f8d9eb619c 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 b8970d75cf1..bb5cf955b7b 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 737bf9ad680..ea8b446322c 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 700e2a0b70f..9b239494863 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
 
 /*