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 <[email protected]>
[[email protected]: update STK100[34] as well]
Signed-off-by: Haavard Skinnemoen <[email protected]>

diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index 5aad043d89e1815b6c17271463086b9ad4154c19..313298a5c7f843871d758480866c860f5ed58a2e 100644 (file)
--- 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 95aeab6d4ee7eafd6af3ca5037eeb8f6014150a2..f652b287106254347efd67266b02d1739f88d9c8 100644 (file)
--- 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 194788b18da675ff3bfaab3aa28638d085cfb3fe..2d981ccbad85ce63f63d67fdfbe09d7f96391523 100644 (file)
--- 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 b81fc212701965ff64fbe576c746296c884ade4f..235c1cc9df8a968a8cbab4a7480d9b982b1a85b2 100644 (file)
--- 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)