diff options
author | Stefan Roese <sr@denx.de> | 2007-08-21 16:33:33 +0200 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2007-08-21 16:33:33 +0200 |
commit | 93f798346033a1f6d22090b47abad4be88243b04 (patch) | |
tree | 45b4d2a887a89572015de3234b04b419bfc11b44 /include/configs/kb9202.h | |
parent | 3ad63878737a5a2b1e60825bf0a7d601d7a695e7 (diff) | |
parent | 3e66c078003607a7d1d214c15a5f262bc1b4032f (diff) | |
download | talos-obmc-uboot-93f798346033a1f6d22090b47abad4be88243b04.tar.gz talos-obmc-uboot-93f798346033a1f6d22090b47abad4be88243b04.zip |
Merge with /home/stefan/git/u-boot/u-boot-ppc4xx
Diffstat (limited to 'include/configs/kb9202.h')
-rw-r--r-- | include/configs/kb9202.h | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/include/configs/kb9202.h b/include/configs/kb9202.h index 6590f6f5f0..75d9c3b3b4 100644 --- a/include/configs/kb9202.h +++ b/include/configs/kb9202.h @@ -78,17 +78,29 @@ #define CONFIG_BOOTDELAY 3 #define CONFIG_ENV_OVERWRITE 1 -#define CONFIG_COMMANDS \ - ((CONFIG_CMD_DFL | \ - CFG_CMD_I2C | \ - CFG_CMD_PING | \ - CFG_CMD_DHCP ) & \ - ~(CFG_CMD_BDI | \ - CFG_CMD_FPGA | \ - CFG_CMD_MISC)) - -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> + +/* + * BOOTP options + */ +#define CONFIG_BOOTP_BOOTFILESIZE +#define CONFIG_BOOTP_BOOTPATH +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_HOSTNAME + + +/* + * Command line configuration. + */ +#include <config_cmd_default.h> + +#define CONFIG_CMD_I2C +#define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP + +#undef CONFIG_CMD_BDI +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_MISC + #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM 0x20000000 |