Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 7e90f28d8a5f82765d87ab8145088aa2d4536606

Authored by Luo Ji
1 parent 15c140cfb9
Exists in smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga and in 5 other branches smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga

MA-12221 [Android] caam: fix build break for imx6/7 

config 'CONFIG_FSL_CAAM_KB' was added to Kconfig and would
be selected for imx6/imx7/imx8m(if has caam), remove the
defination in header file to fix redefination errors.

Test: build pass for imx6dq, imx6sx, imx6sl and imx7ulp.

Change-Id: I5ccf1e9747613b66f20eacf15f126a80054b3441
Signed-off-by: Luo Ji <ji.luo@nxp.com>

Showing 14 changed files with 0 additions and 15 deletions Side-by-side Diff

include/configs/multa-imx7d_androidthings.h
Diff comments   View file @ 7e90f28
... ... @@ -27,7 +27,6 @@
27 27 #define CONFIG_ANDROID_AB_SUPPORT
28 28 #define FASTBOOT_ENCRYPT_LOCK
29 29  
30   -#define CONFIG_FSL_CAAM_KB
31 30 #define CONFIG_SHA1
32 31 #define CONFIG_SHA256
33 32  
include/configs/mx6qarm2_android.h
Diff comments   View file @ 7e90f28
... ... @@ -38,7 +38,6 @@
38 38 #define FSL_FASTBOOT_FB_PART_NUM 11
39 39 #define FSL_FASTBOOT_PR_DATA_PART_NUM 12
40 40  
41   -#define CONFIG_FSL_CAAM_KB
42 41 #define CONFIG_CMD_FSL_CAAM_KB
43 42 #define CONFIG_SHA1
44 43 #define CONFIG_SHA256
include/configs/mx6sabreandroid_common.h
Diff comments   View file @ 7e90f28
... ... @@ -14,7 +14,6 @@
14 14 #define CONFIG_FASTBOOT_LOCK
15 15 #define FSL_FASTBOOT_FB_DEV "mmc"
16 16 #define FASTBOOT_ENCRYPT_LOCK
17   -#define CONFIG_FSL_CAAM_KB
18 17 #define CONFIG_CMD_FSL_CAAM_KB
19 18 #define CONFIG_SHA1
20 19 #define CONFIG_SHA256
include/configs/mx6sxsabreautoandroid.h
Diff comments   View file @ 7e90f28
... ... @@ -15,7 +15,6 @@
15 15 #define CONFIG_FASTBOOT_LOCK
16 16 #define FSL_FASTBOOT_FB_DEV "mmc"
17 17 #define FASTBOOT_ENCRYPT_LOCK
18   -#define CONFIG_FSL_CAAM_KB
19 18 #define CONFIG_CMD_FSL_CAAM_KB
20 19 #define CONFIG_SHA1
21 20 #define CONFIG_SHA256
include/configs/mx6sxsabresdandroid.h
Diff comments   View file @ 7e90f28
... ... @@ -17,7 +17,6 @@
17 17 #define CONFIG_FASTBOOT_LOCK
18 18 #define FSL_FASTBOOT_FB_DEV "mmc"
19 19 #define FASTBOOT_ENCRYPT_LOCK
20   -#define CONFIG_FSL_CAAM_KB
21 20 #define CONFIG_CMD_FSL_CAAM_KB
22 21 #define CONFIG_SHA1
23 22 #define CONFIG_SHA256
include/configs/mx6ul_14x14_evkandroidthings.h
Diff comments   View file @ 7e90f28
... ... @@ -15,7 +15,6 @@
15 15 #endif
16 16  
17 17 #define CONFIG_ANDROID_BOOT_IMAGE
18   -#define CONFIG_FSL_CAAM_KB
19 18 #define CONFIG_CMD_FSL_CAAM_KB
20 19 #define CONFIG_SHA1
21 20 #define CONFIG_SHA256
include/configs/mx6ul_nxpu_iopb_android_things.h
Diff comments   View file @ 7e90f28
... ... @@ -38,7 +38,6 @@
38 38  
39 39 #define CONFIG_ANDROID_AB_SUPPORT
40 40 #define CONFIG_SYSTEM_RAMDISK_SUPPORT
41   -#define CONFIG_FSL_CAAM_KB
42 41 #define CONFIG_CMD_FSL_CAAM_KB
43 42 #define CONFIG_SHA1
44 43 #define CONFIG_SHA256
include/configs/mx6ul_spriot_android_things.h
Diff comments   View file @ 7e90f28
... ... @@ -28,7 +28,6 @@
28 28 #endif
29 29  
30 30 #define CONFIG_ANDROID_AB_SUPPORT
31   -#define CONFIG_FSL_CAAM_KB
32 31 #define CONFIG_CMD_FSL_CAAM_KB
33 32 #define CONFIG_SHA1
34 33 #define CONFIG_SHA256
include/configs/mx7dsabresd_androidthings.h
Diff comments   View file @ 7e90f28
... ... @@ -19,7 +19,6 @@
19 19 #define CONFIG_ANDROID_AB_SUPPORT
20 20 #define FASTBOOT_ENCRYPT_LOCK
21 21  
22   -#define CONFIG_FSL_CAAM_KB
23 22 #define CONFIG_SHA1
24 23 #define CONFIG_SHA256
25 24  
include/configs/mx7dsabresdandroid.h
Diff comments   View file @ 7e90f28
... ... @@ -15,7 +15,6 @@
15 15 #define FASTBOOT_ENCRYPT_LOCK
16 16 #define CONFIG_FASTBOOT_LOCK
17 17 #define FSL_FASTBOOT_FB_DEV "mmc"
18   -#define CONFIG_FSL_CAAM_KB
19 18 #define CONFIG_SHA1
20 19  
21 20 #define CONFIG_AVB_SUPPORT
include/configs/pico-imx6dl_android_things.h
Diff comments   View file @ 7e90f28
... ... @@ -16,7 +16,6 @@
16 16 #endif
17 17  
18 18 #define CONFIG_ANDROID_AB_SUPPORT
19   -#define CONFIG_FSL_CAAM_KB
20 19 #define CONFIG_CMD_FSL_CAAM_KB
21 20 #define CONFIG_SHA1
22 21 #define CONFIG_SHA256
include/configs/pico-imx7dandroidthings.h
Diff comments   View file @ 7e90f28
... ... @@ -39,7 +39,6 @@
39 39  
40 40 #define CONFIG_ANDROID_AB_SUPPORT
41 41  
42   -#define CONFIG_FSL_CAAM_KB
43 42 #define CONFIG_SHA1
44 43 #define CONFIG_SHA256
45 44  
include/configs/picosom-imx6ul_android_things.h
Diff comments   View file @ 7e90f28
... ... @@ -36,8 +36,6 @@
36 36 #endif
37 37  
38 38 #define CONFIG_ANDROID_AB_SUPPORT
39   -#define CONFIG_FSL_CAAM_KB
40   -#define CONFIG_CMD_FSL_CAAM_KB
41 39 #define CONFIG_SHA1
42 40 #define CONFIG_SHA256
43 41  
scripts/config_whitelist.txt
Diff comments   View file @ 7e90f28
... ... @@ -666,7 +666,6 @@
666 666 CONFIG_FPGA_DELAY
667 667 CONFIG_FPGA_STRATIX_V
668 668 CONFIG_FSLDMAFEC
669   -CONFIG_FSL_CAAM_KB
670 669 CONFIG_FSL_CADMUS
671 670 CONFIG_FSL_CORENET
672 671 CONFIG_FSL_CPLD