diff options
| author | Stefan Roese <sr@denx.de> | 2008-09-08 08:35:49 (GMT) |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-09-08 08:35:49 (GMT) |
| commit | c351575c226eaad85f12b0d346e762260b263531 (patch) | |
| tree | c2c1748a95c589278cbf048c191728fd5a9ea753 /include/configs | |
| parent | ac53ee8318678190bf3c68da477a84a657d86fb0 (diff) | |
| parent | 302e52e0b1d4c7f994991709d0cb6c3ea612cdb5 (diff) | |
| download | u-boot-fsl-qoriq-c351575c226eaad85f12b0d346e762260b263531.tar.xz | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/ap325rxa.h | 2 | ||||
| -rw-r--r-- | include/configs/favr-32-ezkit.h | 2 | ||||
| -rw-r--r-- | include/configs/socrates.h | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h index 81a118d..3db609b 100644 --- a/include/configs/ap325rxa.h +++ b/include/configs/ap325rxa.h @@ -117,7 +117,7 @@ /* FLASH */ #define CONFIG_FLASH_CFI_DRIVER 1 #define CFG_FLASH_CFI -#define CFG_FLASH_CFI_DRIVER +#define CONFIG_FLASH_CFI_DRIVER #undef CFG_FLASH_QUIET_TEST /* print 'E' for empty sector on flinfo */ #define CFG_FLASH_EMPTY_INFO diff --git a/include/configs/favr-32-ezkit.h b/include/configs/favr-32-ezkit.h index a27c02a..35d289f 100644 --- a/include/configs/favr-32-ezkit.h +++ b/include/configs/favr-32-ezkit.h @@ -160,7 +160,7 @@ /* External flash on Favr-32 */ #if 0 #define CFG_FLASH_CFI 1 -#define CFG_FLASH_CFI_DRIVER 1 +#define CONFIG_FLASH_CFI_DRIVER 1 #endif #define CFG_FLASH_BASE 0x00000000 diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 15abec1..5cc4213 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -410,6 +410,7 @@ #define CONFIG_USB_OHCI_NEW 1 #define CONFIG_PCI_OHCI 1 #define CONFIG_PCI_OHCI_DEVNO 3 /* Number in PCI list */ +#define CONFIG_PCI_EHCI_DEVNO (CONFIG_PCI_OHCI_DEVNO / 2) #define CFG_USB_OHCI_MAX_ROOT_PORTS 15 #define CFG_USB_OHCI_SLOT_NAME "ohci_pci" #define CFG_OHCI_SWAP_REG_ACCESS 1 |