Skip to content

Commit fc0ac05

Browse files
dastin1015dastin1015
committed
defconfig: update defconfigs
1 parent 22e9c31 commit fc0ac05

2 files changed

Lines changed: 27 additions & 11 deletions

File tree

‎arch/arm/configs/shooter_defconfig‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated make config: don't edit
3-
# Linux/arm 3.0.53 Kernel Configuration
3+
# Linux/arm 3.0.60 Kernel Configuration
44
#
55
CONFIG_ARM=y
66
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -98,6 +98,9 @@ CONFIG_RD_GZIP=y
9898
# CONFIG_RD_XZ is not set
9999
# CONFIG_RD_LZO is not set
100100
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
101+
# CONFIG_CC_OPTIMIZE_DEFAULT is not set
102+
# CONFIG_CC_OPTIMIZE_ALOT is not set
103+
# CONFIG_CC_OPTIMIZE_FAST is not set
101104
CONFIG_SYSCTL=y
102105
CONFIG_ANON_INODES=y
103106
CONFIG_PANIC_TIMEOUT=5
@@ -288,8 +291,6 @@ CONFIG_MSM_XO=y
288291
CONFIG_MSM_REMOTE_SPINLOCK_LDREX=y
289292
CONFIG_MSM_ADM3=y
290293
# CONFIG_PERFLOCK is not set
291-
# CONFIG_PERFLOCK_BOOT_LOCK is not set
292-
# CONFIG_PERFLOCK_SCREEN_POLICY is not set
293294

294295
#
295296
# MSM Board Selection
@@ -313,6 +314,7 @@ CONFIG_MACH_SHOOTER=y
313314
# CONFIG_MACH_VERDI_LTE is not set
314315
# CONFIG_MACH_HOLIDAY is not set
315316
# CONFIG_MACH_VIGOR is not set
317+
# CONFIG_MACH_DOUBLESHOT is not set
316318
# CONFIG_MACH_RUBY is not set
317319
# CONFIG_MSM_USE_TSIF1 is not set
318320
CONFIG_MSM_MDP40=y
@@ -1044,6 +1046,7 @@ CONFIG_BT_HCIUART_H4=y
10441046
# CONFIG_BT_HCIVHCI is not set
10451047
# CONFIG_BT_MRVL is not set
10461048
# CONFIG_MSM_BT_POWER is not set
1049+
# CONFIG_BT_HID_BRCM is not set
10471050
# CONFIG_AF_RXRPC is not set
10481051
CONFIG_FIB_RULES=y
10491052
CONFIG_WIRELESS=y
@@ -1398,6 +1401,7 @@ CONFIG_PMIC8058_OTHC=y
13981401
# CONFIG_BOSCH_BMA150 is not set
13991402
# CONFIG_INPUT_DUMMY_KEYPAD is not set
14001403
# CONFIG_POWER_KEY_LED is not set
1404+
# CONFIG_INPUT_OPTICALJOYSTICK is not set
14011405

14021406
#
14031407
# Hardware I/O ports
@@ -1863,6 +1867,7 @@ CONFIG_CAMERA_3D=y
18631867
# Camera Sensor Selection
18641868
#
18651869
# CONFIG_MT9D113 is not set
1870+
# CONFIG_IMX105 is not set
18661871
# CONFIG_IMX074 is not set
18671872
# CONFIG_WEBCAM_OV7692 is not set
18681873
# CONFIG_WEBCAM_OV9726 is not set
@@ -2657,6 +2662,7 @@ CONFIG_NLS_ISO8859_1=y
26572662
# CONFIG_NLS_KOI8_R is not set
26582663
# CONFIG_NLS_KOI8_U is not set
26592664
# CONFIG_NLS_UTF8 is not set
2665+
CONFIG_DYNAMIC_FSYNC=y
26602666

26612667
#
26622668
# Kernel hacking
@@ -2811,6 +2817,7 @@ CONFIG_CRYPTO_MD5=y
28112817
# CONFIG_CRYPTO_RMD256 is not set
28122818
# CONFIG_CRYPTO_RMD320 is not set
28132819
CONFIG_CRYPTO_SHA1=y
2820+
# CONFIG_CRYPTO_SHA1_ARM is not set
28142821
CONFIG_CRYPTO_SHA256=y
28152822
# CONFIG_CRYPTO_SHA512 is not set
28162823
# CONFIG_CRYPTO_TGR192 is not set
@@ -2820,6 +2827,7 @@ CONFIG_CRYPTO_SHA256=y
28202827
# Ciphers
28212828
#
28222829
CONFIG_CRYPTO_AES=y
2830+
# CONFIG_CRYPTO_AES_ARM is not set
28232831
# CONFIG_CRYPTO_ANUBIS is not set
28242832
CONFIG_CRYPTO_ARC4=y
28252833
# CONFIG_CRYPTO_BLOWFISH is not set
@@ -2860,6 +2868,8 @@ CONFIG_CRYPTO_HW=y
28602868
# Library routines
28612869
#
28622870
CONFIG_BITREVERSE=y
2871+
CONFIG_GENERIC_STRNCPY_FROM_USER=y
2872+
CONFIG_GENERIC_STRNLEN_USER=y
28632873
CONFIG_CRC_CCITT=y
28642874
CONFIG_CRC16=y
28652875
# CONFIG_CRC_T10DIF is not set

