summaryrefslogtreecommitdiff
path: root/arch/arm/configs/aspeed_g4_defconfig
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2021-11-01 04:22:49 +0300
committerJoel Stanley <joel@jms.id.au>2021-11-01 04:22:49 +0300
commit422a661dafedb7c94ad758cb52a0216c71cfb8ae (patch)
tree974987f5c6c104e17f5b8cef0f9fb9781f97f2cc /arch/arm/configs/aspeed_g4_defconfig
parent67eda75b77240166b021ad23222b0e9bdbfffb5b (diff)
parent52a490e0efac02f236295cf43e136a1cb3a786f7 (diff)
downloadlinux-422a661dafedb7c94ad758cb52a0216c71cfb8ae.tar.xz
Merge tag 'aspeed-5.16-defconfig' into dev-5.15
ASPEED defconfig updates for 5.16 - Add options that are enabled in the common OpenBMC kernel - Re-enable DRM_FBDEV_EMULATION - Turn on the various sensor drivers that are used in BMC systems, so we can boot test where they are modelled in Qemu
Diffstat (limited to 'arch/arm/configs/aspeed_g4_defconfig')
-rw-r--r--arch/arm/configs/aspeed_g4_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/aspeed_g4_defconfig b/arch/arm/configs/aspeed_g4_defconfig
index acaafa351d08..5d20057bdc43 100644
--- a/arch/arm/configs/aspeed_g4_defconfig
+++ b/arch/arm/configs/aspeed_g4_defconfig
@@ -48,6 +48,7 @@ CONFIG_INET=y
CONFIG_IP_MULTICAST=y
CONFIG_SYN_COOKIES=y
# CONFIG_INET_DIAG is not set
+# CONFIG_IPV6_SIT is not set
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_ADVANCED is not set
CONFIG_VLAN_8021Q=y