diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-03-23 00:57:40 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-03-23 00:57:40 +0100 |
| commit | 47310715f4316a3677b206acf9f83adb7949ecd1 (patch) | |
| tree | 9f8fd6f54af0eb48a9eb7f2c3c5a2d2eec3924e4 /include | |
| parent | e334e05ba0a6bf38eccadde696cf74b1a52a5021 (diff) | |
| parent | a5cc5555ccee596908a7d8cf22a104f6b993bfd5 (diff) | |
| download | u-boot-imx-47310715f4316a3677b206acf9f83adb7949ecd1.zip u-boot-imx-47310715f4316a3677b206acf9f83adb7949ecd1.tar.gz u-boot-imx-47310715f4316a3677b206acf9f83adb7949ecd1.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-tq-group
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/TQM5200.h | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index 9a0e9b8..b36c826 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -252,12 +252,22 @@ "setup=tftp 200000 cam5200/setup.img; autoscr 200000\0" #endif +#if defined(CONFIG_TQM5200_B) +#define ENV_FLASH_LAYOUT \ + "fdt_addr=FC100000\0" \ + "kernel_addr=FC140000\0" \ + "ramdisk_addr=FC600000\0" +#else /* !CONFIG_TQM5200_B */ +#define ENV_FLASH_LAYOUT \ + "fdt_addr=FC0A0000\0" \ + "kernel_addr=FC0C0000\0" \ + "ramdisk_addr=FC300000\0" +#endif + #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "console=ttyPSC0\0" \ - "fdt_addr=FC0A0000\0" \ - "kernel_addr=FC0C0000\0" \ - "ramdisk_addr=FC300000\0" \ + ENV_FLASH_LAYOUT \ "kernel_addr_r=400000\0" \ "fdt_addr_r=600000\0" \ "rootpath=/opt/eldk/ppc_6xx\0" \ @@ -400,8 +410,9 @@ # if defined(CONFIG_TQM5200_B) # if defined(CFG_LOWBOOT) # define MTDPARTS_DEFAULT "mtdparts=TQM5200-0:1m(firmware)," \ - "1536k(kernel)," \ - "3584k(small-fs)," \ + "256k(dtb)," \ + "2304k(kernel)," \ + "2560k(small-fs)," \ "2m(initrd)," \ "8m(misc)," \ "16m(big-fs)" |