diff options
| -rw-r--r-- | arch/arm64/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm64/configs/defconfig | 18 |
2 files changed, 15 insertions, 4 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index dd4327f09ba4..27bbcfc7202a 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig | |||
| @@ -36,6 +36,7 @@ config ARM64 | |||
| 36 | select HAVE_GENERIC_DMA_COHERENT | 36 | select HAVE_GENERIC_DMA_COHERENT |
| 37 | select HAVE_HW_BREAKPOINT if PERF_EVENTS | 37 | select HAVE_HW_BREAKPOINT if PERF_EVENTS |
| 38 | select HAVE_MEMBLOCK | 38 | select HAVE_MEMBLOCK |
| 39 | select HAVE_PATA_PLATFORM | ||
| 39 | select HAVE_PERF_EVENTS | 40 | select HAVE_PERF_EVENTS |
| 40 | select IRQ_DOMAIN | 41 | select IRQ_DOMAIN |
| 41 | select MODULES_USE_ELF_RELA | 42 | select MODULES_USE_ELF_RELA |
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 84139be62ae6..7959dd0ca5d5 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | CONFIG_EXPERIMENTAL=y | ||
| 2 | # CONFIG_LOCALVERSION_AUTO is not set | 1 | # CONFIG_LOCALVERSION_AUTO is not set |
| 3 | # CONFIG_SWAP is not set | 2 | # CONFIG_SWAP is not set |
| 4 | CONFIG_SYSVIPC=y | 3 | CONFIG_SYSVIPC=y |
| @@ -19,6 +18,7 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 19 | CONFIG_KALLSYMS_ALL=y | 18 | CONFIG_KALLSYMS_ALL=y |
| 20 | # CONFIG_COMPAT_BRK is not set | 19 | # CONFIG_COMPAT_BRK is not set |
| 21 | CONFIG_PROFILING=y | 20 | CONFIG_PROFILING=y |
| 21 | CONFIG_JUMP_LABEL=y | ||
| 22 | CONFIG_MODULES=y | 22 | CONFIG_MODULES=y |
| 23 | CONFIG_MODULE_UNLOAD=y | 23 | CONFIG_MODULE_UNLOAD=y |
| 24 | # CONFIG_BLK_DEV_BSG is not set | 24 | # CONFIG_BLK_DEV_BSG is not set |
| @@ -27,6 +27,7 @@ CONFIG_ARCH_VEXPRESS=y | |||
| 27 | CONFIG_ARCH_XGENE=y | 27 | CONFIG_ARCH_XGENE=y |
| 28 | CONFIG_SMP=y | 28 | CONFIG_SMP=y |
| 29 | CONFIG_PREEMPT=y | 29 | CONFIG_PREEMPT=y |
| 30 | CONFIG_CMA=y | ||
| 30 | CONFIG_CMDLINE="console=ttyAMA0" | 31 | CONFIG_CMDLINE="console=ttyAMA0" |
| 31 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 32 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
| 32 | CONFIG_COMPAT=y | 33 | CONFIG_COMPAT=y |
| @@ -42,14 +43,17 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 42 | # CONFIG_WIRELESS is not set | 43 | # CONFIG_WIRELESS is not set |
| 43 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 44 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 44 | CONFIG_DEVTMPFS=y | 45 | CONFIG_DEVTMPFS=y |
| 45 | CONFIG_BLK_DEV=y | 46 | CONFIG_DMA_CMA=y |
| 46 | CONFIG_SCSI=y | 47 | CONFIG_SCSI=y |
| 47 | # CONFIG_SCSI_PROC_FS is not set | 48 | # CONFIG_SCSI_PROC_FS is not set |
| 48 | CONFIG_BLK_DEV_SD=y | 49 | CONFIG_BLK_DEV_SD=y |
| 49 | # CONFIG_SCSI_LOWLEVEL is not set | 50 | # CONFIG_SCSI_LOWLEVEL is not set |
| 51 | CONFIG_ATA=y | ||
| 52 | CONFIG_PATA_PLATFORM=y | ||
| 53 | CONFIG_PATA_OF_PLATFORM=y | ||
| 50 | CONFIG_NETDEVICES=y | 54 | CONFIG_NETDEVICES=y |
| 51 | CONFIG_MII=y | ||
| 52 | CONFIG_SMC91X=y | 55 | CONFIG_SMC91X=y |
| 56 | CONFIG_SMSC911X=y | ||
| 53 | # CONFIG_WLAN is not set | 57 | # CONFIG_WLAN is not set |
| 54 | CONFIG_INPUT_EVDEV=y | 58 | CONFIG_INPUT_EVDEV=y |
| 55 | # CONFIG_SERIO_I8042 is not set | 59 | # CONFIG_SERIO_I8042 is not set |
| @@ -62,13 +66,19 @@ CONFIG_SERIAL_AMBA_PL011=y | |||
| 62 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y | 66 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y |
| 63 | # CONFIG_HW_RANDOM is not set | 67 | # CONFIG_HW_RANDOM is not set |
| 64 | # CONFIG_HWMON is not set | 68 | # CONFIG_HWMON is not set |
| 69 | CONFIG_REGULATOR=y | ||
| 70 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | ||
| 65 | CONFIG_FB=y | 71 | CONFIG_FB=y |
| 66 | # CONFIG_VGA_CONSOLE is not set | 72 | # CONFIG_VGA_CONSOLE is not set |
| 67 | CONFIG_FRAMEBUFFER_CONSOLE=y | 73 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 68 | CONFIG_LOGO=y | 74 | CONFIG_LOGO=y |
| 69 | # CONFIG_LOGO_LINUX_MONO is not set | 75 | # CONFIG_LOGO_LINUX_MONO is not set |
| 70 | # CONFIG_LOGO_LINUX_VGA16 is not set | 76 | # CONFIG_LOGO_LINUX_VGA16 is not set |
| 71 | # CONFIG_USB_SUPPORT is not set | 77 | CONFIG_USB=y |
| 78 | CONFIG_USB_ISP1760_HCD=y | ||
| 79 | CONFIG_USB_STORAGE=y | ||
| 80 | CONFIG_MMC=y | ||
| 81 | CONFIG_MMC_ARMMMCI=y | ||
| 72 | # CONFIG_IOMMU_SUPPORT is not set | 82 | # CONFIG_IOMMU_SUPPORT is not set |
| 73 | CONFIG_EXT2_FS=y | 83 | CONFIG_EXT2_FS=y |
| 74 | CONFIG_EXT3_FS=y | 84 | CONFIG_EXT3_FS=y |
