Hi Dave,
This is a fairly simple patch that rearranges the command configuration so there are not four very similar lists of commands for the four configurations (with/without PCI, with/without CFG_RAMBOOT). I got tired of editing four sets of commands (or worse, editing the wrong set of commands).
The patch creates a CONFIG_COMMANDS_COMMON with the common commands, a CONFIG_COMMANDS_PCI with the PCI-related commands (or 0), and CONFIG_COMMANDS_REMOVE with the commands that are removed for CFG_RAMBOOT operation (or ~0).
Diff didn't produce a very readable patch. :-( The result of the patch is:
#define CONFIG_COMMANDS_COMMON (CONFIG_CMD_DFL \ | CFG_CMD_ASKENV \ | CFG_CMD_DHCP \ | CFG_CMD_I2C \ | CFG_CMD_PING) #if defined(CONFIG_PCI) #define CONFIG_COMMANDS_PCI CFG_CMD_PCI #else #define CONFIG_COMMANDS_PCI 0ULL #endif
#if defined(CFG_RAMBOOT) #define CONFIG_COMMANDS_REMOVE ~(CFG_CMD_ENV \ | CFG_CMD_LOADS) #else #define CONFIG_COMMANDS_REMOVE ~0ULL #endif
#define CONFIG_COMMANDS ((CONFIG_COMMANDS_COMMON \ | CONFIG_COMMANDS_PCI) \ & CONFIG_COMMANDS_REMOVE)
Best regards, gvb
Refactor into base commands, commands that are added, and commands that are removed from the base commands so that the list does not have to be replicated n times.
Also added the DHCP command.
Signed-off-by: Jerry Van Baren vanbaren@cideas.com --- include/configs/MPC8360EMDS.h | 44 ++++++++++++++-------------------------- 1 files changed, 16 insertions(+), 28 deletions(-)
diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h index 8ad6551..f56e7ad 100644 --- a/include/configs/MPC8360EMDS.h +++ b/include/configs/MPC8360EMDS.h @@ -426,40 +426,28 @@ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CFG_LOADS_BAUD_CHANGE 1 /* allow baudrate change */
-#if defined(CFG_RAMBOOT) -#if defined(CONFIG_PCI) -#define CONFIG_COMMANDS ((CONFIG_CMD_DFL \ - | CFG_CMD_PING \ - | CFG_CMD_ASKENV \ - | CFG_CMD_PCI \ - | CFG_CMD_I2C) \ - & \ - ~(CFG_CMD_ENV \ - | CFG_CMD_LOADS)) -#else -#define CONFIG_COMMANDS ((CONFIG_CMD_DFL \ - | CFG_CMD_PING \ +#define CONFIG_COMMANDS_COMMON (CONFIG_CMD_DFL \ | CFG_CMD_ASKENV \ - | CFG_CMD_I2C) \ - & \ - ~(CFG_CMD_ENV \ - | CFG_CMD_LOADS)) -#endif -#else + | CFG_CMD_DHCP \ + | CFG_CMD_I2C \ + | CFG_CMD_PING) #if defined(CONFIG_PCI) -#define CONFIG_COMMANDS (CONFIG_CMD_DFL \ - | CFG_CMD_PCI \ - | CFG_CMD_PING \ - | CFG_CMD_ASKENV \ - | CFG_CMD_I2C) +#define CONFIG_COMMANDS_PCI CFG_CMD_PCI #else -#define CONFIG_COMMANDS (CONFIG_CMD_DFL \ - | CFG_CMD_PING \ - | CFG_CMD_ASKENV \ - | CFG_CMD_I2C ) +#define CONFIG_COMMANDS_PCI 0ULL #endif + +#if defined(CFG_RAMBOOT) +#define CONFIG_COMMANDS_REMOVE ~(CFG_CMD_ENV \ + | CFG_CMD_LOADS) +#else +#define CONFIG_COMMANDS_REMOVE ~0ULL #endif
+#define CONFIG_COMMANDS ((CONFIG_COMMANDS_COMMON \ + | CONFIG_COMMANDS_PCI) \ + & CONFIG_COMMANDS_REMOVE) + #include <cmd_confdefs.h>
#undef CONFIG_WATCHDOG /* watchdog disabled */