diff options
| author | Tom Rini <[email protected]> | 2016-10-30 08:11:50 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2016-10-30 08:11:50 -0400 |
| commit | 7ce79599a1b8f2078b15fa170f11f2666200b24e (patch) | |
| tree | dcf8df06f13a5cb6ac4903605d96b7b6434a045d /include | |
| parent | 4ddc981225288e68d45eb8e33271d1481920086f (diff) | |
| parent | fed329aebe3aaac0928c73547ac6316af2adf0cd (diff) | |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/sun4i.h | 1 | ||||
| -rw-r--r-- | include/configs/sun50i.h | 5 | ||||
| -rw-r--r-- | include/configs/sun5i.h | 1 | ||||
| -rw-r--r-- | include/configs/sun6i.h | 1 | ||||
| -rw-r--r-- | include/configs/sun7i.h | 1 | ||||
| -rw-r--r-- | include/configs/sun8i.h | 1 | ||||
| -rw-r--r-- | include/configs/sunxi-common.h | 1 |
7 files changed, 5 insertions, 6 deletions
diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h index ea079eb5f78..3dfd95ad77f 100644 --- a/include/configs/sun4i.h +++ b/include/configs/sun4i.h @@ -14,7 +14,6 @@ #ifdef CONFIG_USB_EHCI #define CONFIG_USB_EHCI_SUNXI -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #endif #define CONFIG_SUNXI_USB_PHYS 3 diff --git a/include/configs/sun50i.h b/include/configs/sun50i.h index 0fdb4c7b99c..3e5708b4936 100644 --- a/include/configs/sun50i.h +++ b/include/configs/sun50i.h @@ -11,6 +11,11 @@ * A64 specific configuration */ +#ifdef CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_SUNXI +#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 +#endif + #define CONFIG_SUNXI_USB_PHYS 1 #define COUNTER_FREQUENCY CONFIG_TIMER_CLK_FREQ diff --git a/include/configs/sun5i.h b/include/configs/sun5i.h index d2576599036..ec8f3199ba3 100644 --- a/include/configs/sun5i.h +++ b/include/configs/sun5i.h @@ -14,7 +14,6 @@ #ifdef CONFIG_USB_EHCI #define CONFIG_USB_EHCI_SUNXI -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #endif #define CONFIG_SUNXI_USB_PHYS 2 diff --git a/include/configs/sun6i.h b/include/configs/sun6i.h index 67a26c2e45f..6c1eca4d268 100644 --- a/include/configs/sun6i.h +++ b/include/configs/sun6i.h @@ -17,7 +17,6 @@ #ifdef CONFIG_USB_EHCI #define CONFIG_USB_EHCI_SUNXI -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #endif #define CONFIG_SUNXI_USB_PHYS 3 diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h index d8e6e207951..5455901efe3 100644 --- a/include/configs/sun7i.h +++ b/include/configs/sun7i.h @@ -15,7 +15,6 @@ #ifdef CONFIG_USB_EHCI #define CONFIG_USB_EHCI_SUNXI -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #endif #define CONFIG_SUNXI_USB_PHYS 3 diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h index 011d70f3677..a4c3fb69e41 100644 --- a/include/configs/sun8i.h +++ b/include/configs/sun8i.h @@ -15,7 +15,6 @@ #ifdef CONFIG_USB_EHCI #define CONFIG_USB_EHCI_SUNXI -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #endif #ifdef CONFIG_MACH_SUN8I_H3 diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index e0464df0388..8363414828f 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -35,7 +35,6 @@ /* * High Level Configuration Options */ -#define CONFIG_SUNXI /* sunxi family */ #ifdef CONFIG_SPL_BUILD #define CONFIG_SYS_THUMB_BUILD /* Thumbs mode to save space in SPL */ #endif |