summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS9
-rw-r--r--common/cmd_mem.c30
-rw-r--r--include/configs/ads5121.h16
3 files changed, 33 insertions, 22 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 31493c2d4a..277ffad4aa 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -503,6 +503,11 @@ Kshitij Gupta <kshitij@ti.com>
omap1510inn ARM925T
omap1610inn ARM926EJS
+Sascha Hauer <s.hauer@pengutronix.de>
+
+ imx31_litekit i.MX31
+ imx31_phycore i.MX31
+
Gary Jennejohn <gj@denx.de>
smdk2400 ARM920T
@@ -525,6 +530,10 @@ Prakash Kumar <prakash@embedx.com>
cerf250 xscale
+Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+
+ mx31ads i.MX31
+
David Müller <d.mueller@elsoft.ch>
smdk2410 ARM920T
diff --git a/common/cmd_mem.c b/common/cmd_mem.c
index a78355c93f..4766c24600 100644
--- a/common/cmd_mem.c
+++ b/common/cmd_mem.c
@@ -1230,39 +1230,39 @@ int do_unzip ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
#if defined(CONFIG_CMD_MEMORY)
U_BOOT_CMD(
md, 3, 1, do_mem_md,
- "md - memory display\n",
+ "md - memory display\n",
"[.b, .w, .l] address [# of objects]\n - memory display\n"
);
U_BOOT_CMD(
mm, 2, 1, do_mem_mm,
- "mm - memory modify (auto-incrementing)\n",
+ "mm - memory modify (auto-incrementing)\n",
"[.b, .w, .l] address\n" " - memory modify, auto increment address\n"
);
U_BOOT_CMD(
nm, 2, 1, do_mem_nm,
- "nm - memory modify (constant address)\n",
+ "nm - memory modify (constant address)\n",
"[.b, .w, .l] address\n - memory modify, read and keep address\n"
);
U_BOOT_CMD(
mw, 4, 1, do_mem_mw,
- "mw - memory write (fill)\n",
- "[.b, .w, .l] address value [count]\n - write memory\n"
+ "mw - memory write (fill)\n",
+ "[.b, .w, .l] address value [count]\n - write memory\n"
);
U_BOOT_CMD(
cp, 4, 1, do_mem_cp,
- "cp - memory copy\n",
+ "cp - memory copy\n",
"[.b, .w, .l] source target count\n - copy memory\n"
);
U_BOOT_CMD(
cmp, 4, 1, do_mem_cmp,
- "cmp - memory compare\n",
+ "cmp - memory compare\n",
"[.b, .w, .l] addr1 addr2 count\n - compare memory\n"
);
@@ -1270,7 +1270,7 @@ U_BOOT_CMD(
U_BOOT_CMD(
crc32, 4, 1, do_mem_crc,
- "crc32 - checksum calculation\n",
+ "crc32 - checksum calculation\n",
"address count [addr]\n - compute CRC32 checksum [save at addr]\n"
);
@@ -1278,7 +1278,7 @@ U_BOOT_CMD(
U_BOOT_CMD(
crc32, 5, 1, do_mem_crc,
- "crc32 - checksum calculation\n",
+ "crc32 - checksum calculation\n",
"address count [addr]\n - compute CRC32 checksum [save at addr]\n"
"-v address count crc\n - verify crc of memory area\n"
);
@@ -1287,14 +1287,14 @@ U_BOOT_CMD(
U_BOOT_CMD(
base, 2, 1, do_mem_base,
- "base - print or set address offset\n",
+ "base - print or set address offset\n",
"\n - print address offset for memory commands\n"
"base off\n - set address offset for memory commands to 'off'\n"
);
U_BOOT_CMD(
loop, 3, 1, do_mem_loop,
- "loop - infinite loop on address range\n",
+ "loop - infinite loop on address range\n",
"[.b, .w, .l] address number_of_objects\n"
" - loop on a set of addresses\n"
);
@@ -1302,7 +1302,7 @@ U_BOOT_CMD(
#ifdef CONFIG_LOOPW
U_BOOT_CMD(
loopw, 4, 1, do_mem_loopw,
- "loopw - infinite write loop on address range\n",
+ "loopw - infinite write loop on address range\n",
"[.b, .w, .l] address number_of_objects data_to_write\n"
" - loop on a set of addresses\n"
);
@@ -1310,7 +1310,7 @@ U_BOOT_CMD(
U_BOOT_CMD(
mtest, 4, 1, do_mem_mtest,
- "mtest - simple RAM test\n",
+ "mtest - simple RAM test\n",
"[start [end [pattern]]]\n"
" - simple RAM read/write test\n"
);
@@ -1318,13 +1318,13 @@ U_BOOT_CMD(
#ifdef CONFIG_MX_CYCLIC
U_BOOT_CMD(
mdc, 4, 1, do_mem_mdc,
- "mdc - memory display cyclic\n",
+ "mdc - memory display cyclic\n",
"[.b, .w, .l] address count delay(ms)\n - memory display cyclic\n"
);
U_BOOT_CMD(
mwc, 4, 1, do_mem_mwc,
- "mwc - memory write cyclic\n",
+ "mwc - memory write cyclic\n",
"[.b, .w, .l] address value delay(ms)\n - memory write cyclic\n"
);
#endif /* CONFIG_MX_CYCLIC */
diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h
index d129ea317d..5f74afb0d7 100644
--- a/include/configs/ads5121.h
+++ b/include/configs/ads5121.h
@@ -435,16 +435,18 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"u-boot_addr_r=200000\0" \
- "kernel_addr_r=300000\0" \
- "fdt_addr_r=400000\0" \
- "ramdisk_addr_r=500000\0" \
+ "kernel_addr_r=600000\0" \
+ "fdt_addr_r=880000\0" \
+ "ramdisk_addr_r=900000\0" \
"u-boot_addr=FFF00000\0" \
- "kernel_addr=FC040000\0" \
- "fdt_addr=FC2C0000\0" \
- "ramdisk_addr=FC300000\0" \
+ "kernel_addr=FFC40000\0" \
+ "fdt_addr=FFEC0000\0" \
+ "ramdisk_addr=FC040000\0" \
"ramdiskfile=ads5121/uRamdisk\0" \
- "fdtfile=ads5121/ads5121.dtb\0" \
"u-boot=ads5121/u-boot.bin\0" \
+ "bootfile=ads5121/uImage\0" \
+ "fdtfile=ads5121/ads5121.dtb\0" \
+ "rootpath=/opt/eldk/ppc_6xx\n" \
"netdev=eth0\0" \
"consdev=ttyPSC0\0" \
"nfsargs=setenv bootargs root=/dev/nfs rw " \
OpenPOWER on IntegriCloud