diff options
| author | Olof Johansson <olof@lixom.net> | 2016-02-25 04:23:54 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-02-25 04:23:54 +0300 |
| commit | 82767de15a43ba9c6bea1cd57782576c67dc88dd (patch) | |
| tree | 4090bc42535fc10ccebec349a9f71ece9d632e72 | |
| parent | 1a2a8de6909ff0e6867767d8fa2b75c9275cfa6f (diff) | |
| parent | 31d74b2bf0c921276a1e987ca5371e2f79a783c2 (diff) | |
| download | linux-82767de15a43ba9c6bea1cd57782576c67dc88dd.tar.xz | |
Merge tag 'socfpga_defconfig_for_v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/defconfig
SoCFPGA defconfig update for v4.6
-Enable initrd/initramfs support
* tag 'socfpga_defconfig_for_v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
ARM: socfpga_defconfig: enable support for initramfs/initrd support
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/configs/socfpga_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig index f7f4e2e3cc33..753f1a5defc7 100644 --- a/arch/arm/configs/socfpga_defconfig +++ b/arch/arm/configs/socfpga_defconfig @@ -7,6 +7,7 @@ CONFIG_LOG_BUF_SHIFT=14 CONFIG_CGROUPS=y CONFIG_CPUSETS=y CONFIG_NAMESPACES=y +CONFIG_BLK_DEV_INITRD=y CONFIG_EMBEDDED=y CONFIG_PROFILING=y CONFIG_OPROFILE=y @@ -107,4 +108,3 @@ CONFIG_DETECT_HUNG_TASK=y # CONFIG_SCHED_DEBUG is not set CONFIG_ENABLE_DEFAULT_TRACERS=y CONFIG_DEBUG_USER=y -CONFIG_XZ_DEC=y |