diff --git a/include/configs/p2571.h b/include/configs/p2571.h
index 5df7d2f387dfbbf8882302a1bdd3c3d1d529383c..b22117bfdf485a918dac8226bee04a294bef22c1 100644
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -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@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"