Merge branch 'master' of git://git.denx.de/u-boot-socfpga

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

diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index 69429ed34e4e865f966785a5ad764fc69d2a2b3f..04dd0f68c370bff3882c41d896cff0c059e73853 100644 (file)
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2010  Eric C. Cooper <ecc@cmu.edu>
  *
@@ -5,8 +6,6 @@
  * Prafulla Wadaskar <prafulla@marvell.com>
  * (C) Copyright 2009
  * Marvell Semiconductor <www.marvell.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _CONFIG_DOCKSTAR_H
@@ -17,14 +16,8 @@
  */
 #define CONFIG_FEROCEON_88FR131        1       /* CPU Core subversion */
 #define CONFIG_KW88F6281       1       /* SOC Name */
-#define CONFIG_MACH_DOCKSTAR   /* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */
 
-/*
- * Commands configuration
- */
-#define CONFIG_CMD_ENV
-#define CONFIG_CMD_NAND
 /*
  * mv-common.h should be defined after CMD configs since it used them
  * to enable certain macros
@@ -34,19 +27,10 @@
 /*
  *  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                        0x80000
-#define CONFIG_ENV_OFFSET              0x80000 /* env starts here */
 
 /*
  * Default environment variables
@@ -59,12 +43,10 @@
        "ubifsload 0x1100000 ${initrd}; " \
        "bootm 0x800000 0x1100000"
 
-#define CONFIG_MTDPARTS                "mtdparts=orion_nand:1m(uboot),-(root)\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" \
        "initrd=/boot/uInitrd\0" \
        "bootargs_root=ubi.mtd=1 root=ubi0:root rootfstype=ubifs ro\0"
@@ -80,12 +62,5 @@
 /*
  * File system
  */
-#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
-#define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_CMD_MTDPARTS
-#define CONFIG_LZO
 
 #endif /* _CONFIG_DOCKSTAR_H */