aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-06-09 12:42:26 +0000
committerwdenk <wdenk>2004-06-09 12:42:26 +0000
commitaa5590b66f17a157499c71c0aa743418715534d1 (patch)
treed7230197f759212a48f7e39dc1be9d1077cc801a
parent48abe7bfab14c1e9bd4a9a1f9d2e094b6d16773c (diff)
downloadu-boot-linaro-stable-aa5590b66f17a157499c71c0aa743418715534d1.tar.gz
Patch by Thomas Viehweger, 14 May 2004:
- flash.h: more flash types added - immap_8260.h: some bits added (useful for RMII) - cmd_coninfo.c: typo corrected, printf -> puts - reduced size by replacing spaces with tab
-rw-r--r--CHANGELOG6
-rw-r--r--common/cmd_console.c4
-rw-r--r--common/cmd_itest.c2
-rw-r--r--common/cmd_jffs2.c8
-rw-r--r--common/cmd_net.c10
-rw-r--r--include/asm-ppc/immap_8260.h37
-rw-r--r--include/flash.h20
7 files changed, 67 insertions, 20 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5d2866bce..5cc42f364 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,12 @@
Changes since U-Boot 1.1.1:
======================================================================
+* Patch by Thomas Viehweger, 14 May 2004:
+ - flash.h: more flash types added
+ - immap_8260.h: some bits added (useful for RMII)
+ - cmd_coninfo.c: typo corrected, printf -> puts
+ - reduced size by replacing spaces with tab
+
* Patch by Robert Schwebel, 13 May 2004:
Add 'imgextract' command: extract one part of a multi file image.
diff --git a/common/cmd_console.c b/common/cmd_console.c
index 912234b4f..1bd3709bd 100644
--- a/common/cmd_console.c
+++ b/common/cmd_console.c
@@ -37,7 +37,7 @@ int do_coninfo (cmd_tbl_t * cmd, int flag, int argc, char *argv[])
/* Scan for valid output and input devices */
- printf ("List of available devices:\n");
+ puts ("List of available devices:\n");
for (i = 1; i <= ListNumItems (devlist); i++) {
device_t *dev = ListGetPtrToItem (devlist, i);
@@ -64,7 +64,7 @@ int do_coninfo (cmd_tbl_t * cmd, int flag, int argc, char *argv[])
U_BOOT_CMD(
coninfo, 3, 1, do_coninfo,
- "coninfo - print console devices and informations\n",
+ "coninfo - print console devices and information\n",
""
);
diff --git a/common/cmd_itest.c b/common/cmd_itest.c
index 7fba598d4..8ad134f4a 100644
--- a/common/cmd_itest.c
+++ b/common/cmd_itest.c
@@ -194,7 +194,7 @@ int do_itest ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] )
U_BOOT_CMD(
itest, 4, 0, do_itest,
- "itest - return true/false on integer compare\n",
+ "itest\t- return true/false on integer compare\n",
"[.b, .w, .l, .s] [*]value1 <op> [*]value2\n"
);
#endif /* CONFIG_COMMANDS & CFG_CMD_ITEST */
diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c
index 3cf00b8e2..085781f74 100644
--- a/common/cmd_jffs2.c
+++ b/common/cmd_jffs2.c
@@ -258,7 +258,7 @@ do_jffs2_chpart(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
U_BOOT_CMD(
fsload, 3, 0, do_jffs2_fsload,
- "fsload - load binary file from a filesystem image\n",
+ "fsload\t- load binary file from a filesystem image\n",
"[ off ] [ filename ]\n"
" - load binary file from flash bank\n"
" with offset 'off'\n"
@@ -266,20 +266,20 @@ U_BOOT_CMD(
U_BOOT_CMD(
fsinfo, 1, 1, do_jffs2_fsinfo,
- "fsinfo - print information about filesystems\n",
+ "fsinfo\t- print information about filesystems\n",
" - print information about filesystems\n"
);
U_BOOT_CMD(
ls, 2, 1, do_jffs2_ls,
- "ls - list files in a directory (default /)\n",
+ "ls\t- list files in a directory (default /)\n",
"[ directory ]\n"
" - list files in a directory.\n"
);
U_BOOT_CMD(
chpart, 2, 0, do_jffs2_chpart,
- "chpart - change active partition\n",
+ "chpart\t- change active partition\n",
" - change active partition\n"
);
diff --git a/common/cmd_net.c b/common/cmd_net.c
index 5989733f9..47f9622fa 100644
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -42,7 +42,7 @@ int do_bootp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
U_BOOT_CMD(
bootp, 3, 1, do_bootp,
- "bootp - boot image via network using BootP/TFTP protocol\n",
+ "bootp\t- boot image via network using BootP/TFTP protocol\n",
"[loadAddress] [bootfilename]\n"
);
@@ -76,7 +76,7 @@ int do_dhcp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
U_BOOT_CMD(
dhcp, 3, 1, do_dhcp,
- "dhcp - invoke DHCP client to obtain IP/boot params\n",
+ "dhcp\t- invoke DHCP client to obtain IP/boot params\n",
"\n"
);
#endif /* CFG_CMD_DHCP */
@@ -89,7 +89,7 @@ int do_nfs (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
U_BOOT_CMD(
nfs, 3, 1, do_nfs,
- "nfs - boot image via network using NFS protocol\n",
+ "nfs\t- boot image via network using NFS protocol\n",
"[loadAddress] [host ip addr:bootfilename]\n"
);
#endif /* CFG_CMD_NFS */
@@ -231,7 +231,7 @@ int do_ping (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
U_BOOT_CMD(
ping, 2, 1, do_ping,
- "ping - send ICMP ECHO_REQUEST to network host\n",
+ "ping\t- send ICMP ECHO_REQUEST to network host\n",
"pingAddress\n"
);
#endif /* CFG_CMD_PING */
@@ -275,7 +275,7 @@ int do_cdp (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
U_BOOT_CMD(
cdp, 1, 1, do_cdp,
- "cdp - Perform CDP network configuration\n",
+ "cdp\t- Perform CDP network configuration\n",
);
#endif /* CFG_CMD_CDP */
diff --git a/include/asm-ppc/immap_8260.h b/include/asm-ppc/immap_8260.h
index 1d50ce02c..4974ae56f 100644
--- a/include/asm-ppc/immap_8260.h
+++ b/include/asm-ppc/immap_8260.h
@@ -385,6 +385,33 @@ typedef struct fcc {
u_char fcc_ftirr_phy[4];
} fcc_t;
+/* Fast controllers continued
+ */
+typedef struct fcc_c {
+ uint fcc_firper;
+ uint fcc_firer;
+ uint fcc_firsr_hi;
+ uint fcc_firsr_lo;
+ u_char fcc_gfemr;
+ char res1[15];
+} fcc_c_t;
+
+/* TC Layer
+ */
+typedef struct tclayer {
+ ushort tc_tcmode;
+ ushort tc_cdsmr;
+ ushort tc_tcer;
+ ushort tc_rcc;
+ ushort tc_tcmr;
+ ushort tc_fcc;
+ ushort tc_ccc;
+ ushort tc_icc;
+ ushort tc_tcc;
+ ushort tc_ecc;
+ char res1[12];
+} tclayer_t;
+
/* I2C
*/
typedef struct i2c {
@@ -519,11 +546,17 @@ typedef struct immap {
fcc_t im_fcc[3]; /* Three FCCs */
- char res4[159];
+ char res4[32];
+ fcc_c_t im_fcc_c[3]; /* Continued FCCs */
+ char res4a[32];
+
+ tclayer_t im_tclayer[8]; /* Eight TCLayers */
+ ushort tc_tcgsr;
+ ushort tc_tcger;
/* First set of baud rate generators.
*/
- char res4a[496];
+ char res4b[236];
uint im_brgc5;
uint im_brgc6;
uint im_brgc7;
diff --git a/include/flash.h b/include/flash.h
index 5576eb354..190eb17d0 100644
--- a/include/flash.h
+++ b/include/flash.h
@@ -182,12 +182,18 @@ extern void flash_read_factory_serial(flash_info_t * info, void * buffer, int of
#define AMD_ID_DL640 0x227E227E /* 29DL640D ID (64 M, dual boot sectors)*/
#define AMD_ID_MIRROR 0x227E227E /* 1st ID word for MirrorBit family */
-#define AMD_ID_LV640U_2 0x220C220C /* 2d ID word for AM29LV640M at 0x38 */
-#define AMD_ID_LV640U_3 0x22012201 /* 3d ID word for AM29LV640M at 0x3c */
-#define AMD_ID_LV128U_2 0x22122212 /* 2d ID word for AM29LV128M at 0x38 */
-#define AMD_ID_LV128U_3 0x22002200 /* 3d ID word for AM29LV128M at 0x3c */
-#define AMD_ID_LV256U_2 0x22122212 /* 2d ID word for AM29LV256M at 0x38 */
-#define AMD_ID_LV256U_3 0x22012201 /* 3d ID word for AM29LV256M at 0x3c */
+#define AMD_ID_DL640G_2 0x22022202 /* 2nd ID word for AM29DL640G at 0x38 */
+#define AMD_ID_DL640G_3 0x22012201 /* 3rd ID word for AM29DL640G at 0x3c */
+#define AMD_ID_LV640U_2 0x220C220C /* 2nd ID word for AM29LV640M at 0x38 */
+#define AMD_ID_LV640U_3 0x22012201 /* 3rd ID word for AM29LV640M at 0x3c */
+#define AMD_ID_LV640MT_2 0x22102210 /* 2nd ID word for AM29LV640MT at 0x38 */
+#define AMD_ID_LV640MT_3 0x22012201 /* 3rd ID word for AM29LV640MT at 0x3c */
+#define AMD_ID_LV640MB_2 0x22102210 /* 2nd ID word for AM29LV640MB at 0x38 */
+#define AMD_ID_LV640MB_3 0x22002200 /* 3rd ID word for AM29LV640MB at 0x3c */
+#define AMD_ID_LV128U_2 0x22122212 /* 2nd ID word for AM29LV128M at 0x38 */
+#define AMD_ID_LV128U_3 0x22002200 /* 3rd ID word for AM29LV128M at 0x3c */
+#define AMD_ID_LV256U_2 0x22122212 /* 2nd ID word for AM29LV256M at 0x38 */
+#define AMD_ID_LV256U_3 0x22012201 /* 3rd ID word for AM29LV256M at 0x3c */
#define AMD_ID_LV320B_2 0x221A221A /* 2d ID word for AM29LV320MB at 0x38 */
#define AMD_ID_LV320B_3 0x22002200 /* 3d ID word for AM29LV320MB at 0x3c */
@@ -296,6 +302,8 @@ extern void flash_read_factory_serial(flash_info_t * info, void * buffer, int of
#define FLASH_AMDL640 0x0016 /* AMD AM29DL640D */
#define FLASH_AMD016 0x0018 /* AMD AM29F016D */
+#define FLASH_AMDL640MB 0x0019 /* AMD AM29LV640MB (64M, bottom boot sect)*/
+#define FLASH_AMDL640MT 0x001A /* AMD AM29LV640MT (64M, top boot sect) */
#define FLASH_SST200A 0x0040 /* SST 39xF200A ID ( 2M = 128K x 16 ) */
#define FLASH_SST400A 0x0042 /* SST 39xF400A ID ( 4M = 256K x 16 ) */