[U-Boot] [PATCH 1/3] ARM: uniphier: remove unneeded CONFIG_USB_MAX_CONTROLLER_COUNT defines
ARCH_UNIPHIER selects DM_USB, where CONFIG_USB_MAX_CONTROLLER_COUNT is not used.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
include/configs/uniphier.h | 1 - 1 file changed, 1 deletion(-)
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 7331d13..5be46e5 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -126,7 +126,6 @@ #define CONFIG_SYS_NAND_BAD_BLOCK_POS 0
/* USB */ -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 4 #define CONFIG_FAT_WRITE #define CONFIG_DOS_PARTITION
ARCH_ZYNQ(MP) selects DM_USB, where CONFIG_USB_MAX_CONTROLLER_COUNT is not used.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
include/configs/xilinx_zynqmp.h | 1 - include/configs/zynq-common.h | 1 - 2 files changed, 2 deletions(-)
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index adc42cf..c8e1ffa 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -110,7 +110,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x8000000
#if defined(CONFIG_ZYNQMP_USB) -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 #define CONFIG_USB_XHCI_ZYNQMP
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 0118fd2..7cca83f 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -86,7 +86,6 @@
#ifdef CONFIG_USB_EHCI_ZYNQ # define CONFIG_EHCI_IS_TDI -# define CONFIG_USB_MAX_CONTROLLER_COUNT 2
# define CONFIG_SYS_DFU_DATA_BUF_SIZE 0x600000 # define DFU_DEFAULT_POLL_TIMEOUT 300
On 13.10.2016 17:40, Masahiro Yamada wrote:
ARCH_ZYNQ(MP) selects DM_USB, where CONFIG_USB_MAX_CONTROLLER_COUNT is not used.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
include/configs/xilinx_zynqmp.h | 1 - include/configs/zynq-common.h | 1 - 2 files changed, 2 deletions(-)
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index adc42cf..c8e1ffa 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -110,7 +110,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x8000000
#if defined(CONFIG_ZYNQMP_USB) -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 #define CONFIG_USB_XHCI_ZYNQMP
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 0118fd2..7cca83f 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -86,7 +86,6 @@
#ifdef CONFIG_USB_EHCI_ZYNQ # define CONFIG_EHCI_IS_TDI -# define CONFIG_USB_MAX_CONTROLLER_COUNT 2
# define CONFIG_SYS_DFU_DATA_BUF_SIZE 0x600000 # define DFU_DEFAULT_POLL_TIMEOUT 300
Acked-by: Michal Simek michal.simek@xilinx.com
Thanks, Michal
On Fri, Oct 14, 2016 at 9:29 AM, Michal Simek michal.simek@xilinx.com wrote:
On 13.10.2016 17:40, Masahiro Yamada wrote:
ARCH_ZYNQ(MP) selects DM_USB, where CONFIG_USB_MAX_CONTROLLER_COUNT is not used.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
include/configs/xilinx_zynqmp.h | 1 - include/configs/zynq-common.h | 1 - 2 files changed, 2 deletions(-)
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index adc42cf..c8e1ffa 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -110,7 +110,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x8000000
#if defined(CONFIG_ZYNQMP_USB) -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 #define CONFIG_USB_XHCI_ZYNQMP
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 0118fd2..7cca83f 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -86,7 +86,6 @@
#ifdef CONFIG_USB_EHCI_ZYNQ # define CONFIG_EHCI_IS_TDI -# define CONFIG_USB_MAX_CONTROLLER_COUNT 2
# define CONFIG_SYS_DFU_DATA_BUF_SIZE 0x600000 # define DFU_DEFAULT_POLL_TIMEOUT 300
Acked-by: Michal Simek michal.simek@xilinx.com
Acked-by: Moritz Fischer moritz.fischer@ettus.com
Cheers,
Moritz
ARCH_SUNXI selects DM_USB, where CONFIG_USB_MAX_CONTROLLER_COUNT is not used.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com ---
include/configs/sun4i.h | 1 - include/configs/sun5i.h | 1 - include/configs/sun6i.h | 1 - include/configs/sun7i.h | 1 - include/configs/sun8i.h | 1 - 5 files changed, 5 deletions(-)
diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h index ea079eb..3dfd95a 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/sun5i.h b/include/configs/sun5i.h index d257659..ec8f319 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 67a26c2..6c1eca4 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 d8e6e20..5455901 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 011d70f..a4c3fb6 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
On Thu, Oct 13, 2016 at 9:10 PM, Masahiro Yamada yamada.masahiro@socionext.com wrote:
ARCH_SUNXI selects DM_USB, where CONFIG_USB_MAX_CONTROLLER_COUNT is not used.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
Reviewed-by: Jagan Teki jteki@openedev.com
thanks!
Hi,
On 13-10-16 17:40, Masahiro Yamada wrote:
ARCH_SUNXI selects DM_USB, where CONFIG_USB_MAX_CONTROLLER_COUNT is not used.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
Thank you I've applied this to my tree and will include it in my next pull-req.
Regards,
Hans
include/configs/sun4i.h | 1 - include/configs/sun5i.h | 1 - include/configs/sun6i.h | 1 - include/configs/sun7i.h | 1 - include/configs/sun8i.h | 1 - 5 files changed, 5 deletions(-)
diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h index ea079eb..3dfd95a 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/sun5i.h b/include/configs/sun5i.h index d257659..ec8f319 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 67a26c2..6c1eca4 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 d8e6e20..5455901 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 011d70f..a4c3fb6 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
On 13 October 2016 at 09:39, Masahiro Yamada yamada.masahiro@socionext.com wrote:
ARCH_UNIPHIER selects DM_USB, where CONFIG_USB_MAX_CONTROLLER_COUNT is not used.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
include/configs/uniphier.h | 1 - 1 file changed, 1 deletion(-)
Reviewed-by: Simon Glass sjg@chromium.org
2016-10-14 0:39 GMT+09:00 Masahiro Yamada yamada.masahiro@socionext.com:
ARCH_UNIPHIER selects DM_USB, where CONFIG_USB_MAX_CONTROLLER_COUNT is not used.
Signed-off-by: Masahiro Yamada yamada.masahiro@socionext.com
include/configs/uniphier.h | 1 - 1 file changed, 1 deletion(-)
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 7331d13..5be46e5 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -126,7 +126,6 @@ #define CONFIG_SYS_NAND_BAD_BLOCK_POS 0
/* USB */ -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 4 #define CONFIG_FAT_WRITE
#define CONFIG_DOS_PARTITION
1.9.1
participants (6)
-
Hans de Goede -
Jagan Teki -
Masahiro Yamada -
Michal Simek -
Moritz Fischer -
Simon Glass