Tegra: P2571: Clean up config file

PATCH New Tom Warren 3 participants 5 messages Jul 30, 2015

Share & tools

Tom Warren

author

2015-07-30 21:09 UTC #0 lore raw

PATCH 1/1 Tegra: P2571: Clean up config file

Removed NS16550_COM1 #define, not used since there's no SPL for T210 Also changed the number of USB controllers to 1 as only USBD is used.

Signed-off-by Tom Warren <[email protected]>

---
 include/configs/p2571.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

include/configs/p2571.h +1 -6

index 5df7d2f..b22117b 100644
@@ -22,7 +22,6 @@
 /* Board-specific serial config */
 #define CONFIG_SERIAL_MULTI
 #define CONFIG_TEGRA_ENABLE_UARTA
-#define CONFIG_SYS_NS16550_COM1		NV_PA_APB_UARTA_BASE
 
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA

@@ -51,7 +50,7 @@
 /* USB2.0 Host support */
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_MAX_CONTROLLER_COUNT	2
+#define CONFIG_USB_MAX_CONTROLLER_COUNT	1
 #define CONFIG_USB_STORAGE
 #define CONFIG_CMD_USB

@@ -62,10 +61,6 @@
 /* General networking support */
 #define CONFIG_CMD_DHCP
 
-/*
- * TODO(twarren at nvidia.com) - add tegra-common-usb-gadget.h back
- * breaks 64-bit build in ci_udc.c
- */
 #include "tegra-common-usb-gadget.h"
 #include "tegra-common-post.h"

Signature · 1 line

1.8.2.1.610.g562af5b

Stephen Warren

2015-07-30 21:18 UTC #1 lore raw

PATCH 1/1 Tegra: P2571: Clean up config file

Quoted 2 lines · Tom Warren

Removed NS16550_COM1 #define, not used since there's no SPL for T210 Also changed the number of USB controllers to 1 as only USBD is used.

Acked-by Stephen Warren <[email protected]>

Simon Glass

2015-07-30 21:33 UTC #2 lore raw

PATCH 1/1 Tegra: P2571: Clean up config file

In reply to Tom Warren

Hi Tom,

Quoted 22 lines · Tom Warren

Removed NS16550_COM1 #define, not used since there's no SPL for T210 Also changed the number of USB controllers to 1 as only USBD is used.
Signed-off-by Tom Warren <[email protected]>
---
 include/configs/p2571.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
include/configs/p2571.h +0 -1
index 5df7d2f..b22117b 100644
@@ -22,7 +22,6 @@
 /* Board-specific serial config */
 #define CONFIG_SERIAL_MULTI
 #define CONFIG_TEGRA_ENABLE_UARTA
-#define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTA_BASE
 
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA

include/configs/p2571.h line 53

Quoted 5 lines

include/configs/p2571.h +1 -1

@@ -51,7 +50,7 @@
 /* USB2.0 Host support */
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        2
+#define CONFIG_USB_MAX_CONTROLLER_COUNT        1

You should be able to drop this now that Tegra uses driver model for USB.

Quoted 15 lines

include/configs/p2571.h +0 -5

 #define CONFIG_USB_STORAGE
 #define CONFIG_CMD_USB

@@ -62,10 +61,6 @@
 /* General networking support */
 #define CONFIG_CMD_DHCP
 
-/*
- * TODO(twarren at nvidia.com) - add tegra-common-usb-gadget.h back
- * breaks 64-bit build in ci_udc.c
- */
 #include "tegra-common-usb-gadget.h"
 #include "tegra-common-post.h"
 
--

Quoted 2 lines

1.8.2.1.610.g562af5b

Regards,
Simon

Tom Warren

author

2015-07-30 22:28 UTC #3 lore raw

PATCH 1/1 Tegra: P2571: Clean up config file

Simon,

Quoted 29 lines

-----Original Message-----
From: sjg at google.com [mailto:sjg at google.com] On Behalf Of Simon Glass
Sent: Thursday, July 30, 2015 2:33 PM
To: Tom Warren
Cc: U-Boot Mailing List; Tom Warren; Stephen Warren
Subject: Re: [PATCH] Tegra: P2571: Clean up config file
Hi Tom,
Quoted 19 lines · Tom Warren
Removed NS16550_COM1 #define, not used since there's no SPL for T210 Also changed the number of USB controllers to 1 as only USBD is used.
Signed-off-by Tom Warren <[email protected]>
---
 include/configs/p2571.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
