Skip to content

Commit 2d39ad6

Browse files
wildea01ctmarinas
authored andcommitted
arm64: defconfig: update defconfig for 3.18
This patch enables a few things missing from our defconfig: - PCI and MSI, including support for the x-gene host controller - BPF JIT - SPI, GPIO and MMC for Seattle - GPIO for x-gene - USB for Juno - RTC It also removes HMC_DRV, which was being built as a module for some reason. Signed-off-by: Will Deacon <[email protected]> Signed-off-by: Catalin Marinas <[email protected]>
1 parent 97b56be commit 2d39ad6

File tree

1 file changed

+24
-2
lines changed

1 file changed

+24
-2
lines changed

arch/arm64/configs/defconfig

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ CONFIG_MODULE_UNLOAD=y
3535
CONFIG_ARCH_THUNDER=y
3636
CONFIG_ARCH_VEXPRESS=y
3737
CONFIG_ARCH_XGENE=y
38+
CONFIG_PCI=y
39+
CONFIG_PCI_MSI=y
40+
CONFIG_PCI_XGENE=y
3841
CONFIG_SMP=y
3942
CONFIG_PREEMPT=y
4043
CONFIG_KSM=y
@@ -52,6 +55,7 @@ CONFIG_IP_PNP_DHCP=y
5255
CONFIG_IP_PNP_BOOTP=y
5356
# CONFIG_INET_LRO is not set
5457
# CONFIG_IPV6 is not set
58+
CONFIG_BPF_JIT=y
5559
# CONFIG_WIRELESS is not set
5660
CONFIG_NET_9P=y
5761
CONFIG_NET_9P_VIRTIO=y
@@ -65,16 +69,17 @@ CONFIG_VIRTIO_BLK=y
6569
CONFIG_BLK_DEV_SD=y
6670
# CONFIG_SCSI_LOWLEVEL is not set
6771
CONFIG_ATA=y
72+
CONFIG_SATA_AHCI=y
73+
CONFIG_SATA_AHCI_PLATFORM=y
6874
CONFIG_AHCI_XGENE=y
69-
CONFIG_PHY_XGENE=y
7075
CONFIG_PATA_PLATFORM=y
7176
CONFIG_PATA_OF_PLATFORM=y
7277
CONFIG_NETDEVICES=y
7378
CONFIG_TUN=y
7479
CONFIG_VIRTIO_NET=y
80+
CONFIG_NET_XGENE=y
7581
CONFIG_SMC91X=y
7682
CONFIG_SMSC911X=y
77-
CONFIG_NET_XGENE=y
7883
# CONFIG_WLAN is not set
7984
CONFIG_INPUT_EVDEV=y
8085
# CONFIG_SERIO_SERPORT is not set
@@ -87,6 +92,11 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
8792
CONFIG_SERIAL_OF_PLATFORM=y
8893
CONFIG_VIRTIO_CONSOLE=y
8994
# CONFIG_HW_RANDOM is not set
95+
# CONFIG_HMC_DRV is not set
96+
CONFIG_SPI=y
97+
CONFIG_SPI_PL022=y
98+
CONFIG_GPIO_PL061=y
99+
CONFIG_GPIO_XGENE=y
90100
# CONFIG_HWMON is not set
91101
CONFIG_REGULATOR=y
92102
CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -97,13 +107,25 @@ CONFIG_LOGO=y
97107
# CONFIG_LOGO_LINUX_MONO is not set
98108
# CONFIG_LOGO_LINUX_VGA16 is not set
99109
CONFIG_USB=y
110+
CONFIG_USB_EHCI_HCD=y
111+
CONFIG_USB_EHCI_HCD_PLATFORM=y
100112
CONFIG_USB_ISP1760_HCD=y
113+
CONFIG_USB_OHCI_HCD=y
114+
CONFIG_USB_OHCI_HCD_PLATFORM=y
101115
CONFIG_USB_STORAGE=y
116+
CONFIG_USB_ULPI=y
102117
CONFIG_MMC=y
103118
CONFIG_MMC_ARMMMCI=y
119+
CONFIG_MMC_SDHCI=y
120+
CONFIG_MMC_SDHCI_PLTFM=y
121+
CONFIG_MMC_SPI=y
122+
CONFIG_RTC_CLASS=y
123+
CONFIG_RTC_DRV_EFI=y
124+
CONFIG_RTC_DRV_XGENE=y
104125
CONFIG_VIRTIO_BALLOON=y
105126
CONFIG_VIRTIO_MMIO=y
106127
# CONFIG_IOMMU_SUPPORT is not set
128+
CONFIG_PHY_XGENE=y
107129
CONFIG_EXT2_FS=y
108130
CONFIG_EXT3_FS=y
109131
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

0 commit comments

Comments
 (0)