Merge tag 'u-boot-imx-20190426' of git://git.denx.de/u-boot-imx

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

diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index 72113144b3cdd6464c5558238bc14fc353c80380..62d8862cc755f25e90930b4d71d71d06f2042aea 100644 (file)
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2009
  * Net Insight <www.netinsight.net>
@@ -7,51 +8,21 @@
  * (C) Copyright 2009
  * Marvell Semiconductor <www.marvell.com>
  * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _CONFIG_OPENRD_H
 #define _CONFIG_OPENRD_H
 
-/*
- * Version number information
- */
-#ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE
-# define CONFIG_IDENT_STRING   "\nOpenRD-Ultimate"
-#else
-# ifdef CONFIG_BOARD_IS_OPENRD_CLIENT
-#  define CONFIG_IDENT_STRING  "\nOpenRD-Client"
-# else
-#  ifdef CONFIG_BOARD_IS_OPENRD_BASE
-#   define CONFIG_IDENT_STRING "\nOpenRD-Base"
-#  else
-#   error Unknown OpenRD board specified
-#  endif
-# endif
-#endif
-
 /*
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_SHEEVA_88SV131  1       /* CPU Core subversion */
 #define CONFIG_KW88F6281       1       /* SOC Name */
-#define CONFIG_MACH_OPENRD_BASE        /* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */
 
 /*
  * Commands configuration
  */
-#define CONFIG_SYS_NO_FLASH            /* Declare no flash (NOR/SPI) */
-#define CONFIG_SYS_MVFS
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ENV
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_USB
-#define CONFIG_CMD_IDE
 
 /*
  * mv-common.h should be defined after CMD configs since it used them
@@ -63,18 +34,14 @@
  *  Environment variables configurations
  */
 #ifdef CONFIG_CMD_NAND
-#define CONFIG_ENV_IS_IN_NAND          1
 #define CONFIG_ENV_SECT_SIZE           0x20000 /* 128K */
-#else
-#define CONFIG_ENV_IS_NOWHERE          1       /* if env in SDRAM */
 #endif
 /*
  * max 4k env size is enough, but in case of nand
  * it has to be rounded to sector size
  */
 #define CONFIG_ENV_SIZE                        0x20000 /* 128k */
-#define CONFIG_ENV_ADDR                        0x60000
-#define CONFIG_ENV_OFFSET              0x60000 /* env starts here */
+#define CONFIG_ENV_OFFSET              0x80000 /* env starts here */
 /*
  * Environment is right behind U-Boot in flash. Make sure U-Boot
  * doesn't grow into the environment area.
@@ -88,18 +55,11 @@
        "setenv bootargs ${x_bootargs} ${x_bootargs_root}; "    \
        "${x_bootcmd_usb}; bootm 0x6400000;"
 
-#define MTDIDS_DEFAULT         "nand0=nand_mtd"
-#define MTDPARTS_DEFAULT       "mtdparts=nand_mtd:0x100000@0x000000(uboot),"\
-       "0x400000@0x100000(uImage),"\
-       "0x1fb00000@0x500000(rootfs)"
-
-#define CONFIG_EXTRA_ENV_SETTINGS      "x_bootargs=console"            \
-       "=ttyS0,115200 "MTDPARTS_DEFAULT " rw ubi.mtd=2,2048\0"         \
+#define CONFIG_EXTRA_ENV_SETTINGS      "x_bootargs=console=ttyS0,115200 " \
+       CONFIG_MTDPARTS_DEFAULT " rw ubi.mtd=2,2048\0" \
        "x_bootcmd_kernel=nand read 0x6400000 0x100000 0x300000\0"      \
        "x_bootcmd_usb=usb start\0"                                     \
-       "x_bootargs_root=root=ubi0:rootfs rootfstype=ubifs\0"           \
-       "mtdids="MTDIDS_DEFAULT"\0"                                     \
-       "mtdparts="MTDPARTS_DEFAULT"\0"
+       "x_bootargs_root=root=ubi0:rootfs rootfstype=ubifs\0"
 
 /*
  * Ethernet Driver configuration
@@ -128,8 +88,6 @@
 #endif /*CONFIG_MVSATA_IDE*/
 
 #ifdef CONFIG_CMD_MMC
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_MVEBU_MMC
 #define CONFIG_SYS_MMC_BASE KW_SDIO_BASE
 #endif /* CONFIG_CMD_MMC */