include/configs/p2571.h index renamed from include/configs/p2571.h +0 -0
5df7d2f..b22117b 100644
include/configs/p2571.h +0 -1
@@ -22,7 +22,6 @@
 /* Board-specific serial config */
 #define CONFIG_SERIAL_MULTI
 #define CONFIG_TEGRA_ENABLE_UARTA
-#define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTA_BASE
 

Quoted 10 lines

include/configs/p2571.h line 53
Quoted 8 lines
include/configs/p2571.h +1 -1
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
@@ -51,7 +50,7 @@
 /* USB2.0 Host support */
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        2
+#define CONFIG_USB_MAX_CONTROLLER_COUNT        1
You should be able to drop this now that Tegra uses driver model for USB.

Doesn't seem to work on P2571. If I drop MAX_CONTROLLER_COUNT, it builds, but I get "EHCI failed to shut down host controller" errors on usb start/reset, and I don't see any of my periphs (mouse, USB stick, network dongle). With it in there as I have it above, everything works.

Quoted 15 lines

include/configs/p2571.h +0 -4

 #define CONFIG_USB_STORAGE
 #define CONFIG_CMD_USB

@@ -62,10 +61,6 @@
 /* General networking support */
 #define CONFIG_CMD_DHCP
 
-/*
- * TODO(twarren at nvidia.com) - add tegra-common-usb-gadget.h back
- * breaks 64-bit build in ci_udc.c
- */
 #include "tegra-common-usb-gadget.h"
 #include "tegra-common-post.h"

Quoted 6 lines

Quoted 3 lines
--
1.8.2.1.610.g562af5b
Regards,
Simon

--
nvpublic

Simon Glass

2015-07-30 23:13 UTC #4 lore raw

PATCH 1/1 Tegra: P2571: Clean up config file

Hi Tom,

Quoted 41 lines · Tom Warren

Simon,
Quoted 29 lines
-----Original Message-----
From: sjg at google.com [mailto:sjg at google.com] On Behalf Of Simon Glass
Sent: Thursday, July 30, 2015 2:33 PM
To: Tom Warren
Cc: U-Boot Mailing List; Tom Warren; Stephen Warren
Subject: Re: [PATCH] Tegra: P2571: Clean up config file
Hi Tom,
Quoted 19 lines · Tom Warren
Removed NS16550_COM1 #define, not used since there's no SPL for T210 Also changed the number of USB controllers to 1 as only USBD is used.
Signed-off-by Tom Warren <[email protected]>
---
 include/configs/p2571.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
include/configs/p2571.h index renamed from include/configs/p2571.h +0 -0
5df7d2f..b22117b 100644
include/configs/p2571.h +0 -1
@@ -22,7 +22,6 @@
 /* Board-specific serial config */
 #define CONFIG_SERIAL_MULTI
 #define CONFIG_TEGRA_ENABLE_UARTA
-#define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTA_BASE
 
Quoted 10 lines
include/configs/p2571.h line 53
Quoted 8 lines
include/configs/p2571.h +1 -1
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
@@ -51,7 +50,7 @@
 /* USB2.0 Host support */
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        2
+#define CONFIG_USB_MAX_CONTROLLER_COUNT        1
You should be able to drop this now that Tegra uses driver model for USB.

Quoted 2 lines

Doesn't seem to work on P2571. If I drop MAX_CONTROLLER_COUNT, it builds, but I get "EHCI failed to shut down host controller" errors on usb start/reset, and I don't see any of my periphs (mouse, USB stick, network dongle). With it in there as I have it above, everything works.

Odd...

Do you have CONFIG_DM_USB defined for this board? (check .config or u-boot.cfg after a build). Also are you basing on latest mainline? Hans fixed a few bugs which I applied in the past week.

Quoted 22 lines

Quoted 15 lines

include/configs/p2571.h +0 -4

 #define CONFIG_USB_STORAGE
 #define CONFIG_CMD_USB

@@ -62,10 +61,6 @@
 /* General networking support */
 #define CONFIG_CMD_DHCP
 
-/*
- * TODO(twarren at nvidia.com) - add tegra-common-usb-gadget.h back
- * breaks 64-bit build in ci_udc.c
- */
 #include "tegra-common-usb-gadget.h"
 #include "tegra-common-post.h"

Quoted 6 lines

Quoted 3 lines
--
1.8.2.1.610.g562af5b
Regards,
Simon

Quoted 2 lines

--
nvpublic

Regards,
Simon