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

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

diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index d66bd2a..efe5807 100644 (file)
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -12,6 +12,7 @@
 #ifndef _CONFIG_DOCKSTAR_H
 #define _CONFIG_DOCKSTAR_H
 
+
 /*
  * Version number information
  */
@@ -21,7 +22,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_FEROCEON_88FR131        1       /* CPU Core subversion */
-#define CONFIG_KIRKWOOD                1       /* SOC Family Name */
 #define CONFIG_KW88F6281       1       /* SOC Name */
 #define CONFIG_MACH_DOCKSTAR   /* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* disable board lowlevel_init */
@@ -30,7 +30,6 @@
  * Commands configuration
  */
 #define CONFIG_SYS_NO_FLASH            /* Declare no flash (NOR/SPI) */
-#include <config_cmd_default.h>
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_MII
@@ -43,9 +42,6 @@
  */
 #include "mv-common.h"
 
-#undef CONFIG_SYS_PROMPT       /* previously defined in mv-common.h */
-#define CONFIG_SYS_PROMPT      "DockStar> "    /* Command Prompt */
-
 /*
  *  Environment variables configurations
  */
@@ -60,8 +56,8 @@
  * 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_ADDR                        0x80000
+#define CONFIG_ENV_OFFSET              0x80000 /* env starts here */
 
 /*
  * Default environment variables