Skip to content

Commit 7cc9b9b

Browse files
committed
Merge commit 'au-01.08.00.258' into donut-release
2 parents e80954f + 2691c36 commit 7cc9b9b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+5145
-1556
lines changed

arch/arm/configs/msm7201a-perf_defconfig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,7 @@ CONFIG_MTD=y
489489
# CONFIG_MTD_DEBUG is not set
490490
# CONFIG_MTD_CONCAT is not set
491491
CONFIG_MTD_PARTITIONS=y
492+
# CONFIG_MTD_LAZYECCSTATS is not set
492493
# CONFIG_MTD_TESTS is not set
493494
# CONFIG_MTD_REDBOOT_PARTS is not set
494495
CONFIG_MTD_CMDLINE_PARTS=y
@@ -1449,8 +1450,8 @@ CONFIG_TRACING=y
14491450
# CONFIG_SAMPLES is not set
14501451
CONFIG_HAVE_ARCH_KGDB=y
14511452
# CONFIG_KGDB is not set
1452-
# CONFIG_DEBUG_USER is not set
1453-
# CONFIG_DEBUG_ERRORS is not set
1453+
CONFIG_DEBUG_USER=y
1454+
CONFIG_DEBUG_ERRORS=y
14541455
# CONFIG_DEBUG_STACK_USAGE is not set
14551456
# CONFIG_DEBUG_LL is not set
14561457

arch/arm/configs/msm7201a_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,7 @@ CONFIG_MTD=y
489489
# CONFIG_MTD_DEBUG is not set
490490
# CONFIG_MTD_CONCAT is not set
491491
CONFIG_MTD_PARTITIONS=y
492+
# CONFIG_MTD_LAZYECCSTATS is not set
492493
# CONFIG_MTD_TESTS is not set
493494
# CONFIG_MTD_REDBOOT_PARTS is not set
494495
CONFIG_MTD_CMDLINE_PARTS=y

arch/arm/configs/msm7627-perf_defconfig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,7 @@ CONFIG_MTD=y
491491
# CONFIG_MTD_DEBUG is not set
492492
# CONFIG_MTD_CONCAT is not set
493493
CONFIG_MTD_PARTITIONS=y
494+
# CONFIG_MTD_LAZYECCSTATS is not set
494495
# CONFIG_MTD_TESTS is not set
495496
# CONFIG_MTD_REDBOOT_PARTS is not set
496497
CONFIG_MTD_CMDLINE_PARTS=y
@@ -1445,8 +1446,8 @@ CONFIG_TRACING=y
14451446
# CONFIG_SAMPLES is not set
14461447
CONFIG_HAVE_ARCH_KGDB=y
14471448
# CONFIG_KGDB is not set
1448-
# CONFIG_DEBUG_USER is not set
1449-
# CONFIG_DEBUG_ERRORS is not set
1449+
CONFIG_DEBUG_USER=y
1450+
CONFIG_DEBUG_ERRORS=y
14501451
# CONFIG_DEBUG_STACK_USAGE is not set
14511452
# CONFIG_DEBUG_LL is not set
14521453

arch/arm/configs/msm7627_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,7 @@ CONFIG_MTD=y
491491
# CONFIG_MTD_DEBUG is not set
492492
# CONFIG_MTD_CONCAT is not set
493493
CONFIG_MTD_PARTITIONS=y
494+
# CONFIG_MTD_LAZYECCSTATS is not set
494495
# CONFIG_MTD_TESTS is not set
495496
# CONFIG_MTD_REDBOOT_PARTS is not set
496497
CONFIG_MTD_CMDLINE_PARTS=y

arch/arm/configs/msm7630_defconfig

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,7 @@ CONFIG_MTD=y
453453
# CONFIG_MTD_DEBUG is not set
454454
# CONFIG_MTD_CONCAT is not set
455455
CONFIG_MTD_PARTITIONS=y
456+
# CONFIG_MTD_LAZYECCSTATS is not set
456457
# CONFIG_MTD_TESTS is not set
457458
# CONFIG_MTD_REDBOOT_PARTS is not set
458459
CONFIG_MTD_CMDLINE_PARTS=y
@@ -821,6 +822,7 @@ CONFIG_SPI_MASTER=y
821822
#
822823
# CONFIG_SPI_BITBANG is not set
823824
# CONFIG_SPI_GPIO is not set
825+
# CONFIG_SPI_QSD is not set
824826

