diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-04-26 00:07:26 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-04-26 00:07:26 +0200 |
| commit | 57533b881ed55eb676c56f458c1a1e84b79cd4ee (patch) | |
| tree | 7cae853acd2ca5a5838d43451683633c94d57613 /include | |
| parent | fe06d43b504af9ebc6c9bfe511853de6e42f257e (diff) | |
| parent | b2115757403beef0ac6bc2c6c3b24f31256a75d2 (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/MPC8313ERDB.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC8315ERDB.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC8323ERDB.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC832XEMDS.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC8349EMDS.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC8349ITX.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC8360EMDS.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC837XEMDS.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC837XERDB.h | 2 | ||||
| -rw-r--r-- | include/configs/sbc8349.h | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 9576fa59e28..6eec240e9f0 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -543,7 +543,7 @@ #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ #define CONFIG_FDTFILE mpc8313erdb.dtb -#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */ +#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */ #define CONFIG_BOOTDELAY -1 /* -1 disables auto-boot */ #define CONFIG_BAUDRATE 115200 diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index 432fb311de4..e0a887c7e65 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -531,7 +531,7 @@ #define CONFIG_BAUDRATE 115200 -#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */ +#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */ #define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h index 92d7aa42b40..32f57ac7dad 100644 --- a/include/configs/MPC8323ERDB.h +++ b/include/configs/MPC8323ERDB.h @@ -568,7 +568,7 @@ #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ #define CONFIG_FDTFILE mpc832x_rdb.dtb -#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */ +#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */ #define CONFIG_BOOTDELAY -1 /* -1 disables auto-boot */ #define CONFIG_BAUDRATE 115200 diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h index be2ab455843..ddefa5e9190 100644 --- a/include/configs/MPC832XEMDS.h +++ b/include/configs/MPC832XEMDS.h @@ -572,7 +572,7 @@ #define CONFIG_BAUDRATE 115200 -#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */ +#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */ #define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 07fefecf748..364ffac5ea1 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -709,7 +709,7 @@ #define CONFIG_GATEWAYIP 192.168.1.1 #define CONFIG_NETMASK 255.255.255.0 -#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */ +#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */ #define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 6b8b74dd964..be8850a7e70 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -474,7 +474,7 @@ boards, we say we have two, but don't display a message if we find only one. */ #define CFG_PROMPT_HUSH_PS2 "> " #define CFG_LOAD_ADDR 0x2000000 /* default load address */ -#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */ +#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */ #ifdef CONFIG_MPC8349ITX #define CFG_PROMPT "MPC8349E-mITX> " /* Monitor Command Prompt */ diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h index 46451c4c981..983575eb0c1 100644 --- a/include/configs/MPC8360EMDS.h +++ b/include/configs/MPC8360EMDS.h @@ -605,7 +605,7 @@ #define CONFIG_BAUDRATE 115200 -#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */ +#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */ #define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 7fc0f7ef854..e92493ae4db 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -595,7 +595,7 @@ #define CONFIG_BAUDRATE 115200 -#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */ +#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */ #define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index c698ff84c65..f7e6fd2c52b 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -629,7 +629,7 @@ #define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */ #define CONFIG_FDTFILE mpc8379_rdb.dtb -#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */ +#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */ #define CONFIG_BOOTDELAY -1 /* -1 disables auto-boot */ #define CONFIG_BAUDRATE 115200 diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index 133cbcf1717..0ebc674a69a 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -662,7 +662,7 @@ #define CONFIG_GATEWAYIP 192.168.1.1 #define CONFIG_NETMASK 255.255.255.0 -#define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */ +#define CONFIG_LOADADDR 500000 /* default location for tftp and bootm */ #define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */ #undef CONFIG_BOOTARGS /* the boot command will set bootargs */ |