Skip to content

Commit 2cbb21d

Browse files
arndbarndb
committed
Merge tag 'aspeed-for-4.7-defconfig' of https://github.com/shenki/linux into next/defconfig
Merge "aspeed defconfig for 4.7" from Joel Stanley: This adds configurations used for testing Aspeed BMC SoCs, as well as adding the v5 part to the multi defconfig. * tag 'aspeed-for-4.7-defconfig' of https://github.com/shenki/linux: arm/configs: Add Aspeed defconfig arm/configs/multi_v5: Add Aspeed ast2400
2 parents 11d708f + d0bc348 commit 2cbb21d

File tree

3 files changed

+180
-2
lines changed

3 files changed

+180
-2
lines changed

‎arch/arm/configs/aspeed_g4_defconfig

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
CONFIG_KERNEL_XZ=y
2+
CONFIG_SYSVIPC=y
3+
CONFIG_USELIB=y
4+
CONFIG_IRQ_DOMAIN_DEBUG=y
5+
CONFIG_NO_HZ_IDLE=y
6+
CONFIG_HIGH_RES_TIMERS=y
7+
CONFIG_LOG_BUF_SHIFT=14
8+
CONFIG_CGROUPS=y
9+
CONFIG_BLK_DEV_INITRD=y
10+
# CONFIG_RD_BZIP2 is not set
11+
# CONFIG_RD_LZMA is not set
12+
# CONFIG_RD_LZO is not set
13+
# CONFIG_RD_LZ4 is not set
14+
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
15+
CONFIG_BPF_SYSCALL=y
16+
# CONFIG_SHMEM is not set
17+
# CONFIG_AIO is not set
18+
CONFIG_EMBEDDED=y
19+
# CONFIG_COMPAT_BRK is not set
20+
CONFIG_SLAB=y
21+
CONFIG_CC_STACKPROTECTOR_STRONG=y
22+
CONFIG_MODULES=y
23+
CONFIG_MODULE_UNLOAD=y
24+
# CONFIG_BLOCK is not set
25+
# CONFIG_ARCH_MULTI_V7 is not set
26+
CONFIG_ARCH_ASPEED=y
27+
CONFIG_MACH_ASPEED_G4=y
28+
CONFIG_DEBUG_RODATA=y
29+
CONFIG_AEABI=y
30+
CONFIG_UACCESS_WITH_MEMCPY=y
31+
CONFIG_SECCOMP=y
32+
# CONFIG_ATAGS is not set
33+
CONFIG_ZBOOT_ROM_TEXT=0x0
34+
CONFIG_ZBOOT_ROM_BSS=0x0
35+
CONFIG_ARM_APPENDED_DTB=y
36+
CONFIG_ARM_ATAG_DTB_COMPAT=y
37+
CONFIG_KEXEC=y
38+
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
39+
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
40+
CONFIG_DEVTMPFS=y
41+
CONFIG_DEVTMPFS_MOUNT=y
42+
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
43+
# CONFIG_INPUT is not set
44+
# CONFIG_SERIO is not set
45+
# CONFIG_VT is not set
46+
# CONFIG_LEGACY_PTYS is not set
47+
# CONFIG_DEVKMEM is not set
48+
CONFIG_SERIAL_8250=y
49+
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
50+
CONFIG_SERIAL_8250_CONSOLE=y
51+
CONFIG_SERIAL_8250_NR_UARTS=6
52+
CONFIG_SERIAL_8250_RUNTIME_UARTS=6
53+
CONFIG_SERIAL_8250_EXTENDED=y
54+
CONFIG_SERIAL_8250_SHARE_IRQ=y
55+
CONFIG_SERIAL_OF_PLATFORM=y
56+
# CONFIG_HW_RANDOM is not set
57+
# CONFIG_USB_SUPPORT is not set
58+
# CONFIG_IOMMU_SUPPORT is not set
59+
CONFIG_FIRMWARE_MEMMAP=y
60+
CONFIG_FANOTIFY=y
61+
CONFIG_PRINTK_TIME=y
62+
CONFIG_DYNAMIC_DEBUG=y
63+
CONFIG_STRIP_ASM_SYMS=y
64+
CONFIG_PAGE_POISONING=y
65+
CONFIG_DEBUG_KMEMLEAK=y
66+
CONFIG_DEBUG_SHIRQ=y
67+
CONFIG_LOCKUP_DETECTOR=y
68+
CONFIG_WQ_WATCHDOG=y
69+
# CONFIG_SCHED_DEBUG is not set
70+
CONFIG_SCHED_STACK_END_CHECK=y
71+
CONFIG_DEBUG_RT_MUTEXES=y
72+
CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y
73+
# CONFIG_FTRACE is not set
74+
CONFIG_MEMTEST=y
75+
CONFIG_UBSAN=y
76+
CONFIG_DEBUG_USER=y
77+
CONFIG_DEBUG_LL=y
78+
CONFIG_DEBUG_LL_UART_8250=y
79+
CONFIG_DEBUG_UART_PHYS=0x1e784000
80+
CONFIG_DEBUG_UART_VIRT=0xe8784000
81+
CONFIG_EARLY_PRINTK=y
82+
CONFIG_DEBUG_SET_MODULE_RONX=y
83+
# CONFIG_XZ_DEC_X86 is not set
84+
# CONFIG_XZ_DEC_POWERPC is not set
85+
# CONFIG_XZ_DEC_IA64 is not set
86+
# CONFIG_XZ_DEC_SPARC is not set

