Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cbb21d7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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
parents 11d708f4 d0bc3483

arch/arm/configs/aspeed_g4_defconfig

0 → 100644
+86 −0
Original line number Original line Diff line number Diff line 
CONFIG_KERNEL_XZ=y

CONFIG_SYSVIPC=y

CONFIG_USELIB=y

CONFIG_IRQ_DOMAIN_DEBUG=y

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_CGROUPS=y

CONFIG_BLK_DEV_INITRD=y

# CONFIG_RD_BZIP2 is not set

# CONFIG_RD_LZMA is not set

# CONFIG_RD_LZO is not set

# CONFIG_RD_LZ4 is not set

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_BPF_SYSCALL=y

# CONFIG_SHMEM is not set

# CONFIG_AIO is not set

CONFIG_EMBEDDED=y

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y

CONFIG_CC_STACKPROTECTOR_STRONG=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLOCK is not set

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_ASPEED=y

CONFIG_MACH_ASPEED_G4=y

CONFIG_DEBUG_RODATA=y

CONFIG_AEABI=y

CONFIG_UACCESS_WITH_MEMCPY=y

CONFIG_SECCOMP=y

# CONFIG_ATAGS is not set

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ARM_APPENDED_DTB=y

CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_KEXEC=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_LEGACY_PTYS is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_8250=y

# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=6

CONFIG_SERIAL_8250_RUNTIME_UARTS=6

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_SERIAL_OF_PLATFORM=y

# CONFIG_HW_RANDOM is not set

# CONFIG_USB_SUPPORT is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_FIRMWARE_MEMMAP=y

CONFIG_FANOTIFY=y

CONFIG_PRINTK_TIME=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_STRIP_ASM_SYMS=y

CONFIG_PAGE_POISONING=y

CONFIG_DEBUG_KMEMLEAK=y

CONFIG_DEBUG_SHIRQ=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_WQ_WATCHDOG=y

# CONFIG_SCHED_DEBUG is not set

CONFIG_SCHED_STACK_END_CHECK=y

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y

# CONFIG_FTRACE is not set

CONFIG_MEMTEST=y

CONFIG_UBSAN=y

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_LL=y

CONFIG_DEBUG_LL_UART_8250=y

CONFIG_DEBUG_UART_PHYS=0x1e784000

CONFIG_DEBUG_UART_VIRT=0xe8784000

CONFIG_EARLY_PRINTK=y

CONFIG_DEBUG_SET_MODULE_RONX=y

# CONFIG_XZ_DEC_X86 is not set

# CONFIG_XZ_DEC_POWERPC is not set

# CONFIG_XZ_DEC_IA64 is not set

# CONFIG_XZ_DEC_SPARC is not set

arch/arm/configs/aspeed_g5_defconfig

0 → 100644
+88 −0
Original line number Original line Diff line number Diff line 
CONFIG_KERNEL_XZ=y

CONFIG_SYSVIPC=y

CONFIG_USELIB=y

CONFIG_IRQ_DOMAIN_DEBUG=y

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_CGROUPS=y

CONFIG_BLK_DEV_INITRD=y

# CONFIG_RD_BZIP2 is not set

# CONFIG_RD_LZMA is not set

# CONFIG_RD_LZO is not set

# CONFIG_RD_LZ4 is not set

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_BPF_SYSCALL=y

# CONFIG_SHMEM is not set

# CONFIG_AIO is not set

CONFIG_EMBEDDED=y

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y

CONFIG_CC_STACKPROTECTOR_STRONG=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_BLOCK is not set

CONFIG_ARCH_MULTI_V6=y

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_ASPEED=y

CONFIG_MACH_ASPEED_G5=y

CONFIG_DEBUG_RODATA=y

CONFIG_AEABI=y

CONFIG_UACCESS_WITH_MEMCPY=y

CONFIG_SECCOMP=y

# CONFIG_ATAGS is not set

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ARM_APPENDED_DTB=y

CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_KEXEC=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_LEGACY_PTYS is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_8250=y

# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_NR_UARTS=6

CONFIG_SERIAL_8250_RUNTIME_UARTS=6

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_SERIAL_OF_PLATFORM=y

# CONFIG_HW_RANDOM is not set

# CONFIG_USB_SUPPORT is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_FIRMWARE_MEMMAP=y

CONFIG_FANOTIFY=y

CONFIG_PRINTK_TIME=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_STRIP_ASM_SYMS=y

CONFIG_PAGE_POISONING=y

CONFIG_DEBUG_KMEMLEAK=y

CONFIG_DEBUG_SHIRQ=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_WQ_WATCHDOG=y

# CONFIG_SCHED_DEBUG is not set

CONFIG_SCHED_STACK_END_CHECK=y

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y

# CONFIG_FTRACE is not set

CONFIG_MEMTEST=y

CONFIG_UBSAN=y

CONFIG_UBSAN_ALIGNMENT=y

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_LL=y

CONFIG_DEBUG_LL_UART_8250=y

CONFIG_DEBUG_UART_PHYS=0x1e784000

CONFIG_DEBUG_UART_VIRT=0xe8784000

CONFIG_EARLY_PRINTK=y

CONFIG_DEBUG_SET_MODULE_RONX=y

# CONFIG_XZ_DEC_X86 is not set

# CONFIG_XZ_DEC_POWERPC is not set

# CONFIG_XZ_DEC_IA64 is not set

# CONFIG_XZ_DEC_SPARC is not set

arch/arm/configs/multi_v5_defconfig

+6 −2
Original line number Original line Diff line number Diff line
@@ -13,6 +13,8 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_ARCH_MULTI_V7 is not set

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_MVEBU=y

CONFIG_ARCH_MVEBU=y

CONFIG_MACH_KIRKWOOD=y

CONFIG_MACH_KIRKWOOD=y

CONFIG_ARCH_ASPEED=y

CONFIG_MACH_ASPEED_G4=y

CONFIG_ARCH_MXC=y

CONFIG_ARCH_MXC=y

CONFIG_MACH_MX21ADS=y

CONFIG_MACH_MX21ADS=y

CONFIG_MACH_MX27ADS=y

CONFIG_MACH_MX27ADS=y
@@ -116,7 +118,10 @@ CONFIG_LEGACY_PTY_COUNT=16 
# CONFIG_DEVKMEM is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_RUNTIME_UARTS=2

CONFIG_SERIAL_8250_NR_UARTS=6

CONFIG_SERIAL_8250_RUNTIME_UARTS=6

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_MANY_PORTS=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_SERIAL_IMX=y

CONFIG_SERIAL_IMX=y

CONFIG_SERIAL_IMX_CONSOLE=y

CONFIG_SERIAL_IMX_CONSOLE=y
@@ -141,7 +146,6 @@ CONFIG_SENSORS_LM75=y 
CONFIG_SENSORS_LM85=y

CONFIG_SENSORS_LM85=y

CONFIG_THERMAL=y

CONFIG_THERMAL=y

CONFIG_KIRKWOOD_THERMAL=y

CONFIG_KIRKWOOD_THERMAL=y

CONFIG_WATCHDOG=y

CONFIG_ORION_WATCHDOG=y

CONFIG_ORION_WATCHDOG=y

CONFIG_IMX2_WDT=y

CONFIG_IMX2_WDT=y

# CONFIG_ABX500_CORE is not set

# CONFIG_ABX500_CORE is not set