825827
#
826828
# SPI Protocol Masters
@@ -1501,11 +1503,11 @@ CONFIG_NLS_ISO8859_1=y
15011503
#
15021504
# Kernel hacking
15031505
#
1504-
# CONFIG_PRINTK_TIME is not set
1506+
CONFIG_PRINTK_TIME=y
15051507
CONFIG_ENABLE_WARN_DEPRECATED=y
15061508
CONFIG_ENABLE_MUST_CHECK=y
15071509
CONFIG_FRAME_WARN=1024
1508-
CONFIG_MAGIC_SYSRQ=y
1510+
# CONFIG_MAGIC_SYSRQ is not set
15091511
# CONFIG_UNUSED_SYMBOLS is not set
15101512
CONFIG_DEBUG_FS=y
15111513
# CONFIG_HEADERS_CHECK is not set
@@ -1519,19 +1521,22 @@ CONFIG_SCHEDSTATS=y
15191521
# CONFIG_TIMER_STATS is not set
15201522
# CONFIG_DEBUG_OBJECTS is not set
15211523
# CONFIG_DEBUG_SLAB is not set
1522-
CONFIG_DEBUG_PREEMPT=y
1524+
# CONFIG_DEBUG_PREEMPT is not set
15231525
# CONFIG_DEBUG_RT_MUTEXES is not set
15241526
# CONFIG_RT_MUTEX_TESTER is not set
1525-
# CONFIG_DEBUG_SPINLOCK is not set
1526-
# CONFIG_DEBUG_MUTEXES is not set
1527-
# CONFIG_DEBUG_LOCK_ALLOC is not set
1528-
# CONFIG_PROVE_LOCKING is not set
1527+
CONFIG_DEBUG_SPINLOCK=y
1528+
CONFIG_DEBUG_MUTEXES=y
1529+
CONFIG_DEBUG_LOCK_ALLOC=y
1530+
CONFIG_PROVE_LOCKING=y
1531+
CONFIG_LOCKDEP=y
15291532
# CONFIG_LOCK_STAT is not set
1530-
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1533+
# CONFIG_DEBUG_LOCKDEP is not set
1534+
CONFIG_TRACE_IRQFLAGS=y
1535+
CONFIG_DEBUG_SPINLOCK_SLEEP=y
15311536
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
15321537
CONFIG_STACKTRACE=y
15331538
# CONFIG_DEBUG_KOBJECT is not set
1534-
# CONFIG_DEBUG_BUGVERBOSE is not set
1539+
CONFIG_DEBUG_BUGVERBOSE=y
15351540
CONFIG_DEBUG_INFO=y
15361541
# CONFIG_DEBUG_VM is not set
15371542
# CONFIG_DEBUG_WRITECOUNT is not set
@@ -1546,7 +1551,7 @@ CONFIG_FRAME_POINTER=y
15461551
# CONFIG_BACKTRACE_SELF_TEST is not set
15471552
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
15481553
# CONFIG_FAULT_INJECTION is not set
1549-
CONFIG_LATENCYTOP=y
1554+
# CONFIG_LATENCYTOP is not set
15501555
# CONFIG_SYSCTL_SYSCALL_CHECK is not set
15511556
CONFIG_NOP_TRACER=y
15521557
CONFIG_HAVE_FUNCTION_TRACER=y
@@ -1570,9 +1575,10 @@ CONFIG_TRACING=y
15701575
CONFIG_HAVE_ARCH_KGDB=y
15711576
# CONFIG_KGDB is not set
15721577
CONFIG_DEBUG_USER=y
1573-
# CONFIG_DEBUG_ERRORS is not set
1574-
# CONFIG_DEBUG_STACK_USAGE is not set
1575-
# CONFIG_DEBUG_LL is not set
1578+
CONFIG_DEBUG_ERRORS=y
1579+
CONFIG_DEBUG_STACK_USAGE=y
1580+
CONFIG_DEBUG_LL=y
1581+
# CONFIG_DEBUG_ICEDCC is not set
15761582

