projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
[platform/kernel/u-boot.git]
/
include
/
configs
/
dockstar.h
diff --git
a/include/configs/dockstar.h
b/include/configs/dockstar.h
index
46a42b3
..
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
#ifndef _CONFIG_DOCKSTAR_H
#define _CONFIG_DOCKSTAR_H
+
/*
* Version number information
*/
/*
* Version number information
*/
@@
-29,7
+30,6
@@
* Commands configuration
*/
#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
* 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
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_ENV
#define CONFIG_CMD_MII
@@
-42,9
+42,6
@@
*/
#include "mv-common.h"
*/
#include "mv-common.h"
-#undef CONFIG_SYS_PROMPT /* previously defined in mv-common.h */
-#define CONFIG_SYS_PROMPT "DockStar> " /* Command Prompt */
-
/*
* Environment variables configurations
*/
/*
* Environment variables configurations
*/
@@
-59,8
+56,8
@@
* it has to be rounded to sector size
*/
#define CONFIG_ENV_SIZE 0x20000 /* 128k */
* it has to be rounded to sector size
*/
#define CONFIG_ENV_SIZE 0x20000 /* 128k */
-#define CONFIG_ENV_ADDR 0x
6
0000
-#define CONFIG_ENV_OFFSET 0x
6
0000 /* env starts here */
+#define CONFIG_ENV_ADDR 0x
8
0000
+#define CONFIG_ENV_OFFSET 0x
8
0000 /* env starts here */
/*
* Default environment variables
/*
* Default environment variables