Merge git://git.denx.de/u-boot-sunxi

[platform/kernel/u-boot.git] / include / configs / iconnect.h

diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index 26dbe53..66131cc 100644 (file)
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2009-2012
  * Wojciech Dubowik <wojciech.dubowik@neratec.com>
  * Luka Perkov <luka@openwrt.org>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _CONFIG_ICONNECT_H
@@ -56,16 +55,10 @@
        "ubifsload 0x800000 ${kernel}; "                                \
        "bootm 0x800000"
 
-#define CONFIG_MTDPARTS \
-       "mtdparts=orion_nand:"          \
-       "0x80000@0x0(uboot),"           \
-       "0x20000@0x80000(uboot_env),"   \
-       "-@0xa0000(rootfs)\0"
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "console=console=ttyS0,115200\0"        \
        "mtdids=nand0=orion_nand\0"             \
-       "mtdparts="CONFIG_MTDPARTS              \
+       "mtdparts="CONFIG_MTDPARTS_DEFAULT      \
        "kernel=/boot/uImage\0"                 \
        "bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"