15771583
#
15781584
# Security options

arch/arm/configs/qsd8650-1G_defconfig

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ CONFIG_EMBEDDED=y
6969
CONFIG_UID16=y
7070
CONFIG_SYSCTL_SYSCALL=y
7171
CONFIG_KALLSYMS=y
72+
# CONFIG_KALLSYMS_ALL is not set
7273
# CONFIG_KALLSYMS_EXTRA_PASS is not set
7374
CONFIG_HOTPLUG=y
7475
CONFIG_PRINTK=y
@@ -498,12 +499,15 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
498499
CONFIG_FW_LOADER=y
499500
CONFIG_FIRMWARE_IN_KERNEL=y
500501
CONFIG_EXTRA_FIRMWARE=""
502+
# CONFIG_DEBUG_DRIVER is not set
503+
# CONFIG_DEBUG_DEVRES is not set
501504
# CONFIG_SYS_HYPERVISOR is not set
502505
# CONFIG_CONNECTOR is not set
503506
CONFIG_MTD=y
504507
# CONFIG_MTD_DEBUG is not set
505508
# CONFIG_MTD_CONCAT is not set
506509
CONFIG_MTD_PARTITIONS=y
510+
# CONFIG_MTD_LAZYECCSTATS is not set
507511
# CONFIG_MTD_TESTS is not set
508512
# CONFIG_MTD_REDBOOT_PARTS is not set
509513
CONFIG_MTD_CMDLINE_PARTS=y
@@ -869,6 +873,7 @@ CONFIG_I2C_MSM=y
869873
# CONFIG_I2C_DEBUG_BUS is not set
870874
# CONFIG_I2C_DEBUG_CHIP is not set
871875
CONFIG_SPI=y
876+
# CONFIG_SPI_DEBUG is not set
872877
CONFIG_SPI_MASTER=y
873878

874879
#
@@ -1607,12 +1612,41 @@ CONFIG_FRAME_WARN=1024
16071612
# CONFIG_UNUSED_SYMBOLS is not set
16081613
CONFIG_DEBUG_FS=y
16091614
# CONFIG_HEADERS_CHECK is not set
1610-
# CONFIG_DEBUG_KERNEL is not set
1615+
CONFIG_DEBUG_KERNEL=y
1616+
# CONFIG_DEBUG_SHIRQ is not set
1617+
# CONFIG_DETECT_SOFTLOCKUP is not set
1618+
# CONFIG_SCHED_DEBUG is not set
1619+
# CONFIG_SCHEDSTATS is not set
1620+
# CONFIG_TIMER_STATS is not set
1621+
# CONFIG_DEBUG_OBJECTS is not set
1622+
# CONFIG_DEBUG_SLAB is not set
1623+
# CONFIG_DEBUG_PREEMPT is not set
1624+
# CONFIG_DEBUG_RT_MUTEXES is not set
1625+
# CONFIG_RT_MUTEX_TESTER is not set
1626+
# CONFIG_DEBUG_SPINLOCK is not set
1627+
# CONFIG_DEBUG_MUTEXES is not set
1628+
# CONFIG_DEBUG_LOCK_ALLOC is not set
1629+
# CONFIG_PROVE_LOCKING is not set
1630+
# CONFIG_LOCK_STAT is not set
1631+
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1632+
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
16111633
CONFIG_STACKTRACE=y
1612-
# CONFIG_DEBUG_BUGVERBOSE is not set
1634+
# CONFIG_DEBUG_KOBJECT is not set
1635+
CONFIG_DEBUG_BUGVERBOSE=y
1636+
CONFIG_DEBUG_INFO=y
1637+
# CONFIG_DEBUG_VM is not set
1638+
# CONFIG_DEBUG_WRITECOUNT is not set
16131639
# CONFIG_DEBUG_MEMORY_INIT is not set
1640+
# CONFIG_DEBUG_LIST is not set
1641+
# CONFIG_DEBUG_SG is not set
1642+
# CONFIG_DEBUG_NOTIFIERS is not set
16141643
CONFIG_FRAME_POINTER=y
1644+
# CONFIG_BOOT_PRINTK_DELAY is not set
1645+
# CONFIG_RCU_TORTURE_TEST is not set
16151646
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1647+
# CONFIG_BACKTRACE_SELF_TEST is not set
1648+
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1649+
# CONFIG_FAULT_INJECTION is not set
16161650
# CONFIG_LATENCYTOP is not set
16171651
# CONFIG_SYSCTL_SYSCALL_CHECK is not set
16181652
CONFIG_NOP_TRACER=y
@@ -1623,10 +1657,23 @@ CONFIG_TRACING=y
16231657
#
16241658
# Tracers
16251659
#
1660+
# CONFIG_FUNCTION_TRACER is not set
1661+
# CONFIG_IRQSOFF_TRACER is not set
1662+
# CONFIG_PREEMPT_TRACER is not set
1663+
# CONFIG_SCHED_TRACER is not set
1664+
# CONFIG_CONTEXT_SWITCH_TRACER is not set
1665+
# CONFIG_BOOT_TRACER is not set
1666+
# CONFIG_TRACE_BRANCH_PROFILING is not set
1667+
# CONFIG_STACK_TRACER is not set
1668+
# CONFIG_FTRACE_STARTUP_TEST is not set
16261669
# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
16271670
# CONFIG_SAMPLES is not set
16281671
CONFIG_HAVE_ARCH_KGDB=y
1629-
# CONFIG_DEBUG_USER is not set
1672+
# CONFIG_KGDB is not set
1673+
CONFIG_DEBUG_USER=y
1674+
CONFIG_DEBUG_ERRORS=y
1675+
# CONFIG_DEBUG_STACK_USAGE is not set
1676+
# CONFIG_DEBUG_LL is not set
16301677

