aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/configs/cradle.h2
-rw-r--r--include/configs/csb226.h13
-rw-r--r--include/configs/dnp1110.h2
-rw-r--r--include/configs/ep7312.h2
-rw-r--r--include/configs/impa7.h2
-rw-r--r--include/configs/lart.h2
-rw-r--r--include/configs/lubbock.h2
-rw-r--r--include/configs/shannon.h2
-rw-r--r--include/configs/smdk2400.h2
-rw-r--r--include/configs/smdk2410.h2
-rw-r--r--include/configs/trab.h2
-rw-r--r--include/version.h2
12 files changed, 18 insertions, 17 deletions
diff --git a/include/configs/cradle.h b/include/configs/cradle.h
index f87f171866e..5a215e495f0 100644
--- a/include/configs/cradle.h
+++ b/include/configs/cradle.h
@@ -46,7 +46,7 @@
/*
* Size of malloc() pool
*/
-#define CONFIG_MALLOC_SIZE (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
/*
* Hardware drivers
diff --git a/include/configs/csb226.h b/include/configs/csb226.h
index 13cf60f1673..d38e9db1839 100644
--- a/include/configs/csb226.h
+++ b/include/configs/csb226.h
@@ -31,6 +31,8 @@
#ifndef __CONFIG_H
#define __CONFIG_H
+#define DEBUG 1
+
/*
* If we are developing, we might want to start U-Boot from ram
* so we MUST NOT initialize critical regs like mem-timing ...
@@ -65,13 +67,13 @@
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h>
-#define CONFIG_BOOTDELAY 10
-#define CONFIG_BOOTARGS "root=ramfs devfs=mount console=ttySA0,115200"
+#define CONFIG_BOOTDELAY 3
+#define CONFIG_BOOTARGS "root=/dev/nfs ip=bootp console=ttyS0,19200"
#define CONFIG_ETHADDR FF:FF:FF:FF:FF:FF
#define CONFIG_NETMASK 255.255.255.0
#define CONFIG_IPADDR 192.168.1.56
#define CONFIG_SERVERIP 192.168.1.2
-#define CONFIG_BOOTCOMMAND ""
+#define CONFIG_BOOTCOMMAND "bootm 0x40000"
#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
#define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */
@@ -90,8 +92,8 @@
#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
#define CFG_LONGHELP /* undef to save memory */
-#define CFG_PROMPT "=> " /* Monitor Command Prompt */
-#define CFG_CBSIZE 256 /* Console I/O Buffer Size */
+#define CFG_PROMPT "uboot> " /* Monitor Command Prompt */
+#define CFG_CBSIZE 128 /* Console I/O Buffer Size */
#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */
#define CFG_MAXARGS 16 /* max number of command args */
#define CFG_BARGSIZE CFG_CBSIZE /* Boot Argument Buffer Size */
@@ -176,7 +178,6 @@
#define CFG_MSC2_VAL 0x00000000
#define CFG_MDCNFG_VAL 0x09a909a9
#define CFG_MDREFR_VAL 0x03ca0030
-/* #define CFG_MDREFR_VAL_100 ??? */
#define CFG_MDMRS_VAL 0x00220022
/*
diff --git a/include/configs/dnp1110.h b/include/configs/dnp1110.h
index 673e7670981..5a7642b0c66 100644
--- a/include/configs/dnp1110.h
+++ b/include/configs/dnp1110.h
@@ -46,7 +46,7 @@
/*
* Size of malloc() pool
*/
-#define CONFIG_MALLOC_SIZE (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
/*
* Hardware drivers
diff --git a/include/configs/ep7312.h b/include/configs/ep7312.h
index 6b30ce12646..9a4c7e6ac41 100644
--- a/include/configs/ep7312.h
+++ b/include/configs/ep7312.h
@@ -47,7 +47,7 @@
/*
* Size of malloc() pool
*/
-#define CONFIG_MALLOC_SIZE (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
/*
* Hardware drivers
diff --git a/include/configs/impa7.h b/include/configs/impa7.h
index 99e0a4bd25f..fb35bd4e7ca 100644
--- a/include/configs/impa7.h
+++ b/include/configs/impa7.h
@@ -47,7 +47,7 @@
/*
* Size of malloc() pool
*/
-#define CONFIG_MALLOC_SIZE (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
/*
* Hardware drivers
diff --git a/include/configs/lart.h b/include/configs/lart.h
index aa2dfa048c7..32153fc5216 100644
--- a/include/configs/lart.h
+++ b/include/configs/lart.h
@@ -45,7 +45,7 @@
/*
* Size of malloc() pool
*/
-#define CONFIG_MALLOC_SIZE (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
/*
* Hardware drivers
diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h
index eb5ed2f35ae..187c33f294e 100644
--- a/include/configs/lubbock.h
+++ b/include/configs/lubbock.h
@@ -48,7 +48,7 @@
/*
* Size of malloc() pool
*/
-#define CONFIG_MALLOC_SIZE (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
/*
* Hardware drivers
diff --git a/include/configs/shannon.h b/include/configs/shannon.h
index c2817071d17..53cc8cf9be0 100644
--- a/include/configs/shannon.h
+++ b/include/configs/shannon.h
@@ -51,7 +51,7 @@
/*
* Size of malloc() pool
*/
-#define CONFIG_MALLOC_SIZE (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
/*
* Hardware drivers
diff --git a/include/configs/smdk2400.h b/include/configs/smdk2400.h
index 0cd6e7faca0..543dfb07197 100644
--- a/include/configs/smdk2400.h
+++ b/include/configs/smdk2400.h
@@ -54,7 +54,7 @@
/*
* Size of malloc() pool
*/
-#define CONFIG_MALLOC_SIZE (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
/*
* Hardware drivers
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index 8cebbec1f53..766b8feece0 100644
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -53,7 +53,7 @@
/*
* Size of malloc() pool
*/
-#define CONFIG_MALLOC_SIZE (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
/*
* Hardware drivers
diff --git a/include/configs/trab.h b/include/configs/trab.h
index 709676700f9..4472087e10a 100644
--- a/include/configs/trab.h
+++ b/include/configs/trab.h
@@ -53,7 +53,7 @@
/*
* Size of malloc() pool
*/
-#define CONFIG_MALLOC_SIZE (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
/*
* Hardware drivers
diff --git a/include/version.h b/include/version.h
index e17f651ba56..e10c62fcadc 100644
--- a/include/version.h
+++ b/include/version.h
@@ -24,6 +24,6 @@
#ifndef __VERSION_H__
#define __VERSION_H__
-#define U_BOOT_VERSION "U-Boot 0.1.0"
+#define U_BOOT_VERSION "U-Boot 0.1.1"
#endif /* __VERSION_H__ */