aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-05-10 08:25:54 -0400
committerArnd Bergmann <arnd@arndb.de>2016-05-10 08:25:54 -0400
commit2cbb21d749efb9ca1eef04f04d189d4961b33b79 (patch)
tree9247e91a955e09c9e396d96592a9f7f0c8f03ca2
parent11d708f414a78b8e2903cbcff34bec69c73ba1b5 (diff)
parentd0bc3483da8774dcea1e0692586830031783f08c (diff)
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
Diffstat
-rw-r--r--arch/arm/configs/aspeed_g4_defconfig86
-rw-r--r--arch/arm/configs/aspeed_g5_defconfig88
-rw-r--r--arch/arm/configs/multi_v5_defconfig8
3 files changed, 180 insertions, 2 deletions
diff --git a/arch/arm/configs/aspeed_g4_defconfig b/arch/arm/configs/aspeed_g4_defconfig
new file mode 100644
index 000000000000..ca39c04fec6b
--- /dev/null
+++ b/arch/arm/configs/aspeed_g4_defconfig
@@ -0,0 +1,86 @@
1CONFIG_KERNEL_XZ=y
2CONFIG_SYSVIPC=y
3CONFIG_USELIB=y
4CONFIG_IRQ_DOMAIN_DEBUG=y
5CONFIG_NO_HZ_IDLE=y
6CONFIG_HIGH_RES_TIMERS=y
7CONFIG_LOG_BUF_SHIFT=14
8CONFIG_CGROUPS=y
9CONFIG_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
14CONFIG_CC_OPTIMIZE_FOR_SIZE=y
15CONFIG_BPF_SYSCALL=y
16# CONFIG_SHMEM is not set
17# CONFIG_AIO is not set
18CONFIG_EMBEDDED=y
19# CONFIG_COMPAT_BRK is not set
20CONFIG_SLAB=y
21CONFIG_CC_STACKPROTECTOR_STRONG=y
22CONFIG_MODULES=y
23CONFIG_MODULE_UNLOAD=y
24# CONFIG_BLOCK is not set
25# CONFIG_ARCH_MULTI_V7 is not set
26CONFIG_ARCH_ASPEED=y
27CONFIG_MACH_ASPEED_G4=y
28CONFIG_DEBUG_RODATA=y
29CONFIG_AEABI=y
30CONFIG_UACCESS_WITH_MEMCPY=y
31CONFIG_SECCOMP=y
32# CONFIG_ATAGS is not set
33CONFIG_ZBOOT_ROM_TEXT=0x0
34CONFIG_ZBOOT_ROM_BSS=0x0
35CONFIG_ARM_APPENDED_DTB=y
36CONFIG_ARM_ATAG_DTB_COMPAT=y
37CONFIG_KEXEC=y
38# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
39CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
40CONFIG_DEVTMPFS=y
41CONFIG_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
48CONFIG_SERIAL_8250=y
49# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
50CONFIG_SERIAL_8250_CONSOLE=y
51CONFIG_SERIAL_8250_NR_UARTS=6
52CONFIG_SERIAL_8250_RUNTIME_UARTS=6
53CONFIG_SERIAL_8250_EXTENDED=y
54CONFIG_SERIAL_8250_SHARE_IRQ=y
55CONFIG_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
59CONFIG_FIRMWARE_MEMMAP=y
60CONFIG_FANOTIFY=y
61CONFIG_PRINTK_TIME=y
62CONFIG_DYNAMIC_DEBUG=y
63CONFIG_STRIP_ASM_SYMS=y
64CONFIG_PAGE_POISONING=y
65CONFIG_DEBUG_KMEMLEAK=y
66CONFIG_DEBUG_SHIRQ=y
67CONFIG_LOCKUP_DETECTOR=y
68CONFIG_WQ_WATCHDOG=y
69# CONFIG_SCHED_DEBUG is not set
70CONFIG_SCHED_STACK_END_CHECK=y
71CONFIG_DEBUG_RT_MUTEXES=y
72CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y
73# CONFIG_FTRACE is not set
74CONFIG_MEMTEST=y
75CONFIG_UBSAN=y
76CONFIG_DEBUG_USER=y
77CONFIG_DEBUG_LL=y
78CONFIG_DEBUG_LL_UART_8250=y
79CONFIG_DEBUG_UART_PHYS=0x1e784000
80CONFIG_DEBUG_UART_VIRT=0xe8784000
81CONFIG_EARLY_PRINTK=y
82CONFIG_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
diff --git a/arch/arm/configs/aspeed_g5_defconfig b/arch/arm/configs/aspeed_g5_defconfig
new file mode 100644
index 000000000000..4f366b0370e9
--- /dev/null
+++ b/arch/arm/configs/aspeed_g5_defconfig
@@ -0,0 +1,88 @@
1CONFIG_KERNEL_XZ=y
2CONFIG_SYSVIPC=y
3CONFIG_USELIB=y
4CONFIG_IRQ_DOMAIN_DEBUG=y
5CONFIG_NO_HZ_IDLE=y
6CONFIG_HIGH_RES_TIMERS=y
7CONFIG_LOG_BUF_SHIFT=14
8CONFIG_CGROUPS=y
9CONFIG_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
14CONFIG_CC_OPTIMIZE_FOR_SIZE=y
15CONFIG_BPF_SYSCALL=y
16# CONFIG_SHMEM is not set
17# CONFIG_AIO is not set
18CONFIG_EMBEDDED=y
19# CONFIG_COMPAT_BRK is not set
20CONFIG_SLAB=y
21CONFIG_CC_STACKPROTECTOR_STRONG=y
22CONFIG_MODULES=y
23CONFIG_MODULE_UNLOAD=y
24# CONFIG_BLOCK is not set
25CONFIG_ARCH_MULTI_V6=y
26# CONFIG_ARCH_MULTI_V7 is not set
27CONFIG_ARCH_ASPEED=y
28CONFIG_MACH_ASPEED_G5=y
29CONFIG_DEBUG_RODATA=y
30CONFIG_AEABI=y
31CONFIG_UACCESS_WITH_MEMCPY=y
32CONFIG_SECCOMP=y
33# CONFIG_ATAGS is not set
34CONFIG_ZBOOT_ROM_TEXT=0x0
35CONFIG_ZBOOT_ROM_BSS=0x0
36CONFIG_ARM_APPENDED_DTB=y
37CONFIG_ARM_ATAG_DTB_COMPAT=y
38CONFIG_KEXEC=y
39# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
40CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
41CONFIG_DEVTMPFS=y
42CONFIG_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
49CONFIG_SERIAL_8250=y
50# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
51CONFIG_SERIAL_8250_CONSOLE=y
52CONFIG_SERIAL_8250_NR_UARTS=6
53CONFIG_SERIAL_8250_RUNTIME_UARTS=6
54CONFIG_SERIAL_8250_EXTENDED=y
55CONFIG_SERIAL_8250_SHARE_IRQ=y
56CONFIG_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
60CONFIG_FIRMWARE_MEMMAP=y
61CONFIG_FANOTIFY=y
62CONFIG_PRINTK_TIME=y
63CONFIG_DYNAMIC_DEBUG=y
64CONFIG_STRIP_ASM_SYMS=y
65CONFIG_PAGE_POISONING=y
66CONFIG_DEBUG_KMEMLEAK=y
67CONFIG_DEBUG_SHIRQ=y
68CONFIG_LOCKUP_DETECTOR=y
69CONFIG_WQ_WATCHDOG=y
70# CONFIG_SCHED_DEBUG is not set
71CONFIG_SCHED_STACK_END_CHECK=y
72CONFIG_DEBUG_RT_MUTEXES=y
73CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y
74# CONFIG_FTRACE is not set
75CONFIG_MEMTEST=y
76CONFIG_UBSAN=y
77CONFIG_UBSAN_ALIGNMENT=y
78CONFIG_DEBUG_USER=y
79CONFIG_DEBUG_LL=y
80CONFIG_DEBUG_LL_UART_8250=y
81CONFIG_DEBUG_UART_PHYS=0x1e784000
82CONFIG_DEBUG_UART_VIRT=0xe8784000
83CONFIG_EARLY_PRINTK=y
84CONFIG_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
diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
index a822dd346fb2..ccafa84aedfe 100644
--- a/arch/arm/configs/multi_v5_defconfig
+++ b/arch/arm/configs/multi_v5_defconfig
@@ -13,6 +13,8 @@ CONFIG_MODULE_UNLOAD=y
13# CONFIG_ARCH_MULTI_V7 is not set 13# CONFIG_ARCH_MULTI_V7 is not set
14CONFIG_ARCH_MVEBU=y 14CONFIG_ARCH_MVEBU=y
15CONFIG_MACH_KIRKWOOD=y 15CONFIG_MACH_KIRKWOOD=y
16CONFIG_ARCH_ASPEED=y
17CONFIG_MACH_ASPEED_G4=y
16CONFIG_ARCH_MXC=y 18CONFIG_ARCH_MXC=y
17CONFIG_MACH_MX21ADS=y 19CONFIG_MACH_MX21ADS=y
18CONFIG_MACH_MX27ADS=y 20CONFIG_MACH_MX27ADS=y
@@ -116,7 +118,10 @@ CONFIG_LEGACY_PTY_COUNT=16
116# CONFIG_DEVKMEM is not set 118# CONFIG_DEVKMEM is not set
117CONFIG_SERIAL_8250=y 119CONFIG_SERIAL_8250=y
118CONFIG_SERIAL_8250_CONSOLE=y 120CONFIG_SERIAL_8250_CONSOLE=y
119CONFIG_SERIAL_8250_RUNTIME_UARTS=2 121CONFIG_SERIAL_8250_NR_UARTS=6
122CONFIG_SERIAL_8250_RUNTIME_UARTS=6
123CONFIG_SERIAL_8250_EXTENDED=y
124CONFIG_SERIAL_8250_MANY_PORTS=y
120CONFIG_SERIAL_OF_PLATFORM=y 125CONFIG_SERIAL_OF_PLATFORM=y
121CONFIG_SERIAL_IMX=y 126CONFIG_SERIAL_IMX=y
122CONFIG_SERIAL_IMX_CONSOLE=y 127CONFIG_SERIAL_IMX_CONSOLE=y
@@ -141,7 +146,6 @@ CONFIG_SENSORS_LM75=y
141CONFIG_SENSORS_LM85=y 146CONFIG_SENSORS_LM85=y
142CONFIG_THERMAL=y 147CONFIG_THERMAL=y
143CONFIG_KIRKWOOD_THERMAL=y 148CONFIG_KIRKWOOD_THERMAL=y
144CONFIG_WATCHDOG=y
145CONFIG_ORION_WATCHDOG=y 149CONFIG_ORION_WATCHDOG=y
146CONFIG_IMX2_WDT=y 150CONFIG_IMX2_WDT=y
147# CONFIG_ABX500_CORE is not set 151# CONFIG_ABX500_CORE is not set
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-30 07:46:25 -0400