diff options
author | Jon Loeliger <jdl@freescale.com> | 2007-07-08 14:49:44 -0500 |
---|---|---|
committer | Jon Loeliger <jdl@freescale.com> | 2007-07-08 16:05:35 -0500 |
commit | acf0269779422f3e147d2ddfb499c9f6ff10ad5e (patch) | |
tree | 5d5aa3a9567bd7f4e9cc78a4501ecc1b5eddf4e7 /include/configs/PN62.h | |
parent | e18a1061a8630cb67995fdf99afd3fb50d1b187d (diff) |
include/configs: Use new CONFIG_CMD_* in various P* named board config files.
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'include/configs/PN62.h')
-rw-r--r-- | include/configs/PN62.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/include/configs/PN62.h b/include/configs/PN62.h index a717659bb6..8346d8ca02 100644 --- a/include/configs/PN62.h +++ b/include/configs/PN62.h @@ -42,15 +42,20 @@ #define CONFIG_CONS_INDEX 1 -#define REMOVE_COMMANDS ( CFG_CMD_AUTOSCRIPT | \ - CFG_CMD_LOADS | \ - CFG_CMD_ENV | \ - CFG_CMD_FLASH | \ - CFG_CMD_IMLS ) +/* + * Command line configuration. + */ +#include <config_cmd_default.h> + +#define CONFIG_CMD_PCI +#define CONFIG_CMD_BSP + +#undef CONFIG_CMD_AUTOSCRIPT +#undef CONFIG_CMD_LOADS +#undef CONFIG_CMD_ENV +#undef CONFIG_CMD_FLASH +#undef CONFIG_CMD_IMLS -#define CONFIG_COMMANDS ( (CONFIG_CMD_DFL & ~REMOVE_COMMANDS) |\ - CFG_CMD_PCI |\ - CFG_CMD_BSP) #define CONFIG_BAUDRATE 19200 /* console baudrate */ @@ -82,10 +87,6 @@ "loadp 200000; bootm" #endif -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> - - /* * Miscellaneous configurable options */ @@ -287,7 +288,7 @@ * Cache Configuration */ #define CFG_CACHELINE_SIZE 32 /* For MPC8240 CPU */ -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) # define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */ #endif |