apalis/colibri imx6: provide proper fdtfile value

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

diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index 633941b7dd5655bf1f9334d6d0d7c7b11968aa0b..87113d7805c1167bae7466706ed36fdf17e84da6 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
@@ -25,16 +24,10 @@
  * Compression configuration
  */
 #define CONFIG_BZIP2
-#define CONFIG_LZMA
-#define CONFIG_LZO
 
 /*
  * Commands configuration
  */
-#define CONFIG_SYS_NO_FLASH            /* declare no flash (NOR/SPI) */
-#define CONFIG_SYS_MVFS
-#define CONFIG_CMD_ENV
-#define CONFIG_CMD_NAND
 
 /*
  * mv-common.h should be defined after CMD configs since it used them
@@ -46,10 +39,7 @@
  * Environment variables configuration
  */
 #ifdef CONFIG_CMD_NAND
-#define CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_SECT_SIZE   0x20000
-#else
-#define CONFIG_ENV_IS_NOWHERE
 #endif
 #define CONFIG_ENV_SIZE                0x20000
 #define CONFIG_ENV_OFFSET      0x80000
@@ -64,16 +54,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"
 
@@ -89,11 +73,5 @@
 /*
  * File system
  */
-#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_CMD_MTDPARTS
 
 #endif /* _CONFIG_ICONNECT_H */