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/omap730p2.h | |
| parent | 706714d97a0d08d59eda4de2268c39f504688329 (diff) | |
| parent | b23b547597ff2375ad13a9ab04e5257a3ad76c99 (diff) | |
| download | u-boot-imx-85fad497b3c2e99fa48d18351d2898cf8cdbe898.zip u-boot-imx-85fad497b3c2e99fa48d18351d2898cf8cdbe898.tar.gz u-boot-imx-85fad497b3c2e99fa48d18351d2898cf8cdbe898.tar.bz2 | |
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'include/configs/omap730p2.h')
| -rw-r--r-- | include/configs/omap730p2.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/include/configs/omap730p2.h b/include/configs/omap730p2.h index fda55cf..c4d253a 100644 --- a/include/configs/omap730p2.h +++ b/include/configs/omap730p2.h @@ -90,14 +90,24 @@ #define CONFIG_BAUDRATE 115200 #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } -#define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_DHCP) -#define CONFIG_BOOTP_MASK CONFIG_BOOTP_DEFAULT /* - * This must be included AFTER the definition of CONFIG_COMMANDS (if any) + * Command line configuration. */ +#include <config_cmd_default.h> + +#define CONFIG_CMD_DHCP + + +/* + * BOOTP options + */ +#define CONFIG_BOOTP_SUBNETMASK +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_HOSTNAME +#define CONFIG_BOOTP_BOOTPATH + -#include <cmd_confdefs.h> #include <configs/omap730.h> #include <configs/h2_p2_dbg_board.h> @@ -112,7 +122,7 @@ #define CONFIG_SERVERIP 192.150.0.100 #define CONFIG_BOOTFILE "uImage" /* File to load */ -#if defined (CONFIG_COMMANDS) && defined (CFG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 115200 /* Speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 1 /* Which serial port to use */ #endif |