diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-08-07 22:12:05 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-08-07 22:12:05 +0200 |
| commit | 85fad497b3c2e99fa48d18351d2898cf8cdbe898 (patch) | |
| tree | 3c53a3ca56eaba5070a5fbcbbe4718d8ea4d082a /include/configs/smdk2410.h | |
| parent | 706714d97a0d08d59eda4de2268c39f504688329 (diff) | |
| parent | b23b547597ff2375ad13a9ab04e5257a3ad76c99 (diff) | |
| download | talos-obmc-uboot-85fad497b3c2e99fa48d18351d2898cf8cdbe898.tar.gz talos-obmc-uboot-85fad497b3c2e99fa48d18351d2898cf8cdbe898.zip | |
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'include/configs/smdk2410.h')
| -rw-r--r-- | include/configs/smdk2410.h | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h index 7edec0db43..ca404ff452 100644 --- a/include/configs/smdk2410.h +++ b/include/configs/smdk2410.h @@ -72,22 +72,26 @@ #define CONFIG_BAUDRATE 115200 -/*********************************************************** - * Command definition - ***********************************************************/ -#define CONFIG_COMMANDS \ - (CONFIG_CMD_DFL | \ - CFG_CMD_CACHE | \ - /*CFG_CMD_NAND |*/ \ - /*CFG_CMD_EEPROM |*/ \ - /*CFG_CMD_I2C |*/ \ - /*CFG_CMD_USB |*/ \ - CFG_CMD_REGINFO | \ - CFG_CMD_DATE | \ - CFG_CMD_ELF) - -/* 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_CACHE +#define CONFIG_CMD_REGINFO +#define CONFIG_CMD_DATE +#define CONFIG_CMD_ELF + #define CONFIG_BOOTDELAY 3 /*#define CONFIG_BOOTARGS "root=ramfs devfs=mount console=ttySA0,9600" */ @@ -98,7 +102,7 @@ /*#define CONFIG_BOOTFILE "elinos-lart" */ /*#define CONFIG_BOOTCOMMAND "tftp; bootm" */ -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */ /* what's this ? it's not used anywhere */ #define CONFIG_KGDB_SER_INDEX 1 /* which serial port to use */ |
