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/delta.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/delta.h')
| -rw-r--r-- | include/configs/delta.h | 51 |
1 files changed, 39 insertions, 12 deletions
diff --git a/include/configs/delta.h b/include/configs/delta.h index 1568120..09667ed 100644 --- a/include/configs/delta.h +++ b/include/configs/delta.h @@ -87,22 +87,49 @@ #define CONFIG_BAUDRATE 115200 -/* #define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_MMC | CFG_CMD_FAT) */ + +/* + * 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> + #ifdef TURN_ON_ETHERNET -# define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_PING) + +#define CONFIG_CMD_PING + #else -# define CONFIG_COMMANDS ((CONFIG_CMD_DFL \ - | CFG_CMD_ENV \ - | CFG_CMD_NAND \ - | CFG_CMD_I2C) \ - & ~(CFG_CMD_NET \ - | CFG_CMD_FLASH \ - | CFG_CMD_IMLS)) + +#define CONFIG_CMD_ENV +#define CONFIG_CMD_NAND +#define CONFIG_CMD_I2C + +#undef CONFIG_CMD_NET +#undef CONFIG_CMD_FLASH +#undef CONFIG_CMD_IMLS + #endif +/* USB */ +#define CONFIG_USB_OHCI_NEW 1 +#define CONFIG_USB_STORAGE 1 +#define CONFIG_DOS_PARTITION 1 + +#undef CFG_USB_OHCI_BOARD_INIT +#define CFG_USB_OHCI_CPU_INIT 1 +#define CFG_USB_OHCI_REGS_BASE OHCI_REGS_BASE +#define CFG_USB_OHCI_SLOT_NAME "delta" +#define CFG_USB_OHCI_MAX_ROOT_PORTS 3 -/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -#include <cmd_confdefs.h> +#define LITTLEENDIAN 1 /* used by usb_ohci.c */ #define CONFIG_BOOTDELAY -1 #define CONFIG_ETHADDR 08:00:3e:26:0a:5b @@ -114,7 +141,7 @@ #define CONFIG_CMDLINE_TAG #define CONFIG_TIMESTAMP -#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 |