‎arch/arm/configs/aspeed_g5_defconfig

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
CONFIG_KERNEL_XZ=y
2+
CONFIG_SYSVIPC=y
3+
CONFIG_USELIB=y
4+
CONFIG_IRQ_DOMAIN_DEBUG=y
5+
CONFIG_NO_HZ_IDLE=y
6+
CONFIG_HIGH_RES_TIMERS=y
7+
CONFIG_LOG_BUF_SHIFT=14
8+
CONFIG_CGROUPS=y
9+
CONFIG_BLK_DEV_INITRD=y
10+
# CONFIG_RD_BZIP2 is not set
11+
# CONFIG_RD_LZMA is not set
12+
# CONFIG_RD_LZO is not set
13+
# CONFIG_RD_LZ4 is not set
14+
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
15+
CONFIG_BPF_SYSCALL=y
16+
# CONFIG_SHMEM is not set
17+
# CONFIG_AIO is not set
18+
CONFIG_EMBEDDED=y
19+
# CONFIG_COMPAT_BRK is not set
20+
CONFIG_SLAB=y
21+
CONFIG_CC_STACKPROTECTOR_STRONG=y
22+
CONFIG_MODULES=y
23+
CONFIG_MODULE_UNLOAD=y
24+
# CONFIG_BLOCK is not set
25+
CONFIG_ARCH_MULTI_V6=y
26+
# CONFIG_ARCH_MULTI_V7 is not set
27+
CONFIG_ARCH_ASPEED=y
28+
CONFIG_MACH_ASPEED_G5=y
29+
CONFIG_DEBUG_RODATA=y
30+
CONFIG_AEABI=y
31+
CONFIG_UACCESS_WITH_MEMCPY=y
32+
CONFIG_SECCOMP=y
33+
# CONFIG_ATAGS is not set
34+
CONFIG_ZBOOT_ROM_TEXT=0x0
35+
CONFIG_ZBOOT_ROM_BSS=0x0
36+
CONFIG_ARM_APPENDED_DTB=y
37+
CONFIG_ARM_ATAG_DTB_COMPAT=y
38+
CONFIG_KEXEC=y
39+
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
40+
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
41+
CONFIG_DEVTMPFS=y
42+
CONFIG_DEVTMPFS_MOUNT=y
43+
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
44+
# CONFIG_INPUT is not set
45+
# CONFIG_SERIO is not set
46+
# CONFIG_VT is not set
47+
# CONFIG_LEGACY_PTYS is not set
48+
# CONFIG_DEVKMEM is not set
49+
CONFIG_SERIAL_8250=y
50+
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
51+
CONFIG_SERIAL_8250_CONSOLE=y
52+
CONFIG_SERIAL_8250_NR_UARTS=6
53+
CONFIG_SERIAL_8250_RUNTIME_UARTS=6
54+
CONFIG_SERIAL_8250_EXTENDED=y
55+
CONFIG_SERIAL_8250_SHARE_IRQ=y
56+
CONFIG_SERIAL_OF_PLATFORM=y
57+
# CONFIG_HW_RANDOM is not set
58+
# CONFIG_USB_SUPPORT is not set
59+
# CONFIG_IOMMU_SUPPORT is not set
60+
CONFIG_FIRMWARE_MEMMAP=y
61+
CONFIG_FANOTIFY=y
62+
CONFIG_PRINTK_TIME=y
63+
CONFIG_DYNAMIC_DEBUG=y
64+
CONFIG_STRIP_ASM_SYMS=y
65+
CONFIG_PAGE_POISONING=y
66+
CONFIG_DEBUG_KMEMLEAK=y
67+
CONFIG_DEBUG_SHIRQ=y
68+
CONFIG_LOCKUP_DETECTOR=y
69+
CONFIG_WQ_WATCHDOG=y
70+
# CONFIG_SCHED_DEBUG is not set
71+
CONFIG_SCHED_STACK_END_CHECK=y
72+
CONFIG_DEBUG_RT_MUTEXES=y
73+
CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y
74+
# CONFIG_FTRACE is not set
75+
CONFIG_MEMTEST=y
76+
CONFIG_UBSAN=y
77+
CONFIG_UBSAN_ALIGNMENT=y
78+
CONFIG_DEBUG_USER=y
79+
CONFIG_DEBUG_LL=y
80+
CONFIG_DEBUG_LL_UART_8250=y
81+
CONFIG_DEBUG_UART_PHYS=0x1e784000
82+
CONFIG_DEBUG_UART_VIRT=0xe8784000
83+
CONFIG_EARLY_PRINTK=y
84+
CONFIG_DEBUG_SET_MODULE_RONX=y
85+
# CONFIG_XZ_DEC_X86 is not set
86+
# CONFIG_XZ_DEC_POWERPC is not set
87+
# CONFIG_XZ_DEC_IA64 is not set
88+
# CONFIG_XZ_DEC_SPARC is not set

