defconfigs: bump openblocks a6 kernel to 3.18.1

And move to mvebu_v5_defconfig as kirkwood has been merged with mvebu since
3.17.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/configs/openblocks_a6_defconfig b/configs/openblocks_a6_defconfig
index 582fa300ddc4dcd58ff98c737addf26f279d7e0a..d9994f298fc1a5fab4642e5a028700dbcfaa44e4 100644 (file)
--- a/configs/openblocks_a6_defconfig
+++ b/configs/openblocks_a6_defconfig
@@ -11,15 +11,16 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 BR2_TARGET_ROOTFS_JFFS2=y
 BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K=y
 
-# Lock to 3.14 headers to avoid breaking with newer kernels
+# Lock to 3.18 headers to avoid breaking with newer kernels
 BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.14.3"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
+BR2_DEFAULT_KERNEL_VERSION="3.18.1"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
 
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14.3"
-BR2_LINUX_KERNEL_DEFCONFIG="kirkwood"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1"
+BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v5"
 BR2_LINUX_KERNEL_APPENDED_UIMAGE=y
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="kirkwood-openblocks_a6"