aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-12-19 09:58:11 +0000
committerwdenk <wdenk>2004-12-19 09:58:11 +0000
commitec0aee7b68348ae0215f621ba488a5578c79b56e (patch)
tree009e0b0b163193bf5e51826161d7c9ff780e52bb
parentf7d1572bf51619554f278cb543ef0445baa3a1f8 (diff)
downloadu-boot-linaro-stable-ec0aee7b68348ae0215f621ba488a5578c79b56e.tar.gz
Cleanup: avoid trigraph warning in fs/ext2/ext2fs.c; rename UC100 -> uc100
-rw-r--r--CHANGELOG4
-rw-r--r--MAKEALL3
-rw-r--r--Makefile2
-rw-r--r--fs/ext2/ext2fs.c2
-rw-r--r--include/configs/inka4x0.h2
5 files changed, 9 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0d4e71986..c36ff3ed4 100644
--- 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 3ffefbdcb..5b9e87f79 100644
--- 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 9d86da15d..a8b506399 100644
--- 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 a2d698abc..d13305bf9 100644
--- 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 c7dbfd0d9..d7d18851b 100644
--- 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>