Fix various configuration problems with Atmel patch

The CMD API has changed significantly since the patches were originally written.  This fixes these problems and cleans up the code a little.

Signed-off-by: Justin Waters <justin.waters@timesys.com>

5 files changed, 71 insertions, 85 deletions

diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index 1cce149bf1..ceed37ff7a 100644
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -99,18 +99,16 @@
 #define CONFIG_BOOTDELAY      3
 /* #define CONFIG_ENV_OVERWRITE	1 */
 
-#define CONFIG_COMMANDS		\
-		       ((CONFIG_CMD_DFL | CFG_CMD_MII |\
-			CFG_CMD_DHCP ) & \
-		      ~(CFG_CMD_BDI | \
-			CFG_CMD_IMI | \
-			CFG_CMD_AUTOSCRIPT | \
-			CFG_CMD_FPGA | \
-			CFG_CMD_MISC | \
-			CFG_CMD_LOADS ))
-
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_DHCP
+#undef CONFIG_CMD_BDI
+#undef CONFIG_CMD_IMI
+#undef CONFIG_CMD_AUTOSCRIPT
+#undef CONFIG_CMD_FPGA
+#undef CONFIG_CMD_MISC
+#undef CONFIG_CMD_LOADS
 
 #define CFG_MAX_NAND_DEVICE	1	/* Max number of NAND devices		*/
 #define SECTORSIZE 512
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index e9a9f4eddc..4f4e8c71d4 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -79,25 +79,22 @@
 /* #define CONFIG_ENV_OVERWRITE  1 */
 #define BOARD_LATE_INIT		1
 
-#define CONFIG_COMMANDS		\
-		       ((CONFIG_CMD_DFL	| \
-                        CFG_CMD_NET | \
-			CFG_CMD_PING | \
-                        CFG_CMD_ENV | \
-                        CFG_CMD_USB | \
-                        CFG_CMD_FLASH | \
-			CFG_CMD_AUTOSCRIPT | \
-                        CFG_CMD_NAND | \
-                        CFG_CMD_FAT ) & \
-		      ~(CFG_CMD_BDI | \
-			CFG_CMD_IMLS | \
-			CFG_CMD_IMI | \
-			CFG_CMD_FPGA | \
-			CFG_CMD_MISC | \
-			CFG_CMD_LOADS))
-
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_ENV
+#define CONFIG_CMD_USB
+#define CONFIG_CMD_FLASH
+#define CONFIG_CMD_AUTOSCRIPT
+#define CONFIG_CMD_NAND
+#define CONFIG_CMD_FAT
+#undef CONFIG_CMD_BDI
+#undef CONFIG_CMD_IMLS
+#undef CONFIG_CMD_IMI
+#undef CONFIG_CMD_FPGA
+#undef CONFIG_CMD_MISC
+#undef CONFIG_CMD_LOADS
 
 #define NAND_MAX_CHIPS		       1	/* Max number of NAND devices	*/
 #define CFG_MAX_NAND_DEVICE            1	/* Max number of NAND devices	*/
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index ce21a97cdf..de639090f1 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -79,24 +79,21 @@
 /* #define CONFIG_ENV_OVERWRITE  1 */
 #define BOARD_LATE_INIT		1
 
-#define CONFIG_COMMANDS		\
-		       ((CONFIG_CMD_DFL	| \
-                        CFG_CMD_NET | \
-                        CFG_CMD_ENV | \
-                        CFG_CMD_USB | \
-                        CFG_CMD_FLASH | \
-			CFG_CMD_NAND | \
-			CFG_CMD_AUTOSCRIPT | \
-                        CFG_CMD_FAT ) & \
-		      ~(CFG_CMD_BDI | \
-			CFG_CMD_IMLS | \
-			CFG_CMD_IMI | \
-			CFG_CMD_FPGA | \
-			CFG_CMD_MISC | \
-			CFG_CMD_LOADS))
-
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_ENV
+#define CONFIG_CMD_USB
+#define CONFIG_CMD_FLASH
+#define CONFIG_CMD_NAND
+#define CONFIG_CMD_AUTOSCRIPT
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_BDI
+#undef CONFIG_CMD_IMLS
+#undef CONFIG_CMD_IMI
+#undef CONFIG_CMD_FPGA
+#undef CONFIG_CMD_MISC
+#undef CONFIG_CMD_LOADS
 
 #define NAND_MAX_CHIPS		       1	/* Max number of NAND devices	*/
 #define CFG_MAX_NAND_DEVICE            1	/* Max number of NAND devices	*/
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index f942393739..052d7238ef 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -94,24 +94,21 @@
 /* #define CONFIG_ENV_OVERWRITE  1 */
 #define BOARD_LATE_INIT		1
 
-#define CONFIG_COMMANDS		\
-		       ((CONFIG_CMD_DFL	| \
-                        CFG_CMD_ENV | \
-                        CFG_CMD_USB | \
-                        CFG_CMD_FAT | \
-                        CFG_CMD_NET | \
-                        CFG_CMD_FLASH | \
-			CFG_CMD_AUTOSCRIPT | \
-                        CFG_CMD_NAND) & \
-		      ~(CFG_CMD_BDI | \
-			CFG_CMD_IMI | \
-			CFG_CMD_IMLS | \
-			CFG_CMD_FPGA | \
-			CFG_CMD_MISC | \
-			CFG_CMD_LOADS))
-
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_ENV
+#define CONFIG_CMD_USB
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_FLASH
+#define CONFIG_CMD_AUTOSCRIPT
+#define CONFIG_CMD_NAND
+#undef CONFIG_CMD_BDI
+#undef CONFIG_CMD_IMI
+#undef CONFIG_CMD_IMLS
+#undef CONFIG_CMD_FPGA
+#undef CONFIG_CMD_MISC
+#undef CONFIG_CMD_LOADS
 
 #define NAND_MAX_CHIPS		       1	/* Max number of NAND devices	*/
 #define CFG_MAX_NAND_DEVICE            1	/* Max number of NAND devices	*/
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 6d3f0c804f..fec0c7ea56 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -75,24 +75,21 @@
 /* #define CONFIG_ENV_OVERWRITE  1 */
 #define BOARD_LATE_INIT		1
 
-#define CONFIG_COMMANDS		\
-		       ((CONFIG_CMD_DFL	| \
-                        CFG_CMD_ENV | \
-                        CFG_CMD_FLASH | \
-			CFG_CMD_NAND | \
-			CFG_CMD_AUTOSCRIPT | \
-                        CFG_CMD_FAT ) & \
-		      ~(CFG_CMD_BDI | \
-                        CFG_CMD_NET | \
-                        CFG_CMD_USB | \
-			CFG_CMD_IMLS | \
-			CFG_CMD_IMI | \
-			CFG_CMD_FPGA | \
-			CFG_CMD_MISC | \
-			CFG_CMD_LOADS))
-
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_ENV
+#define CONFIG_CMD_FLASH
+#define CONFIG_CMD_NAND
+#define CONFIG_CMD_AUTOSCRIPT
+#define CONFIG_CMD_FAT
+#undef CONFIG_CMD_BDI
+#undef CONFIG_CMD_NET
+#undef CONFIG_CMD_USB
+#undef CONFIG_CMD_IMLS
+#undef CONFIG_CMD_IMI
+#undef CONFIG_CMD_FPGA
+#undef CONFIG_CMD_MISC
+#undef CONFIG_CMD_LOADS
 
 #define NAND_MAX_CHIPS		       1	/* Max number of NAND devices	*/
 #define CFG_MAX_NAND_DEVICE            1	/* Max number of NAND devices	*/