16311678
#
16321679
# Security options

arch/arm/configs/qsd8650-comet-perf_defconfig

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ CONFIG_EMBEDDED=y
6969
CONFIG_UID16=y
7070
CONFIG_SYSCTL_SYSCALL=y
7171
CONFIG_KALLSYMS=y
72+
# CONFIG_KALLSYMS_ALL is not set
7273
# CONFIG_KALLSYMS_EXTRA_PASS is not set
7374
CONFIG_HOTPLUG=y
7475
CONFIG_PRINTK=y
@@ -492,12 +493,15 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
492493
CONFIG_STANDALONE=y
493494
CONFIG_PREVENT_FIRMWARE_BUILD=y
494495
# CONFIG_FW_LOADER is not set
496+
# CONFIG_DEBUG_DRIVER is not set
497+
# CONFIG_DEBUG_DEVRES is not set
495498
# CONFIG_SYS_HYPERVISOR is not set
496499
# CONFIG_CONNECTOR is not set
497500
CONFIG_MTD=y
498501
# CONFIG_MTD_DEBUG is not set
499502
# CONFIG_MTD_CONCAT is not set
500503
CONFIG_MTD_PARTITIONS=y
504+
# CONFIG_MTD_LAZYECCSTATS is not set
501505
# CONFIG_MTD_TESTS is not set
502506
# CONFIG_MTD_REDBOOT_PARTS is not set
503507
CONFIG_MTD_CMDLINE_PARTS=y
@@ -853,6 +857,7 @@ CONFIG_I2C_MSM=y
853857
# CONFIG_I2C_DEBUG_BUS is not set
854858
# CONFIG_I2C_DEBUG_CHIP is not set
855859
CONFIG_SPI=y
860+
# CONFIG_SPI_DEBUG is not set
856861
CONFIG_SPI_MASTER=y
857862

