Cleanup: avoid trigraph warning in fs/ext2/ext2fs.c; rename UC100 -> uc100

diff --git a/CHANGELOG b/CHANGELOG
index 0d4e7198637e0998cb337efe62daeea33cc84422..c36ff3ed4f0454eacabb21e98886401e296c8bc2 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,10 @@
 Changes since U-Boot 1.1.1:
 ======================================================================
 
+* Cleanup:
+  - avoid trigraph warning in fs/ext2/ext2fs.c
+  - rename UC100 -> uc100
+
 * Add support for UC100 board
 
 * Patch by Stefan Roese, 16 Dez 2004:

diff --git a/MAKEALL b/MAKEALL
index 3ffefbdcb160d48ac0348f23d318067f84d81f0a..5b9e87f79a7a9e09276fe524074b141a94e85550 100644 (file)
--- a/MAKEALL
+++ b/MAKEALL
@@ -51,7 +51,8 @@ LIST_8xx="    \
        FPS850L         LANTEC          QS850           TQM850L         \
        GEN860T         lwmon           QS860T          TQM855L         \
        GEN860T_SC      MBX             quantum         TQM860L         \
-       UC100                                           v37             \
+                                                       uc100           \
+                                                       v37             \
 "
 
 #########################################################################

diff --git a/Makefile b/Makefile
index 9d86da15da4b1d9fda6ba33d83e5257fa26f847c..a8b5063992b85cabf15824d261fe48c15da99538 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -667,7 +667,7 @@ TTTech_config:      unconfig
        @echo "#define CONFIG_SHARP_LQ104V7DS01" >>include/config.h
        @./mkconfig -a TQM823L ppc mpc8xx tqm8xx
 
-UC100_config   :       unconfig
+uc100_config   :       unconfig
        @./mkconfig $(@:_config=) ppc mpc8xx uc100
 
 v37_config:    unconfig

diff --git a/fs/ext2/ext2fs.c b/fs/ext2/ext2fs.c
index a2d698abc7a47a64f7da0199049512ded67fc8bd..d13305bf90f9713f383dee1d4047f26131e0d4d1 100644 (file)
--- a/fs/ext2/ext2fs.c
+++ b/fs/ext2/ext2fs.c
@@ -561,7 +561,7 @@ static int ext2fs_iterate_dir (ext2fs_node_t dir, char *name, ext2fs_node_t * fn
                                        printf ("      ");
                                        break;
                                default:
-                                       printf ("<???> ");
+                                       printf ("< ? > ");
                                        break;
                                }
                                printf ("%10d %s\n",

diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index c7dbfd0d9d1e693d0435957c32697ae227d8f898..d7d18851b5c6e14a1eed9a042eeea9406c6e6d12 100644 (file)
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -53,7 +53,7 @@
 /*
  * Supported commands
  */
-#define CONFIG_COMMANDS               (CONFIG_CMD_DFL)
+#define CONFIG_COMMANDS               (CONFIG_CMD_DFL | CFG_CMD_DHCP)
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>