diff options
author | Justin Waters <justin@justin-linux.(none)> | 2008-01-21 16:38:46 -0500 |
---|---|---|
committer | Justin Waters <justin@justin-linux.(none)> | 2008-01-22 11:25:35 -0500 |
commit | 405bb978ee2321b6cf5381a012c812bdc7679e40 (patch) | |
tree | fcab2b9817cbadafc512f39972468ea9ccecc8d5 /include/configs | |
parent | 3c7ac4df9c9718e0bf11705a1a4d0e4b9dae700f (diff) |
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>
Diffstat (limited to 'include/configs')
-rw-r--r-- | include/configs/at91rm9200ek.h | 22 | ||||
-rw-r--r-- | include/configs/at91sam9260ek.h | 35 | ||||
-rw-r--r-- | include/configs/at91sam9261ek.h | 33 | ||||
-rw-r--r-- | include/configs/at91sam9263ek.h | 33 | ||||
-rw-r--r-- | include/configs/at91sam9rlek.h | 33 |
5 files changed, 71 insertions, 85 deletions
diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h index 1cce149bf1b..ceed37ff7ae 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 e9a9f4eddcf..4f4e8c71d4c 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 ce21a97cdf2..de639090f11 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 f9423937395..052d7238efa 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 6d3f0c804f4..fec0c7ea56d 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 */ |