diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-05-09 01:16:51 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-05-09 01:16:51 +0200 |
| commit | ab92d0fd9abd0d4726878a80c6baf3a0f94770b8 (patch) | |
| tree | ebea3c52a510d2a5d39a378f305d878d7fc0344d /include | |
| parent | 5794619e29c5e22280b0b09b2ea6bc3d2e00da3f (diff) | |
| parent | fd194f82d1c30802f0597a3e359fdc03ed397367 (diff) | |
| download | u-boot-imx-ab92d0fd9abd0d4726878a80c6baf3a0f94770b8.zip u-boot-imx-ab92d0fd9abd0d4726878a80c6baf3a0f94770b8.tar.gz u-boot-imx-ab92d0fd9abd0d4726878a80c6baf3a0f94770b8.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/MVBLM7.h | 6 | ||||
| -rw-r--r-- | include/configs/SIMPC8313.h | 11 |
2 files changed, 17 insertions, 0 deletions
diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h index 26897c6..c28eb64 100644 --- a/include/configs/MVBLM7.h +++ b/include/configs/MVBLM7.h @@ -234,7 +234,11 @@ #define CONFIG_BOOTP_SEND_HOSTNAME /* USB */ +#define CONFIG_SYS_USB_HOST +#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_FSL #define CONFIG_HAS_FSL_DR_USB +#define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* * Environment @@ -267,6 +271,8 @@ #define CONFIG_CMD_PCI #define CONFIG_CMD_I2C #define CONFIG_CMD_FPGA +#define CONFIG_CMD_USB +#define CONFIG_DOS_PARTITION #undef CONFIG_WATCHDOG diff --git a/include/configs/SIMPC8313.h b/include/configs/SIMPC8313.h index 84af8df..1a17323 100644 --- a/include/configs/SIMPC8313.h +++ b/include/configs/SIMPC8313.h @@ -126,6 +126,7 @@ #else #define CONFIG_SYS_NAND_BASE 0xE2800000 #endif +#define CONFIG_SYS_FPGA_BASE 0xFF000000 #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define NAND_MAX_CHIPS 1 @@ -184,6 +185,16 @@ #define CONFIG_SYS_NAND_LBLAWBAR_PRELIM CONFIG_SYS_LBLAWBAR0_PRELIM #define CONFIG_SYS_NAND_LBLAWAR_PRELIM CONFIG_SYS_LBLAWAR0_PRELIM +#define CONFIG_SYS_BR1_PRELIM ( CONFIG_SYS_FPGA_BASE \ + | BR_PS_16 \ + | BR_MS_UPMA \ + | BR_V ) +#define CONFIG_SYS_OR1_PRELIM ( OR_AM_2MB \ + | OR_UPM_BCTLD) + +#define CONFIG_SYS_LBLAWBAR1_PRELIM CONFIG_SYS_FPGA_BASE +#define CONFIG_SYS_LBLAWAR1_PRELIM (LBLAWAR_EN | LBLAWAR_2MB) + /* * JFFS2 configuration */ |