‎arch/arm/configs/shooter_u_defconfig‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# Automatically generated make config: don't edit
3-
# Linux/arm 3.0.53 Kernel Configuration
3+
# Linux/arm 3.0.60 Kernel Configuration
44
#
55
CONFIG_ARM=y
66
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -98,6 +98,9 @@ CONFIG_RD_GZIP=y
9898
# CONFIG_RD_XZ is not set
9999
# CONFIG_RD_LZO is not set
100100
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
101+
# CONFIG_CC_OPTIMIZE_DEFAULT is not set
102+
# CONFIG_CC_OPTIMIZE_ALOT is not set
103+
# CONFIG_CC_OPTIMIZE_FAST is not set
101104
CONFIG_SYSCTL=y
102105
CONFIG_ANON_INODES=y
103106
CONFIG_PANIC_TIMEOUT=5
@@ -288,8 +291,6 @@ CONFIG_MSM_XO=y
288291
CONFIG_MSM_REMOTE_SPINLOCK_LDREX=y
289292
CONFIG_MSM_ADM3=y
290293
# CONFIG_PERFLOCK is not set
291-
# CONFIG_PERFLOCK_BOOT_LOCK is not set
292-
# CONFIG_PERFLOCK_SCREEN_POLICY is not set
293294

294295
#
295296
# MSM Board Selection
@@ -313,6 +314,7 @@ CONFIG_MACH_SHOOTER_U=y
313314
# CONFIG_MACH_VERDI_LTE is not set
314315
# CONFIG_MACH_HOLIDAY is not set
315316
# CONFIG_MACH_VIGOR is not set
317+
# CONFIG_MACH_DOUBLESHOT is not set
316318
# CONFIG_MACH_RUBY is not set
317319
# CONFIG_MSM_USE_TSIF1 is not set
318320
CONFIG_MSM_MDP40=y
@@ -1044,6 +1046,7 @@ CONFIG_BT_HCIUART_H4=y
10441046
# CONFIG_BT_HCIVHCI is not set
10451047
# CONFIG_BT_MRVL is not set
10461048
# CONFIG_MSM_BT_POWER is not set
1049+
# CONFIG_BT_HID_BRCM is not set
10471050
# CONFIG_AF_RXRPC is not set
10481051
CONFIG_FIB_RULES=y
10491052
CONFIG_WIRELESS=y
@@ -1252,12 +1255,8 @@ CONFIG_BCMDHD_NVRAM_PATH="/proc/calibration"
12521255
# CONFIG_BCM4329_248 is not set
12531256

12541257
#
1255-
# WiMAX Wireless Broadband devices
1258+
# Enable WiMAX (Networking options) to see the WiMAX drivers
12561259
#
1257-
# CONFIG_WIMAX_I2400M_USB is not set
1258-
# CONFIG_WIMAX_I2400M_SDIO is not set
1259-
# CONFIG_WIMAX_SQN is not set
1260-
# CONFIG_WIMAX_SDIO_HIGH_SPEED is not set
12611260

12621261
#
12631262
# USB Network Adapters
@@ -1397,6 +1396,7 @@ CONFIG_PMIC8058_OTHC=y
13971396
# CONFIG_BOSCH_BMA150 is not set
13981397
# CONFIG_INPUT_DUMMY_KEYPAD is not set
13991398
# CONFIG_POWER_KEY_LED is not set
1399+
# CONFIG_INPUT_OPTICALJOYSTICK is not set
14001400

14011401
#
14021402
# Hardware I/O ports
@@ -1862,6 +1862,7 @@ CONFIG_CAMERA_3D=y
18621862
# Camera Sensor Selection
18631863
#
18641864
# CONFIG_MT9D113 is not set
1865+
# CONFIG_IMX105 is not set
18651866
# CONFIG_IMX074 is not set
18661867
# CONFIG_WEBCAM_OV7692 is not set
18671868
# CONFIG_WEBCAM_OV9726 is not set
@@ -2656,6 +2657,7 @@ CONFIG_NLS_ISO8859_1=y
26562657
# CONFIG_NLS_KOI8_R is not set
26572658
# CONFIG_NLS_KOI8_U is not set
26582659
# CONFIG_NLS_UTF8 is not set
2660+
CONFIG_DYNAMIC_FSYNC=y
26592661

26602662
#
26612663
# Kernel hacking
@@ -2810,6 +2812,7 @@ CONFIG_CRYPTO_MD5=y
28102812
# CONFIG_CRYPTO_RMD256 is not set
28112813
# CONFIG_CRYPTO_RMD320 is not set
28122814
CONFIG_CRYPTO_SHA1=y
2815+
# CONFIG_CRYPTO_SHA1_ARM is not set
28132816
CONFIG_CRYPTO_SHA256=y
28142817
# CONFIG_CRYPTO_SHA512 is not set
28152818
# CONFIG_CRYPTO_TGR192 is not set
@@ -2819,6 +2822,7 @@ CONFIG_CRYPTO_SHA256=y
28192822
# Ciphers
28202823
#
28212824
CONFIG_CRYPTO_AES=y
2825+
# CONFIG_CRYPTO_AES_ARM is not set
28222826
# CONFIG_CRYPTO_ANUBIS is not set
28232827
CONFIG_CRYPTO_ARC4=y
28242828
# CONFIG_CRYPTO_BLOWFISH is not set
@@ -2859,6 +2863,8 @@ CONFIG_CRYPTO_HW=y
28592863
# Library routines
28602864
#
28612865
CONFIG_BITREVERSE=y
2866+
CONFIG_GENERIC_STRNCPY_FROM_USER=y
2867+
CONFIG_GENERIC_STRNLEN_USER=y
28622868
CONFIG_CRC_CCITT=y
28632869
CONFIG_CRC16=y
28642870
# CONFIG_CRC_T10DIF is not set

0 commit comments

Comments
 (0)