summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-08-18 23:27:33 +0200
committerWolfgang Denk <wd@pollux.denx.de>2006-08-18 23:27:33 +0200
commit5196a7a03bc436435787e1ad7044af94d93a5448 (patch)
treeef182967d2ebb2570e3cdc4c289dabe84ac07b4a
parent6d3bc9b8cfd5d60708f95ded007cda7bc29ac089 (diff)
downloadu-boot-imx-5196a7a03bc436435787e1ad7044af94d93a5448.zip
u-boot-imx-5196a7a03bc436435787e1ad7044af94d93a5448.tar.gz
u-boot-imx-5196a7a03bc436435787e1ad7044af94d93a5448.tar.bz2
Minor cleanup
-rwxr-xr-xMAKEALL10
-rw-r--r--Makefile26
-rw-r--r--board/tqm5200/tqm5200.c2
-rw-r--r--include/configs/TQM5200.h4
4 files changed, 21 insertions, 21 deletions
diff --git a/MAKEALL b/MAKEALL
index 48eeaaa..720ab03 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -25,11 +25,11 @@ LIST_5xx=" \
#########################################################################
LIST_5xxx=" \
- BC3450 cpci5200 EVAL5200 icecube_5100 \
- icecube_5200 lite5200b mcc200 o2dnt \
- pf5200 PM520 TB5200 Total5100 \
- Total5200 Total5200_Rev2 TQM5200 TQM5200_B \
- TQM5200S fo300 \
+ BC3450 cpci5200 EVAL5200 fo300 \
+ icecube_5100 icecube_5200 lite5200b mcc200 \
+ o2dnt pf5200 PM520 TB5200 \
+ Total5100 Total5200 Total5200_Rev2 TQM5200 \
+ TQM5200_B TQM5200S \
"
#########################################################################
diff --git a/Makefile b/Makefile
index 4cc7a48..a78f35b 100644
--- a/Makefile
+++ b/Makefile
@@ -417,16 +417,22 @@ Total5200_Rev2_lowboot_config: unconfig
}
@./mkconfig -a Total5200 ppc mpc5xxx total5200
-TQM5200_config \
-TQM5200_B_config \
-TQM5200_B_HIGHBOOT_config \
-TQM5200S_config \
-TQM5200S_HIGHBOOT_config \
-TQM5200_STK100_config \
cam5200_config \
+fo300_config \
MiniFAP_config \
-fo300_config: unconfig
+TQM5200S_config \
+TQM5200S_HIGHBOOT_config \
+TQM5200_B_config \
+TQM5200_B_HIGHBOOT_config \
+TQM5200_config \
+TQM5200_STK100_config: unconfig
@ >include/config.h
+ @[ -z "$(findstring cam5200,$@)" ] || \
+ { echo "#define CONFIG_CAM5200" >>include/config.h ; \
+ echo "#define CONFIG_TQM5200S" >>include/config.h ; \
+ echo "#define CONFIG_TQM5200_B" >>include/config.h ; \
+ echo "... TQM5200S on Cam5200" ; \
+ }
@[ -z "$(findstring fo300,$@)" ] || \
{ echo "#define CONFIG_FO300" >>include/config.h ; \
echo "... TQM5200 on FO300" ; \
@@ -435,12 +441,6 @@ fo300_config: unconfig
{ echo "#define CONFIG_MINIFAP" >>include/config.h ; \
echo "... TQM5200_AC on MiniFAP" ; \
}
- @[ -z "$(findstring cam5200,$@)" ] || \
- { echo "#define CONFIG_CAM5200" >>include/config.h ; \
- echo "#define CONFIG_TQM5200S" >>include/config.h ; \
- echo "#define CONFIG_TQM5200_B" >>include/config.h ; \
- echo "... TQM5200S on Cam5200" ; \
- }
@[ -z "$(findstring STK100,$@)" ] || \
{ echo "#define CONFIG_STK52XX_REV100" >>include/config.h ; \
echo "... on a STK52XX.100 base board" ; \
diff --git a/board/tqm5200/tqm5200.c b/board/tqm5200/tqm5200.c
index 0026e08..c8350ab 100644
--- a/board/tqm5200/tqm5200.c
+++ b/board/tqm5200/tqm5200.c
@@ -293,7 +293,7 @@ int checkboard (void)
#elif defined(CONFIG_FO300)
# define CARRIER_NAME "FO300"
#else
-# error "Unknown carrier board"
+# error "UNKNOWN"
#endif
puts ( "Board: " MODULE_NAME " (TQ-Components GmbH)\n"
diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index f157d42..31e3eed 100644
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -37,7 +37,7 @@
#define CONFIG_TQM5200 1 /* ... on TQM5200 module */
#undef CONFIG_TQM5200_REV100 /* define for revision 100 modules */
-/* On a Cameron board or on a FO300 board or ... */
+/* On a Cameron or on a FO300 board or ... */
#if !defined(CONFIG_CAM5200) && !defined(CONFIG_FO300)
#define CONFIG_STK52XX 1 /* ... on a STK52XX board */
#endif
@@ -71,7 +71,7 @@
#undef FO300_SILENT_CONSOLE_WHEN_S1_CLOSED /* silent console on PSC1 when S1 */
/* switch is open */
-#endif
+#endif /* CONFIG_FO300 */
#ifdef CONFIG_STK52XX
#define CONFIG_PS2KBD /* AT-PS/2 Keyboard */