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-video
[platform/kernel/u-boot.git]
/
include
/
configs
/
balloon3.h
diff --git
a/include/configs/balloon3.h
b/include/configs/balloon3.h
index
ae60f2e
..
b604b52
100644
(file)
--- a/
include/configs/balloon3.h
+++ b/
include/configs/balloon3.h
@@
-33,7
+33,6
@@
*/
#define CONFIG_ENV_OVERWRITE
#define CONFIG_SYS_MALLOC_LEN (128*1024)
*/
#define CONFIG_ENV_OVERWRITE
#define CONFIG_SYS_MALLOC_LEN (128*1024)
-#define CONFIG_SYS_GBL_DATA_SIZE 128
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_BOOTCOMMAND \
"fpga load 0x0 0x50000 0x62638; " \
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_BOOTCOMMAND \
"fpga load 0x0 0x50000 0x62638; " \
@@
-63,6
+62,7
@@
#include <config_cmd_default.h>
#undef CONFIG_CMD_NET
#include <config_cmd_default.h>
#undef CONFIG_CMD_NET
+#undef CONFIG_CMD_NFS
#undef CONFIG_CMD_ENV
#undef CONFIG_CMD_IMLS
#define CONFIG_CMD_USB
#undef CONFIG_CMD_ENV
#undef CONFIG_CMD_IMLS
#define CONFIG_CMD_USB
@@
-133,7
+133,7
@@
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
#define CONFIG_SYS_INIT_SP_ADDR \
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
#define CONFIG_SYS_INIT_SP_ADDR \
- (PHYS_SDRAM_1 +
CONFIG_SYS
_GBL_DATA_SIZE + 2048)
+ (PHYS_SDRAM_1 +
GENERATED
_GBL_DATA_SIZE + 2048)
/*
* NOR FLASH
/*
* NOR FLASH