‎arch/arm/configs/multi_v5_defconfig

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ CONFIG_MODULE_UNLOAD=y
1313
# CONFIG_ARCH_MULTI_V7 is not set
1414
CONFIG_ARCH_MVEBU=y
1515
CONFIG_MACH_KIRKWOOD=y
16+
CONFIG_ARCH_ASPEED=y
17+
CONFIG_MACH_ASPEED_G4=y
1618
CONFIG_ARCH_MXC=y
1719
CONFIG_MACH_MX21ADS=y
1820
CONFIG_MACH_MX27ADS=y
@@ -116,7 +118,10 @@ CONFIG_LEGACY_PTY_COUNT=16
116118
# CONFIG_DEVKMEM is not set
117119
CONFIG_SERIAL_8250=y
118120
CONFIG_SERIAL_8250_CONSOLE=y
119-
CONFIG_SERIAL_8250_RUNTIME_UARTS=2
121+
CONFIG_SERIAL_8250_NR_UARTS=6
122+
CONFIG_SERIAL_8250_RUNTIME_UARTS=6
123+
CONFIG_SERIAL_8250_EXTENDED=y
124+
CONFIG_SERIAL_8250_MANY_PORTS=y
120125
CONFIG_SERIAL_OF_PLATFORM=y
121126
CONFIG_SERIAL_IMX=y
122127
CONFIG_SERIAL_IMX_CONSOLE=y
@@ -141,7 +146,6 @@ CONFIG_SENSORS_LM75=y
141146
CONFIG_SENSORS_LM85=y
142147
CONFIG_THERMAL=y
143148
CONFIG_KIRKWOOD_THERMAL=y
144-
CONFIG_WATCHDOG=y
145149
CONFIG_ORION_WATCHDOG=y
146150
CONFIG_IMX2_WDT=y
147151
# CONFIG_ABX500_CORE is not set

0 commit comments

Comments
 (0)