summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorapopple <alistair@popple.id.au>2015-10-13 08:56:22 +0300
committerapopple <alistair@popple.id.au>2015-10-13 08:56:22 +0300
commitabab3a8fe366e6c8678c1b9148b3753dd2e45a6a (patch)
tree09a1067f53ae17ca2cc16eadfaf0d57a8153d939
parentc487e3f8cb154367dfb8fe6ea95e75d31c6e2cb6 (diff)
parentb37ac720f84425880ec6a130d28773d253fc058b (diff)
downloadlinux-abab3a8fe366e6c8678c1b9148b3753dd2e45a6a.tar.xz
Merge pull request #2 from cyrilbur-ibm/openbmc-dev
arm/aspeed_defconfig: Add required options to boot with systemd
-rw-r--r--arch/arm/configs/aspeed_defconfig11
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/configs/aspeed_defconfig b/arch/arm/configs/aspeed_defconfig
index 4d3e20cbf8cc..dfd5707edcc0 100644
--- a/arch/arm/configs/aspeed_defconfig
+++ b/arch/arm/configs/aspeed_defconfig
@@ -1,12 +1,12 @@
CONFIG_CROSS_COMPILE="arm-linux-"
-CONFIG_LOCALVERSION="-joel"
CONFIG_KERNEL_XZ=y
# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
+CONFIG_FHANDLE=y
CONFIG_IRQ_DOMAIN_DEBUG=y
CONFIG_LOG_BUF_SHIFT=14
+CONFIG_CGROUPS=y
CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="~/ibm/openbmc/buildroot-arm-rootfs.cpio.gz"
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_KALLSYMS_ALL=y
CONFIG_EMBEDDED=y
@@ -43,6 +43,9 @@ CONFIG_IP_PNP_RARP=y
# CONFIG_INET_XFRM_MODE_BEET is not set
# CONFIG_INET_DIAG is not set
# CONFIG_IPV6 is not set
+CONFIG_NETFILTER=y
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=y
CONFIG_NET_NCSI=y
# CONFIG_WIRELESS is not set
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
@@ -148,7 +151,7 @@ CONFIG_USB_STORAGE=y
CONFIG_USB_SERIAL=y
CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_GADGET=y
-CONFIG_USB_G_SERIAL=y
+CONFIG_USB_G_SERIAL=m
CONFIG_MMC=y
CONFIG_MMC_SPI=y
CONFIG_NEW_LEDS=y
@@ -169,8 +172,10 @@ CONFIG_PWM=y
CONFIG_FIRMWARE_MEMMAP=y
CONFIG_EXT4_FS=y
CONFIG_FANOTIFY=y
+CONFIG_AUTOFS4_FS=y
CONFIG_VFAT_FS=y
CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
CONFIG_JFFS2_FS=y
CONFIG_JFFS2_SUMMARY=y
CONFIG_SQUASHFS=y