From a6b1135265e9aa28f3860337413eb5011acf9528 Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Wed, 2 Oct 2013 15:06:25 +0900 Subject: [PATCH 01/16] ARM: shmobile: Genmai defconfig Add a defconfig for the Genmai board. In the future this board will use a shared defconfig for multiplatform, but until CCF is implemented this will be used. Signed-off-by: Magnus Damm Signed-off-by: Simon Horman --- arch/arm/configs/genmai_defconfig | 116 ++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 arch/arm/configs/genmai_defconfig diff --git a/arch/arm/configs/genmai_defconfig b/arch/arm/configs/genmai_defconfig new file mode 100644 index 000000000000..69b1531a4c80 --- /dev/null +++ b/arch/arm/configs/genmai_defconfig @@ -0,0 +1,116 @@ +CONFIG_SYSVIPC=y +CONFIG_NO_HZ=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=16 +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_EMBEDDED=y +CONFIG_PERF_EVENTS=y +CONFIG_SLAB=y +# CONFIG_LBDAF is not set +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_ARCH_SHMOBILE=y +CONFIG_ARCH_R7S72100=y +CONFIG_MACH_GENMAI=y +# CONFIG_SH_TIMER_CMT is not set +# CONFIG_SH_TIMER_MTU2 is not set +# CONFIG_SH_TIMER_TMU is not set +# CONFIG_EM_TIMER_STI is not set +CONFIG_ARM_ERRATA_430973=y +CONFIG_ARM_ERRATA_458693=y +CONFIG_ARM_ERRATA_460075=y +CONFIG_ARM_ERRATA_743622=y +CONFIG_ARM_ERRATA_754322=y +CONFIG_AEABI=y +# CONFIG_OABI_COMPAT is not set +CONFIG_FORCE_MAX_ZONEORDER=13 +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_ARM_APPENDED_DTB=y +CONFIG_KEXEC=y +CONFIG_AUTO_ZRELADDR=y +CONFIG_VFP=y +CONFIG_NEON=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_PM_RUNTIME=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_LRO is not set +# CONFIG_INET_DIAG is not set +# CONFIG_IPV6 is not set +# CONFIG_WIRELESS is not set +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_NETDEVICES=y +# CONFIG_NET_CORE is not set +# CONFIG_NET_VENDOR_ARC is not set +# CONFIG_NET_CADENCE is not set +# CONFIG_NET_VENDOR_BROADCOM is not set +# CONFIG_NET_VENDOR_CIRRUS is not set +# CONFIG_NET_VENDOR_FARADAY is not set +# CONFIG_NET_VENDOR_INTEL is not set +# CONFIG_NET_VENDOR_MARVELL is not set +# CONFIG_NET_VENDOR_MICREL is not set +# CONFIG_NET_VENDOR_NATSEMI is not set +CONFIG_SH_ETH=y +# CONFIG_NET_VENDOR_SEEQ is not set +# CONFIG_NET_VENDOR_SMSC is not set +# CONFIG_NET_VENDOR_STMICRO is not set +# CONFIG_NET_VENDOR_VIA is not set +# CONFIG_NET_VENDOR_WIZNET is not set +# CONFIG_WLAN is not set +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO is not set +# CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_SH_SCI=y +CONFIG_SERIAL_SH_SCI_NR_UARTS=10 +CONFIG_SERIAL_SH_SCI_CONSOLE=y +# CONFIG_HW_RANDOM is not set +CONFIG_I2C_SH_MOBILE=y +# CONFIG_HWMON is not set +CONFIG_THERMAL=y +CONFIG_RCAR_THERMAL=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_DRM=y +CONFIG_DRM_RCAR_DU=y +# CONFIG_USB_SUPPORT is not set +CONFIG_MMC=y +CONFIG_MMC_SDHI=y +CONFIG_MMC_SH_MMCIF=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_RTC_CLASS=y +CONFIG_DMADEVICES=y +CONFIG_SH_DMAE=y +# CONFIG_IOMMU_SUPPORT is not set +# CONFIG_DNOTIFY is not set +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +CONFIG_CONFIGFS_FS=y +# CONFIG_MISC_FILESYSTEMS is not set +CONFIG_NFS_FS=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_NFS_V4_1=y +CONFIG_ROOT_NFS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ISO8859_1=y +# CONFIG_ENABLE_WARN_DEPRECATED is not set +# CONFIG_ENABLE_MUST_CHECK is not set +# CONFIG_ARM_UNWIND is not set +# CONFIG_CRYPTO_ANSI_CPRNG is not set +# CONFIG_CRYPTO_HW is not set From 03248fde88e37b1b043b640b1bae4fb14d4d3f23 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 3 Oct 2013 18:30:30 -0700 Subject: [PATCH 02/16] ARM: shmobile: bockw: enable CONFIG_REGULATOR CONFIG_REGULATOR is required from MMCIF and SMSC Signed-off-by: Kuninori Morimoto Signed-off-by: Simon Horman --- arch/arm/configs/bockw_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig index b38cd107f82d..6583683492bd 100644 --- a/arch/arm/configs/bockw_defconfig +++ b/arch/arm/configs/bockw_defconfig @@ -82,6 +82,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y # CONFIG_HWMON is not set CONFIG_I2C=y CONFIG_I2C_RCAR=y +CONFIG_REGULATOR=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_V4L_PLATFORM_DRIVERS=y From 851f0cda469fdba6371ab2e268462aeb8393f08e Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Thu, 10 Oct 2013 15:12:17 +0900 Subject: [PATCH 03/16] ARM: shmobile: bockw: Do not set command line in defconfig As a set towards moving shmobile towards multi-platform the kernel command line should be set in the DTB rather than in the kernel config. bockw already has the command line present in its DTS file but it was being overrirden by the kernel config. A side effect of this change is that "rw" is now present on the command line which allows a boot using nfs root to succeed in the case where userspace expects to be able to write to the root filesystem. Signed-off-by: Simon Horman --- arch/arm/configs/bockw_defconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig index 6583683492bd..b35301fa9685 100644 --- a/arch/arm/configs/bockw_defconfig +++ b/arch/arm/configs/bockw_defconfig @@ -27,8 +27,6 @@ CONFIG_HIGHMEM=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ARM_APPENDED_DTB=y -CONFIG_CMDLINE="console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp" -CONFIG_CMDLINE_FORCE=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set # CONFIG_SUSPEND is not set CONFIG_PM_RUNTIME=y From 7a14b78831d34b63032de1bb4d05221ed20cb0cf Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Thu, 10 Oct 2013 15:12:17 +0900 Subject: [PATCH 04/16] ARM: shmobile: marzen: Do not set command line in defconfig As a set towards moving shmobile towards multi-platform the kernel command line should be set in the DTB rather than in the kernel config. marzen already has the command line present in its DTS file but it was being overrirden by the kernel config. Signed-off-by: Simon Horman --- arch/arm/configs/marzen_defconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig index 5cc6360340b1..103b8755d1a6 100644 --- a/arch/arm/configs/marzen_defconfig +++ b/arch/arm/configs/marzen_defconfig @@ -30,8 +30,6 @@ CONFIG_HIGHMEM=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ARM_APPENDED_DTB=y -CONFIG_CMDLINE="console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel root=/dev/nfs ip=on" -CONFIG_CMDLINE_FORCE=y CONFIG_KEXEC=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_PM_RUNTIME=y From 5cff9680d4919a521d071b4cea33aad50a60fefa Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Thu, 10 Oct 2013 15:12:17 +0900 Subject: [PATCH 05/16] ARM: shmobile: bockw: Do not disable CONFIG_INOTIFY_USER in defconfig CONFIG_INOTIFY_USER is required for udev to function. This change brings the bockw defconfig into line with other shmobile defconfigs. Signed-off-by: Simon Horman --- arch/arm/configs/bockw_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig index b35301fa9685..63e8bcd0b2be 100644 --- a/arch/arm/configs/bockw_defconfig +++ b/arch/arm/configs/bockw_defconfig @@ -111,7 +111,6 @@ CONFIG_UIO=y CONFIG_UIO_PDRV_GENIRQ=y # CONFIG_IOMMU_SUPPORT is not set # CONFIG_DNOTIFY is not set -# CONFIG_INOTIFY_USER is not set CONFIG_TMPFS=y # CONFIG_MISC_FILESYSTEMS is not set CONFIG_NFS_FS=y From 96ffa476493d90f2c0583ed90640acc9ef9fff06 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Thu, 10 Oct 2013 15:12:17 +0900 Subject: [PATCH 06/16] ARM: shmobile: marzen: Do not disable CONFIG_INOTIFY_USER in defconfig CONFIG_INOTIFY_USER is required for udev to function. This change brings the marzen defconfig into line with other shmobile defconfigs. Signed-off-by: Simon Horman --- arch/arm/configs/marzen_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig index 103b8755d1a6..ebaaeada733d 100644 --- a/arch/arm/configs/marzen_defconfig +++ b/arch/arm/configs/marzen_defconfig @@ -108,7 +108,6 @@ CONFIG_UIO=y CONFIG_UIO_PDRV_GENIRQ=y # CONFIG_IOMMU_SUPPORT is not set # CONFIG_DNOTIFY is not set -# CONFIG_INOTIFY_USER is not set CONFIG_TMPFS=y # CONFIG_MISC_FILESYSTEMS is not set CONFIG_NFS_FS=y From 5a14cbb732a6a4eff2a0be59deba6fdb890253b8 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Thu, 10 Oct 2013 15:12:17 +0900 Subject: [PATCH 07/16] ARM: shmobile: bockw: Enable CONFIG_VFP in defconfig CONFIG_VFP is required to boot into a Debian armhf user-space. This change brings the bockw defconfig into line with other shmobile defconfigs. Signed-off-by: Simon Horman --- arch/arm/configs/bockw_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig index 63e8bcd0b2be..8b5866e6292d 100644 --- a/arch/arm/configs/bockw_defconfig +++ b/arch/arm/configs/bockw_defconfig @@ -27,6 +27,7 @@ CONFIG_HIGHMEM=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ARM_APPENDED_DTB=y +CONFIG_VFP=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set # CONFIG_SUSPEND is not set CONFIG_PM_RUNTIME=y From 8f1c35732942035ea9bfff6d6848490b0131d140 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Thu, 10 Oct 2013 15:12:17 +0900 Subject: [PATCH 08/16] ARM: shmobile: marzen: Enable CONFIG_VFP in defconfig CONFIG_VFP is required to boot into a Debian armhf user-space. This change brings the marzen defconfig into line with other shmobile defconfigs. Signed-off-by: Simon Horman --- arch/arm/configs/marzen_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig index ebaaeada733d..39e2dfebcf50 100644 --- a/arch/arm/configs/marzen_defconfig +++ b/arch/arm/configs/marzen_defconfig @@ -30,6 +30,7 @@ CONFIG_HIGHMEM=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ARM_APPENDED_DTB=y +CONFIG_VFP=y CONFIG_KEXEC=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_PM_RUNTIME=y From e14ee5deab24200e4b70fe31a8c806f0acd3d37c Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Thu, 10 Oct 2013 15:12:17 +0900 Subject: [PATCH 09/16] ARM: shmobile: bockw: Do not enable CONFIG_DEVTMPFS defconfig This change brings the bockw defconfig into line with other shmobile defconfigs. Signed-off-by: Simon Horman --- arch/arm/configs/bockw_defconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig index 8b5866e6292d..01721fafcea1 100644 --- a/arch/arm/configs/bockw_defconfig +++ b/arch/arm/configs/bockw_defconfig @@ -43,8 +43,6 @@ CONFIG_IP_PNP_DHCP=y # CONFIG_INET_DIAG is not set # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set # CONFIG_FW_LOADER is not set From 41307133da4b6f242ecbb45950b9d043c0b21b96 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Thu, 10 Oct 2013 15:12:17 +0900 Subject: [PATCH 10/16] ARM: shmobile: marzen: Do not enable CONFIG_DEVTMPFS defconfig This change brings the marzen defconfig into line with other shmobile defconfigs. Signed-off-by: Simon Horman --- arch/arm/configs/marzen_defconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig index 39e2dfebcf50..3f0f41f8ba30 100644 --- a/arch/arm/configs/marzen_defconfig +++ b/arch/arm/configs/marzen_defconfig @@ -42,8 +42,6 @@ CONFIG_IP_PNP_DHCP=y # CONFIG_IPV6 is not set # CONFIG_WIRELESS is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set # CONFIG_FW_LOADER is not set From 66d0a50ea15a5a05372e9f8bb0fa7bdc873e4179 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Thu, 10 Oct 2013 15:12:17 +0900 Subject: [PATCH 11/16] ARM: shmobile: bockw: Enable CONFIG_PACKET in defconfig CONFIG_PACKET is required for the ISC dhcpd daemon function. This change brings the bockw defconfig into line with other shmobile defconfigs. Signed-off-by: Simon Horman --- arch/arm/configs/bockw_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig index 01721fafcea1..191decba86c4 100644 --- a/arch/arm/configs/bockw_defconfig +++ b/arch/arm/configs/bockw_defconfig @@ -32,6 +32,7 @@ CONFIG_VFP=y # CONFIG_SUSPEND is not set CONFIG_PM_RUNTIME=y CONFIG_NET=y +CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_PNP=y From d4df4b2716336d24e243013c5e64b867c18ccc29 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Thu, 10 Oct 2013 15:12:17 +0900 Subject: [PATCH 12/16] ARM: shmobile: marzen: Enable CONFIG_PACKET in defconfig CONFIG_PACKET is required for the ISC dhcpd daemon function. This change brings the marzen defconfig into line with other shmobile defconfigs. Signed-off-by: Simon Horman --- arch/arm/configs/marzen_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig index 3f0f41f8ba30..a423badba241 100644 --- a/arch/arm/configs/marzen_defconfig +++ b/arch/arm/configs/marzen_defconfig @@ -35,6 +35,7 @@ CONFIG_KEXEC=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_PM_RUNTIME=y CONFIG_NET=y +CONFIG_PACKET=y CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_PNP=y From f3a3d2cfb7fb10e2e23d02abb5459ff974f2c8bd Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Thu, 10 Oct 2013 15:12:17 +0900 Subject: [PATCH 13/16] ARM: shmobile: marzen: Do not enable CONFIG_SMC911X in defconfig CONFIG_SMC911X is not needed by marzen. It appears to have been accidently enabled as well as CONFIG_SMSC911X which is needed by marzen. Signed-off-by: Simon Horman --- arch/arm/configs/marzen_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig index a423badba241..9ce38f6931e5 100644 --- a/arch/arm/configs/marzen_defconfig +++ b/arch/arm/configs/marzen_defconfig @@ -59,7 +59,6 @@ CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_SEEQ is not set -CONFIG_SMC911X=y CONFIG_SMSC911X=y # CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_WLAN is not set From 96c4f31f955bd35e33bae1e11a5e614f5c7163cd Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Sun, 29 Sep 2013 00:12:33 +0400 Subject: [PATCH 14/16] ARM: shmobile: marzen: enable HPB-DMAC in defconfig Enable HPB-DMAC driver in 'marzen_defconfig'. Signed-off-by: Sergei Shtylyov Signed-off-by: Simon Horman --- arch/arm/configs/marzen_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig index 9ce38f6931e5..dd4aced59d3c 100644 --- a/arch/arm/configs/marzen_defconfig +++ b/arch/arm/configs/marzen_defconfig @@ -103,6 +103,8 @@ CONFIG_USB_STORAGE=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=y +CONFIG_DMADEVICES=y +CONFIG_RCAR_HPB_DMAE=y CONFIG_UIO=y CONFIG_UIO_PDRV_GENIRQ=y # CONFIG_IOMMU_SUPPORT is not set From 885484af398d11c21e4927dc33a2994927de6c5a Mon Sep 17 00:00:00 2001 From: Sergei Shtylyov Date: Sun, 29 Sep 2013 00:11:28 +0400 Subject: [PATCH 15/16] ARM: shmobile: bockw: enable HPB-DMAC in defconfig Enable HPB-DMAC driver in 'bockw_defconfig'. Signed-off-by: Sergei Shtylyov Signed-off-by: Simon Horman --- arch/arm/configs/bockw_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig index 191decba86c4..8110d8a653f7 100644 --- a/arch/arm/configs/bockw_defconfig +++ b/arch/arm/configs/bockw_defconfig @@ -107,6 +107,8 @@ CONFIG_MMC_SDHI=y CONFIG_MMC_SH_MMCIF=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_RX8581=y +CONFIG_DMADEVICES=y +CONFIG_RCAR_HPB_DMAE=y CONFIG_UIO=y CONFIG_UIO_PDRV_GENIRQ=y # CONFIG_IOMMU_SUPPORT is not set From 577092b3d11530acd8467074f6ea7e2dd36b5028 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Sat, 9 Nov 2013 08:47:45 +0900 Subject: [PATCH 16/16] ARM: shmobile: kzm9d: Enable AUTO_ZRELADDR in defconfig This is required to allow the load address to be supplied as an environment variable when building a uImage. LOADADDR=0x40008000 ARCH=arm make uImage This is necessary since "ARM: shmobile: Remove legacy KZM9D board code" Signed-off-by: Simon Horman --- arch/arm/configs/kzm9d_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/kzm9d_defconfig b/arch/arm/configs/kzm9d_defconfig index 6c37f4a98eb8..e6aed23ac083 100644 --- a/arch/arm/configs/kzm9d_defconfig +++ b/arch/arm/configs/kzm9d_defconfig @@ -32,6 +32,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ARM_APPENDED_DTB=y +CONFIG_AUTO_ZRELADDR=y CONFIG_VFP=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_PM_RUNTIME=y