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/lart.h | |
parent | 3ad63878737a5a2b1e60825bf0a7d601d7a695e7 (diff) | |
parent | 3e66c078003607a7d1d214c15a5f262bc1b4032f (diff) | |
download | u-boot-imx-93f798346033a1f6d22090b47abad4be88243b04.zip u-boot-imx-93f798346033a1f6d22090b47abad4be88243b04.tar.gz u-boot-imx-93f798346033a1f6d22090b47abad4be88243b04.tar.bz2 |
Merge with /home/stefan/git/u-boot/u-boot-ppc4xx
Diffstat (limited to 'include/configs/lart.h')
-rw-r--r-- | include/configs/lart.h | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/include/configs/lart.h b/include/configs/lart.h index a00640b..8f18c9f 100644 --- a/include/configs/lart.h +++ b/include/configs/lart.h @@ -59,10 +59,21 @@ #define CONFIG_BAUDRATE 9600 -#define CONFIG_COMMANDS (CONFIG_CMD_DFL) -/* 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_BOOTDELAY 3 #define CONFIG_BOOTARGS "root=ramfs devfs=mount console=ttySA0,9600" @@ -73,7 +84,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 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ #endif |