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 'agust@denx.de' of git://git.denx.de/u-boot-staging
[platform/kernel/u-boot.git]
/
include
/
configs
/
grsim_leon2.h
diff --git
a/include/configs/grsim_leon2.h
b/include/configs/grsim_leon2.h
index
39af8fe
..
cde2f70
100644
(file)
--- a/
include/configs/grsim_leon2.h
+++ b/
include/configs/grsim_leon2.h
@@
-91,9
+91,6
@@
#undef CONFIG_BOOTARGS
/*#define CONFIG_SYS_HUSH_PARSER 0*/
#undef CONFIG_BOOTARGS
/*#define CONFIG_SYS_HUSH_PARSER 0*/
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
#define CONFIG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
@@
-110,7
+107,7
@@
"net_nfs=tftp 40000000 ${bootfile};run nfsargs addip;bootm\0" \
"rootpath=/export/roofs\0" \
"scratch=40000000\0" \
"net_nfs=tftp 40000000 ${bootfile};run nfsargs addip;bootm\0" \
"rootpath=/export/roofs\0" \
"scratch=40000000\0" \
- "getkernel=tftpboot
\$\(scratch\)\ \$\(bootfile\
)\0" \
+ "getkernel=tftpboot
$(scratch) $(bootfile
)\0" \
"ethaddr=00:00:7A:CC:00:12\0" \
"bootargs=console=ttyS0,38400" \
""
"ethaddr=00:00:7A:CC:00:12\0" \
"bootargs=console=ttyS0,38400" \
""
@@
-118,9
+115,9
@@
#define CONFIG_GATEWAYIP 192.168.0.1
#define CONFIG_SERVERIP 192.168.0.81
#define CONFIG_IPADDR 192.168.0.80
#define CONFIG_GATEWAYIP 192.168.0.1
#define CONFIG_SERVERIP 192.168.0.81
#define CONFIG_IPADDR 192.168.0.80
-#define CONFIG_ROOTPATH
/export/rootfs
+#define CONFIG_ROOTPATH
"/export/rootfs"
#define CONFIG_HOSTNAME grxc3s1500
#define CONFIG_HOSTNAME grxc3s1500
-#define CONFIG_BOOTFILE
/uImage
+#define CONFIG_BOOTFILE
"/uImage"
#define CONFIG_BOOTCOMMAND "run flash_self"
#define CONFIG_BOOTCOMMAND "run flash_self"
@@
-229,10
+226,9
@@
#define CONFIG_SYS_RAM_SIZE CONFIG_SYS_SDRAM_SIZE
#define CONFIG_SYS_RAM_END CONFIG_SYS_SDRAM_END
#define CONFIG_SYS_RAM_SIZE CONFIG_SYS_SDRAM_SIZE
#define CONFIG_SYS_RAM_END CONFIG_SYS_SDRAM_END
-#define CONFIG_SYS_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_RAM_END - GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_PROM_SIZE (8192-
CONFIG_SYS
_GBL_DATA_SIZE)
+#define CONFIG_SYS_PROM_SIZE (8192-
GENERATED
_GBL_DATA_SIZE)
#define CONFIG_SYS_PROM_OFFSET (CONFIG_SYS_GBL_DATA_OFFSET-CONFIG_SYS_PROM_SIZE)
#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_PROM_OFFSET-32)
#define CONFIG_SYS_PROM_OFFSET (CONFIG_SYS_GBL_DATA_OFFSET-CONFIG_SYS_PROM_SIZE)
#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_PROM_OFFSET-32)
@@
-261,7
+257,6
@@
* Ethernet configuration
*/
/*#define CONFIG_GRETH 1*/
* Ethernet configuration
*/
/*#define CONFIG_GRETH 1*/
-/*#define CONFIG_NET_MULTI 1*/
/* Default HARDWARE address */
#define GRETH_HWADDR_0 0x00
/* Default HARDWARE address */
#define GRETH_HWADDR_0 0x00