diff options
| author | guoyin.chen <guoyin.chen@freescale.com> | 2013-06-06 17:55:22 +0800 |
|---|---|---|
| committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-06-06 17:55:22 +0800 |
| commit | 41f0553746777fe3d1bf7ad77678db2eb0ffa3e9 (patch) | |
| tree | 7bb60193b76ca2d6ddbe3d7296cd3a84b959e7a0 | |
| parent | b2ad1bd5c728cfd33294f3d3e5e0c8c22848e2c1 (diff) | |
ENGR00265226 It cannot complete the Data partition encryption process
Make caam module disabled as default to align with sabresd
Data encryption is using 28 AES with CBC and ESSIV:SHA256
Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabreauto.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_sabreauto.c b/arch/arm/mach-mx6/board-mx6q_sabreauto.c index 6161d0b7f6df..17220110489e 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabreauto.c +++ b/arch/arm/mach-mx6/board-mx6q_sabreauto.c @@ -153,6 +153,7 @@ static int uart3_en; static int tuner_en; static int spinor_en; static int weimnor_en; +static int caam_enabled; static int __init spinor_enable(char *p) { @@ -1460,6 +1461,13 @@ static void __init fixup_mxc_board(struct machine_desc *desc, struct tag *tags, } } +static int __init caam_setup(char *__unused) +{ + caam_enabled = 1; + return 1; +} +early_param("caam", caam_setup); + static int __init early_enable_mipi_sensor(char *p) { mipi_sensor = 1; @@ -1704,7 +1712,8 @@ static void __init mx6_board_init(void) imx6q_add_imx_snvs_rtc(); - imx6q_add_imx_caam(); + if (1 == caam_enabled) + imx6q_add_imx_caam(); imx6q_add_imx_i2c(1, &mx6q_sabreauto_i2c1_data); i2c_register_board_info(1, mxc_i2c1_board_info, |