diff options
26 files changed, 42 insertions, 26 deletions
diff --git a/arch/blackfin/configs/BF518F-EZBRD_defconfig b/arch/blackfin/configs/BF518F-EZBRD_defconfig index 46fac1bf0605..c0b988ee30df 100644 --- a/arch/blackfin/configs/BF518F-EZBRD_defconfig +++ b/arch/blackfin/configs/BF518F-EZBRD_defconfig | |||
| @@ -35,6 +35,7 @@ CONFIG_C_CDPRIO=y | |||
| 35 | CONFIG_BANK_3=0x99B2 | 35 | CONFIG_BANK_3=0x99B2 |
| 36 | CONFIG_BINFMT_FLAT=y | 36 | CONFIG_BINFMT_FLAT=y |
| 37 | CONFIG_BINFMT_ZFLAT=y | 37 | CONFIG_BINFMT_ZFLAT=y |
| 38 | CONFIG_PM=y | ||
| 38 | CONFIG_NET=y | 39 | CONFIG_NET=y |
| 39 | CONFIG_PACKET=y | 40 | CONFIG_PACKET=y |
| 40 | CONFIG_UNIX=y | 41 | CONFIG_UNIX=y |
| @@ -114,7 +115,6 @@ CONFIG_DEBUG_DOUBLEFAULT=y | |||
| 114 | CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y | 115 | CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y |
| 115 | CONFIG_EARLY_PRINTK=y | 116 | CONFIG_EARLY_PRINTK=y |
| 116 | CONFIG_CPLB_INFO=y | 117 | CONFIG_CPLB_INFO=y |
| 117 | CONFIG_SECURITY=y | ||
| 118 | CONFIG_CRYPTO=y | 118 | CONFIG_CRYPTO=y |
| 119 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 119 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 120 | CONFIG_CRC_CCITT=m | 120 | CONFIG_CRC_CCITT=m |
diff --git a/arch/blackfin/configs/BF526-EZBRD_defconfig b/arch/blackfin/configs/BF526-EZBRD_defconfig index 80240806cf9e..864af5b68874 100644 --- a/arch/blackfin/configs/BF526-EZBRD_defconfig +++ b/arch/blackfin/configs/BF526-EZBRD_defconfig | |||
| @@ -40,6 +40,7 @@ CONFIG_C_CDPRIO=y | |||
| 40 | CONFIG_BANK_3=0x99B2 | 40 | CONFIG_BANK_3=0x99B2 |
| 41 | CONFIG_BINFMT_FLAT=y | 41 | CONFIG_BINFMT_FLAT=y |
| 42 | CONFIG_BINFMT_ZFLAT=y | 42 | CONFIG_BINFMT_ZFLAT=y |
| 43 | CONFIG_PM=y | ||
| 43 | CONFIG_NET=y | 44 | CONFIG_NET=y |
| 44 | CONFIG_PACKET=y | 45 | CONFIG_PACKET=y |
| 45 | CONFIG_UNIX=y | 46 | CONFIG_UNIX=y |
| @@ -152,7 +153,6 @@ CONFIG_DEBUG_DOUBLEFAULT=y | |||
| 152 | CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y | 153 | CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y |
| 153 | CONFIG_EARLY_PRINTK=y | 154 | CONFIG_EARLY_PRINTK=y |
| 154 | CONFIG_CPLB_INFO=y | 155 | CONFIG_CPLB_INFO=y |
| 155 | CONFIG_SECURITY=y | ||
| 156 | CONFIG_CRYPTO=y | 156 | CONFIG_CRYPTO=y |
| 157 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 157 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 158 | CONFIG_CRC_CCITT=m | 158 | CONFIG_CRC_CCITT=m |
diff --git a/arch/blackfin/configs/BF527-AD7160-EVAL_defconfig b/arch/blackfin/configs/BF527-AD7160-EVAL_defconfig index 08c55f6b8b7a..7b6a3370dbe2 100644 --- a/arch/blackfin/configs/BF527-AD7160-EVAL_defconfig +++ b/arch/blackfin/configs/BF527-AD7160-EVAL_defconfig | |||
| @@ -9,6 +9,7 @@ CONFIG_EMBEDDED=y | |||
| 9 | # CONFIG_ELF_CORE is not set | 9 | # CONFIG_ELF_CORE is not set |
| 10 | # CONFIG_AIO is not set | 10 | # CONFIG_AIO is not set |
| 11 | CONFIG_SLAB=y | 11 | CONFIG_SLAB=y |
| 12 | CONFIG_MMAP_ALLOW_UNINITIALIZED=y | ||
| 12 | CONFIG_MODULES=y | 13 | CONFIG_MODULES=y |
| 13 | CONFIG_MODULE_UNLOAD=y | 14 | CONFIG_MODULE_UNLOAD=y |
| 14 | # CONFIG_BLK_DEV_BSG is not set | 15 | # CONFIG_BLK_DEV_BSG is not set |
| @@ -101,5 +102,4 @@ CONFIG_DETECT_HUNG_TASK=y | |||
| 101 | # CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set | 102 | # CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set |
| 102 | CONFIG_EARLY_PRINTK=y | 103 | CONFIG_EARLY_PRINTK=y |
| 103 | CONFIG_CPLB_INFO=y | 104 | CONFIG_CPLB_INFO=y |
| 104 | CONFIG_SECURITY=y | ||
| 105 | CONFIG_CRC_CCITT=m | 105 | CONFIG_CRC_CCITT=m |
diff --git a/arch/blackfin/configs/BF527-EZKIT-V2_defconfig b/arch/blackfin/configs/BF527-EZKIT-V2_defconfig index 4a9125558fcf..4faa6b46a352 100644 --- a/arch/blackfin/configs/BF527-EZKIT-V2_defconfig +++ b/arch/blackfin/configs/BF527-EZKIT-V2_defconfig | |||
| @@ -20,6 +20,7 @@ CONFIG_MODULE_UNLOAD=y | |||
| 20 | # CONFIG_LBDAF is not set | 20 | # CONFIG_LBDAF is not set |
| 21 | # CONFIG_BLK_DEV_BSG is not set | 21 | # CONFIG_BLK_DEV_BSG is not set |
| 22 | # CONFIG_IOSCHED_DEADLINE is not set | 22 | # CONFIG_IOSCHED_DEADLINE is not set |
| 23 | # CONFIG_IOSCHED_CFQ is not set | ||
| 23 | CONFIG_PREEMPT_VOLUNTARY=y | 24 | CONFIG_PREEMPT_VOLUNTARY=y |
| 24 | CONFIG_BF527=y | 25 | CONFIG_BF527=y |
| 25 | CONFIG_BF_REV_0_2=y | 26 | CONFIG_BF_REV_0_2=y |
| @@ -38,6 +39,7 @@ CONFIG_C_CDPRIO=y | |||
| 38 | CONFIG_BANK_3=0x99B2 | 39 | CONFIG_BANK_3=0x99B2 |
| 39 | CONFIG_BINFMT_FLAT=y | 40 | CONFIG_BINFMT_FLAT=y |
| 40 | CONFIG_BINFMT_ZFLAT=y | 41 | CONFIG_BINFMT_ZFLAT=y |
| 42 | CONFIG_PM=y | ||
| 41 | CONFIG_NET=y | 43 | CONFIG_NET=y |
| 42 | CONFIG_PACKET=y | 44 | CONFIG_PACKET=y |
| 43 | CONFIG_UNIX=y | 45 | CONFIG_UNIX=y |
| @@ -181,6 +183,5 @@ CONFIG_DEBUG_DOUBLEFAULT=y | |||
| 181 | CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y | 183 | CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y |
| 182 | CONFIG_EARLY_PRINTK=y | 184 | CONFIG_EARLY_PRINTK=y |
| 183 | CONFIG_CPLB_INFO=y | 185 | CONFIG_CPLB_INFO=y |
| 184 | CONFIG_SECURITY=y | ||
| 185 | CONFIG_CRYPTO=y | 186 | CONFIG_CRYPTO=y |
| 186 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 187 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
diff --git a/arch/blackfin/configs/BF527-EZKIT_defconfig b/arch/blackfin/configs/BF527-EZKIT_defconfig index 8ccf3cec7534..9d893eb68243 100644 --- a/arch/blackfin/configs/BF527-EZKIT_defconfig +++ b/arch/blackfin/configs/BF527-EZKIT_defconfig | |||
| @@ -20,6 +20,7 @@ CONFIG_MODULE_UNLOAD=y | |||
| 20 | # CONFIG_LBDAF is not set | 20 | # CONFIG_LBDAF is not set |
| 21 | # CONFIG_BLK_DEV_BSG is not set | 21 | # CONFIG_BLK_DEV_BSG is not set |
| 22 | # CONFIG_IOSCHED_DEADLINE is not set | 22 | # CONFIG_IOSCHED_DEADLINE is not set |
| 23 | # CONFIG_IOSCHED_CFQ is not set | ||
| 23 | CONFIG_PREEMPT_VOLUNTARY=y | 24 | CONFIG_PREEMPT_VOLUNTARY=y |
| 24 | CONFIG_BF527=y | 25 | CONFIG_BF527=y |
| 25 | CONFIG_BF_REV_0_1=y | 26 | CONFIG_BF_REV_0_1=y |
| @@ -37,6 +38,7 @@ CONFIG_C_CDPRIO=y | |||
| 37 | CONFIG_BANK_3=0x99B2 | 38 | CONFIG_BANK_3=0x99B2 |
| 38 | CONFIG_BINFMT_FLAT=y | 39 | CONFIG_BINFMT_FLAT=y |
| 39 | CONFIG_BINFMT_ZFLAT=y | 40 | CONFIG_BINFMT_ZFLAT=y |
| 41 | CONFIG_PM=y | ||
| 40 | CONFIG_NET=y | 42 | CONFIG_NET=y |
| 41 | CONFIG_PACKET=y | 43 | CONFIG_PACKET=y |
| 42 | CONFIG_UNIX=y | 44 | CONFIG_UNIX=y |
| @@ -173,6 +175,5 @@ CONFIG_DEBUG_DOUBLEFAULT=y | |||
| 173 | CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y | 175 | CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y |
| 174 | CONFIG_EARLY_PRINTK=y | 176 | CONFIG_EARLY_PRINTK=y |
| 175 | CONFIG_CPLB_INFO=y | 177 | CONFIG_CPLB_INFO=y |
| 176 | CONFIG_SECURITY=y | ||
| 177 | CONFIG_CRYPTO=y | 178 | CONFIG_CRYPTO=y |
| 178 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 179 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
diff --git a/arch/blackfin/configs/BF527-TLL6527M_defconfig b/arch/blackfin/configs/BF527-TLL6527M_defconfig index 92ded5edc86c..97a2767c80f8 100644 --- a/arch/blackfin/configs/BF527-TLL6527M_defconfig +++ b/arch/blackfin/configs/BF527-TLL6527M_defconfig | |||
| @@ -174,7 +174,6 @@ CONFIG_DEBUG_DOUBLEFAULT=y | |||
| 174 | CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y | 174 | CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y |
| 175 | CONFIG_EARLY_PRINTK=y | 175 | CONFIG_EARLY_PRINTK=y |
| 176 | CONFIG_CPLB_INFO=y | 176 | CONFIG_CPLB_INFO=y |
| 177 | CONFIG_SECURITY=y | ||
| 178 | CONFIG_CRYPTO=y | 177 | CONFIG_CRYPTO=y |
| 179 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 178 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
| 180 | CONFIG_CRC7=m | 179 | CONFIG_CRC7=m |
diff --git a/arch/blackfin/configs/BF533-EZKIT_defconfig b/arch/blackfin/configs/BF533-EZKIT_defconfig index c40e0f1c7eac..f84774360c5b 100644 --- a/arch/blackfin/configs/BF533-EZKIT_defconfig +++ b/arch/blackfin/configs/BF533-EZKIT_defconfig | |||
| @@ -20,6 +20,7 @@ CONFIG_MODULE_UNLOAD=y | |||
| 20 | # CONFIG_LBDAF is not set | 20 | # CONFIG_LBDAF is not set |
| 21 | # CONFIG_BLK_DEV_BSG is not set | 21 | # CONFIG_BLK_DEV_BSG is not set |
| 22 | # CONFIG_IOSCHED_DEADLINE is not set | ||
