| Message ID | 1453934745-23101-1-git-send-email-srae@broadcom.com |
|---|---|
| State | Accepted |
| Commit | d7d8c00575c8ae766d387c763395470410427b69 |
| Headers | show |
ping this one too - Thanks! On 16-01-27 02:45 PM, Steve Rae wrote: > Don't understand how it happened, but this change got applied twice! > Therefore, removing the duplicated items. > > Signed-off-by: Steve Rae <srae@broadcom.com> > --- > > include/configs/bcm28155_ap.h | 20 -------------------- > 1 file changed, 20 deletions(-) > > diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h > index a257084..c9515a8 100644 > --- a/include/configs/bcm28155_ap.h > +++ b/include/configs/bcm28155_ap.h > @@ -130,7 +130,6 @@ > #define CONFIG_CMD_BOOTZ > #define CONFIG_FAT_WRITE > > - > /* Fastboot and USB OTG */ > #define CONFIG_USB_FUNCTION_FASTBOOT > #define CONFIG_CMD_FASTBOOT > @@ -150,23 +149,4 @@ > #define CONFIG_G_DNL_PRODUCT_NUM 0x0d02 /* nexus one */ > #define CONFIG_G_DNL_MANUFACTURER "Broadcom Corporation" > > -/* Fastboot and USB OTG */ > -#define CONFIG_USB_FUNCTION_FASTBOOT > -#define CONFIG_CMD_FASTBOOT > -#define CONFIG_FASTBOOT_FLASH > -#define CONFIG_FASTBOOT_FLASH_MMC_DEV 0 > -#define CONFIG_SYS_CACHELINE_SIZE 64 > -#define CONFIG_USB_FASTBOOT_BUF_SIZE (CONFIG_SYS_SDRAM_SIZE - SZ_1M) > -#define CONFIG_USB_FASTBOOT_BUF_ADDR CONFIG_SYS_SDRAM_BASE > -#define CONFIG_USB_GADGET > -#define CONFIG_USB_GADGET_DUALSPEED > -#define CONFIG_USB_GADGET_VBUS_DRAW 0 > -#define CONFIG_USB_GADGET_S3C_UDC_OTG > -#define CONFIG_USB_GADGET_BCM_UDC_OTG_PHY > -#define CONFIG_USB_GADGET_DOWNLOAD > -#define CONFIG_USBID_ADDR 0x34052c46 > -#define CONFIG_G_DNL_VENDOR_NUM 0x18d1 /* google */ > -#define CONFIG_G_DNL_PRODUCT_NUM 0x0d02 /* nexus one */ > -#define CONFIG_G_DNL_MANUFACTURER "Broadcom Corporation" > - > #endif /* __BCM28155_AP_H */ > _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index a257084..c9515a8 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -130,7 +130,6 @@ #define CONFIG_CMD_BOOTZ #define CONFIG_FAT_WRITE - /* Fastboot and USB OTG */ #define CONFIG_USB_FUNCTION_FASTBOOT #define CONFIG_CMD_FASTBOOT @@ -150,23 +149,4 @@ #define CONFIG_G_DNL_PRODUCT_NUM 0x0d02 /* nexus one */ #define CONFIG_G_DNL_MANUFACTURER "Broadcom Corporation" -/* Fastboot and USB OTG */ -#define CONFIG_USB_FUNCTION_FASTBOOT -#define CONFIG_CMD_FASTBOOT -#define CONFIG_FASTBOOT_FLASH -#define CONFIG_FASTBOOT_FLASH_MMC_DEV 0 -#define CONFIG_SYS_CACHELINE_SIZE 64 -#define CONFIG_USB_FASTBOOT_BUF_SIZE (CONFIG_SYS_SDRAM_SIZE - SZ_1M) -#define CONFIG_USB_FASTBOOT_BUF_ADDR CONFIG_SYS_SDRAM_BASE -#define CONFIG_USB_GADGET -#define CONFIG_USB_GADGET_DUALSPEED -#define CONFIG_USB_GADGET_VBUS_DRAW 0 -#define CONFIG_USB_GADGET_S3C_UDC_OTG -#define CONFIG_USB_GADGET_BCM_UDC_OTG_PHY -#define CONFIG_USB_GADGET_DOWNLOAD -#define CONFIG_USBID_ADDR 0x34052c46 -#define CONFIG_G_DNL_VENDOR_NUM 0x18d1 /* google */ -#define CONFIG_G_DNL_PRODUCT_NUM 0x0d02 /* nexus one */ -#define CONFIG_G_DNL_MANUFACTURER "Broadcom Corporation" - #endif /* __BCM28155_AP_H */
Don't understand how it happened, but this change got applied twice! Therefore, removing the duplicated items. Signed-off-by: Steve Rae <srae@broadcom.com> --- include/configs/bcm28155_ap.h | 20 -------------------- 1 file changed, 20 deletions(-) -- 1.8.5 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot