summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2008-02-22 12:54:39 -0800
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2008-05-27 15:27:29 +0200
commit55ac7a7490b55da56659f95d82a0c83b9756df27 (patch)
tree0668742a3c0f6205a4441de2929e3f643f2de215
parent1f1554841a4c8e069d331176f0c3059fb2bb8280 (diff)
downloadu-boot-imx-55ac7a7490b55da56659f95d82a0c83b9756df27.zip
u-boot-imx-55ac7a7490b55da56659f95d82a0c83b9756df27.tar.gz
u-boot-imx-55ac7a7490b55da56659f95d82a0c83b9756df27.tar.bz2
avr32: stk1002 and ngw100 convergence
Make STK1002 and NGW100 boards act more alike: - STK boards can use as many arguments as NGW - STK boards don't need to manage FPGAs either - NGW commands should match STK ones Also spell U-Boot right in prompts for STK1002 and NGW100. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> [haavard.skinnemoen@atmel.com: update STK100[34] as well] Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
-rw-r--r--include/configs/atngw100.h5
-rw-r--r--include/configs/atstk1002.h6
-rw-r--r--include/configs/atstk1003.h2
-rw-r--r--include/configs/atstk1004.h2
4 files changed, 9 insertions, 6 deletions
diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index 5aad043..313298a 100644
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -112,8 +112,11 @@
#define CONFIG_CMD_FAT
#define CONFIG_CMD_JFFS2
#define CONFIG_CMD_MMC
+
+#undef CONFIG_CMD_AUTOSCRIPT
#undef CONFIG_CMD_FPGA
#undef CONFIG_CMD_SETGETDCR
+#undef CONFIG_CMD_XIMG
#define CONFIG_ATMEL_USART 1
#define CONFIG_MACB 1
@@ -164,7 +167,7 @@
#define CFG_BOOTPARAMS_LEN (16 * 1024)
/* Other configuration settings that shouldn't have to change all that often */
-#define CFG_PROMPT "Uboot> "
+#define CFG_PROMPT "U-Boot> "
#define CFG_CBSIZE 256
#define CFG_MAXARGS 16
#define CFG_PBSIZE (CFG_CBSIZE + sizeof(CFG_PROMPT) + 16)
diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index 95aeab6..f652b28 100644
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -139,9 +139,9 @@
#define CONFIG_CMD_FAT
#define CONFIG_CMD_JFFS2
#define CONFIG_CMD_MMC
-#define CONFIG_CMD_REGINFO
#undef CONFIG_CMD_AUTOSCRIPT
+#undef CONFIG_CMD_FPGA
#undef CONFIG_CMD_SETGETDCR
#undef CONFIG_CMD_XIMG
@@ -189,9 +189,9 @@
#define CFG_BOOTPARAMS_LEN (16 * 1024)
/* Other configuration settings that shouldn't have to change all that often */
-#define CFG_PROMPT "Uboot> "
+#define CFG_PROMPT "U-Boot> "
#define CFG_CBSIZE 256
-#define CFG_MAXARGS 8
+#define CFG_MAXARGS 16
#define CFG_PBSIZE (CFG_CBSIZE + sizeof(CFG_PROMPT) + 16)
#define CFG_LONGHELP 1
diff --git a/include/configs/atstk1003.h b/include/configs/atstk1003.h
index 194788b..2d981cc 100644
--- a/include/configs/atstk1003.h
+++ b/include/configs/atstk1003.h
@@ -171,7 +171,7 @@
#define CFG_BOOTPARAMS_LEN (16 * 1024)
/* Other configuration settings that shouldn't have to change all that often */
-#define CFG_PROMPT "Uboot> "
+#define CFG_PROMPT "U-Boot> "
#define CFG_CBSIZE 256
#define CFG_MAXARGS 16
#define CFG_PBSIZE (CFG_CBSIZE + sizeof(CFG_PROMPT) + 16)
diff --git a/include/configs/atstk1004.h b/include/configs/atstk1004.h
index b81fc21..235c1cc 100644
--- a/include/configs/atstk1004.h
+++ b/include/configs/atstk1004.h
@@ -172,7 +172,7 @@
#define CFG_BOOTPARAMS_LEN (16 * 1024)
/* Other configuration settings that shouldn't have to change all that often */
-#define CFG_PROMPT "Uboot> "
+#define CFG_PROMPT "U-Boot> "
#define CFG_CBSIZE 256
#define CFG_MAXARGS 16
#define CFG_PBSIZE (CFG_CBSIZE + sizeof(CFG_PROMPT) + 16)