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 b27b202..efe5807 100644 (file)
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -12,7 +12,6 @@
 #ifndef _CONFIG_DOCKSTAR_H
 #define _CONFIG_DOCKSTAR_H
 
-#define CONFIG_SYS_GENERIC_BOARD
 
 /*
  * Version number information
@@ -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