858863
#
@@ -1370,12 +1375,41 @@ CONFIG_FRAME_WARN=1024
13701375
# CONFIG_UNUSED_SYMBOLS is not set
13711376
CONFIG_DEBUG_FS=y
13721377
# CONFIG_HEADERS_CHECK is not set
1373-
# CONFIG_DEBUG_KERNEL is not set
1378+
CONFIG_DEBUG_KERNEL=y
1379+
# CONFIG_DEBUG_SHIRQ is not set
1380+
# CONFIG_DETECT_SOFTLOCKUP is not set
1381+
# CONFIG_SCHED_DEBUG is not set
1382+
# CONFIG_SCHEDSTATS is not set
1383+
# CONFIG_TIMER_STATS is not set
1384+
# CONFIG_DEBUG_OBJECTS is not set
1385+
# CONFIG_DEBUG_SLAB is not set
1386+
# CONFIG_DEBUG_PREEMPT is not set
1387+
# CONFIG_DEBUG_RT_MUTEXES is not set
1388+
# CONFIG_RT_MUTEX_TESTER is not set
1389+
# CONFIG_DEBUG_SPINLOCK is not set
1390+
# CONFIG_DEBUG_MUTEXES is not set
1391+
# CONFIG_DEBUG_LOCK_ALLOC is not set
1392+
# CONFIG_PROVE_LOCKING is not set
1393+
# CONFIG_LOCK_STAT is not set
1394+
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1395+
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
13741396
CONFIG_STACKTRACE=y
1375-
# CONFIG_DEBUG_BUGVERBOSE is not set
1397+
# CONFIG_DEBUG_KOBJECT is not set
1398+
CONFIG_DEBUG_BUGVERBOSE=y
1399+
CONFIG_DEBUG_INFO=y
1400+
# CONFIG_DEBUG_VM is not set
1401+
# CONFIG_DEBUG_WRITECOUNT is not set
13761402
# CONFIG_DEBUG_MEMORY_INIT is not set
1403+
# CONFIG_DEBUG_LIST is not set
1404+
# CONFIG_DEBUG_SG is not set
1405+
# CONFIG_DEBUG_NOTIFIERS is not set
13771406
CONFIG_FRAME_POINTER=y
1407+
# CONFIG_BOOT_PRINTK_DELAY is not set
1408+
# CONFIG_RCU_TORTURE_TEST is not set
13781409
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1410+
# CONFIG_BACKTRACE_SELF_TEST is not set
1411+
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1412+
# CONFIG_FAULT_INJECTION is not set
13791413
# CONFIG_LATENCYTOP is not set
13801414
# CONFIG_SYSCTL_SYSCALL_CHECK is not set
13811415
CONFIG_NOP_TRACER=y
@@ -1386,10 +1420,23 @@ CONFIG_TRACING=y
13861420
#
13871421
# Tracers
13881422
#
1423+
# CONFIG_FUNCTION_TRACER is not set
1424+
# CONFIG_IRQSOFF_TRACER is not set
1425+
# CONFIG_PREEMPT_TRACER is not set
1426+
# CONFIG_SCHED_TRACER is not set
1427+
# CONFIG_CONTEXT_SWITCH_TRACER is not set
1428+
# CONFIG_BOOT_TRACER is not set
1429+
# CONFIG_TRACE_BRANCH_PROFILING is not set
1430+
# CONFIG_STACK_TRACER is not set
1431+
# CONFIG_FTRACE_STARTUP_TEST is not set
13891432
# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
13901433
# CONFIG_SAMPLES is not set
13911434
CONFIG_HAVE_ARCH_KGDB=y
1392-
# CONFIG_DEBUG_USER is not set
1435+
# CONFIG_KGDB is not set
1436+
CONFIG_DEBUG_USER=y
1437+
CONFIG_DEBUG_ERRORS=y
1438+
# CONFIG_DEBUG_STACK_USAGE is not set
1439+
# CONFIG_DEBUG_LL is not set
13931440

13941441
#
13951442
# Security options

arch/arm/configs/qsd8650-comet_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -501,6 +501,7 @@ CONFIG_MTD=y
501501
# CONFIG_MTD_DEBUG is not set
502502
# CONFIG_MTD_CONCAT is not set
503503
CONFIG_MTD_PARTITIONS=y
504+
# CONFIG_MTD_LAZYECCSTATS is not set
504505
# CONFIG_MTD_TESTS is not set
505506
# CONFIG_MTD_REDBOOT_PARTS is not set
506507
CONFIG_MTD_CMDLINE_PARTS=y

0 commit comments

Comments
 (0)