diff mbox

[U-Boot,3/3] include: configs: Enable DWC3 and DFU in ti_omap5_common

Message ID 1439973801-12616-4-git-send-email-kishon@ti.com
State Rejected
Delegated to: Tom Rini
Headers show

Commit Message

Kishon Vijay Abraham I Aug. 19, 2015, 8:43 a.m. UTC 
Enabled configs for dwc3, dwc3-omap and PHY for dwc3 in
ti_omap5_common. Also enabled support for DFU.

Since ti_omap5_common is used by dra7 too, removed these configs
from dra7xx_evm config file.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 include/configs/dra7xx_evm.h      |   63 ----------------------------------
 include/configs/ti_omap5_common.h |   67 +++++++++++++++++++++++++++++++++++--
 2 files changed, 64 insertions(+), 66 deletions(-)

Comments

Tom Rini Aug. 20, 2015, 5:56 p.m. UTC | #1 
On Wed, Aug 19, 2015 at 02:13:21PM +0530, Kishon Vijay Abraham I wrote:

> Enabled configs for dwc3, dwc3-omap and PHY for dwc3 in
> ti_omap5_common. Also enabled support for DFU.
> 
> Since ti_omap5_common is used by dra7 too, removed these configs
> from dra7xx_evm config file.
> 
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

This is starting to move board-specific stuff (like using DFU) into the
common file for all OMAP5 boards, so I don't like this.  NAK in concept,
thanks!
Kishon Vijay Abraham I Aug. 21, 2015, 5:57 a.m. UTC | #2 
Hi Tom,

On Thursday 20 August 2015 11:26 PM, Tom Rini wrote:
> On Wed, Aug 19, 2015 at 02:13:21PM +0530, Kishon Vijay Abraham I wrote:
> 
>> Enabled configs for dwc3, dwc3-omap and PHY for dwc3 in
>> ti_omap5_common. Also enabled support for DFU.
>>
>> Since ti_omap5_common is used by dra7 too, removed these configs
>> from dra7xx_evm config file.
>>
>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
> 
> This is starting to move board-specific stuff (like using DFU) into the
> common file for all OMAP5 boards, so I don't like this.  NAK in concept,
> thanks!

Since we have added support for DFU for all the OMAP5 based boards
(including DRA's), thought it is better to add in a common file which is
used by all these boards.

So do you prefer the configs be added in dra7xx_evm.h, omap5_evm.h,
beagle_x15.h etc..

Thanks
Kishon
Tom Rini Aug. 24, 2015, 4:11 p.m. UTC | #3 
On Fri, Aug 21, 2015 at 11:27:33AM +0530, Kishon Vijay Abraham I wrote:
> Hi Tom,
> 
> On Thursday 20 August 2015 11:26 PM, Tom Rini wrote:
> > On Wed, Aug 19, 2015 at 02:13:21PM +0530, Kishon Vijay Abraham I wrote:
> > 
> >> Enabled configs for dwc3, dwc3-omap and PHY for dwc3 in
> >> ti_omap5_common. Also enabled support for DFU.
> >>
> >> Since ti_omap5_common is used by dra7 too, removed these configs
> >> from dra7xx_evm config file.
> >>
> >> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
> > 
> > This is starting to move board-specific stuff (like using DFU) into the
> > common file for all OMAP5 boards, so I don't like this.  NAK in concept,
> > thanks!
> 
> Since we have added support for DFU for all the OMAP5 based boards
> (including DRA's), thought it is better to add in a common file which is
> used by all these boards.
> 
> So do you prefer the configs be added in dra7xx_evm.h, omap5_evm.h,
> beagle_x15.h etc..

Yes in each config.  As we can see from when am335x (and am43xx now)
starts getting used outside of TI some assumptions get changed and we
still want them opting in on the comon header files :)
diff mbox

Patch

diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 7499447..78a2c25 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -47,47 +47,6 @@ 
 	"uuid_disk=${uuid_gpt_disk};" \
 	"name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}"
 
-#define DFU_ALT_INFO_MMC \
-	"dfu_alt_info_mmc=" \
-	"boot part 0 1;" \
-	"rootfs part 0 2;" \
-	"MLO fat 0 1;" \
-	"MLO.raw raw 0x100 0x100;" \
-	"u-boot.img.raw raw 0x300 0x400;" \
-	"spl-os-args.raw raw 0x80 0x80;" \
-	"spl-os-image.raw raw 0x900 0x2000;" \
-	"spl-os-args fat 0 1;" \
-	"spl-os-image fat 0 1;" \
-	"u-boot.img fat 0 1;" \
-	"uEnv.txt fat 0 1\0"
-
-#define DFU_ALT_INFO_EMMC \
-	"dfu_alt_info_emmc=" \
-	"rawemmc raw 0 3751936;" \
-	"boot part 1 1;" \
-	"rootfs part 1 2;" \
-	"MLO fat 1 1;" \
-	"MLO.raw raw 0x100 0x100;" \
-	"u-boot.img.raw raw 0x300 0x400;" \
-	"spl-os-args.raw raw 0x80 0x80;" \
-	"spl-os-image.raw raw 0x900 0x2000;" \
-	"spl-os-args fat 1 1;" \
-	"spl-os-image fat 1 1;" \
-	"u-boot.img fat 1 1;" \
-	"uEnv.txt fat 1 1\0"
-
-#define DFU_ALT_INFO_RAM \
-	"dfu_alt_info_ram=" \
-	"kernel ram 0x80200000 0x4000000;" \
-	"fdt ram 0x80f80000 0x80000;" \
-	"ramdisk ram 0x81000000 0x4000000\0"
-
-#define DFUARGS \
-	"dfu_bufsiz=0x10000\0" \
-	DFU_ALT_INFO_MMC \
-	DFU_ALT_INFO_EMMC \
-	DFU_ALT_INFO_RAM
-
 /* Fastboot */
 #define CONFIG_USB_FUNCTION_FASTBOOT
 #define CONFIG_CMD_FASTBOOT
@@ -184,28 +143,6 @@ 
 #define CONFIG_OMAP_USB_PHY
 #define CONFIG_OMAP_USB2PHY2_HOST
 
-/* USB GADGET */
-#define CONFIG_USB_DWC3_PHY_OMAP
-#define CONFIG_USB_DWC3_OMAP
-#define CONFIG_USB_DWC3
-#define CONFIG_USB_DWC3_GADGET
-
-#define CONFIG_USB_GADGET
-#define CONFIG_USB_GADGET_DOWNLOAD
-#define CONFIG_USB_GADGET_VBUS_DRAW 2
-#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
-#define CONFIG_G_DNL_VENDOR_NUM 0x0451
-#define CONFIG_G_DNL_PRODUCT_NUM 0xd022
-#define CONFIG_USB_GADGET_DUALSPEED
-
-/* USB Device Firmware Update support */
-#define CONFIG_USB_FUNCTION_DFU
-#define CONFIG_DFU_RAM
-#define CONFIG_CMD_DFU
-
-#define CONFIG_DFU_MMC
-#define CONFIG_DFU_RAM
-
 /* SATA */
 #define CONFIG_BOARD_LATE_INIT
 #define CONFIG_CMD_SCSI
diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index fe04692..5e37843 100644
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -47,6 +47,29 @@ 
 
 #include <configs/ti_armv7_omap.h>
 
+#ifndef CONFIG_CM_T54
+/* USB GADGET */
+#define CONFIG_USB_DWC3_PHY_OMAP
+#define CONFIG_USB_DWC3_OMAP
+#define CONFIG_USB_DWC3
+#define CONFIG_USB_DWC3_GADGET
+
+#define CONFIG_USB_GADGET
+#define CONFIG_USB_GADGET_DOWNLOAD
+#define CONFIG_USB_GADGET_VBUS_DRAW 2
+#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
+#define CONFIG_G_DNL_VENDOR_NUM 0x0403
+#define CONFIG_G_DNL_PRODUCT_NUM 0xBD00
+#define CONFIG_USB_GADGET_DUALSPEED
+
+/* USB Device Firmware Update support */
+#define CONFIG_USB_FUNCTION_DFU
+#define CONFIG_DFU_RAM
+#define CONFIG_CMD_DFU
+
+#define CONFIG_DFU_MMC
+#endif
+
 /*
  * Hardware drivers
  */
@@ -62,9 +85,47 @@ 
 #define PARTS_DEFAULT
 #endif
 
-#ifndef DFUARGS
-#define DFUARGS
-#endif
+
+#define DFU_ALT_INFO_MMC \
+	"dfu_alt_info_mmc=" \
+	"boot part 0 1;" \
+	"rootfs part 0 2;" \
+	"MLO fat 0 1;" \
+	"MLO.raw raw 0x100 0x100;" \
+	"u-boot.img.raw raw 0x300 0x400;" \
+	"spl-os-args.raw raw 0x80 0x80;" \
+	"spl-os-image.raw raw 0x900 0x2000;" \
+	"spl-os-args fat 0 1;" \
+	"spl-os-image fat 0 1;" \
+	"u-boot.img fat 0 1;" \
+	"uEnv.txt fat 0 1\0"
+
+#define DFU_ALT_INFO_EMMC \
+	"dfu_alt_info_emmc=" \
+	"rawemmc raw 0 3751936;" \
+	"boot part 1 1;" \
+	"rootfs part 1 2;" \
+	"MLO fat 1 1;" \
+	"MLO.raw raw 0x100 0x100;" \
+	"u-boot.img.raw raw 0x300 0x400;" \
+	"spl-os-args.raw raw 0x80 0x80;" \
+	"spl-os-image.raw raw 0x900 0x2000;" \
+	"spl-os-args fat 1 1;" \
+	"spl-os-image fat 1 1;" \
+	"u-boot.img fat 1 1;" \
+	"uEnv.txt fat 1 1\0"
+
+#define DFU_ALT_INFO_RAM \
+	"dfu_alt_info_ram=" \
+	"kernel ram 0x80200000 0x4000000;" \
+	"fdt ram 0x80f80000 0x80000;" \
+	"ramdisk ram 0x81000000 0x4000000\0"
+
+#define DFUARGS \
+	"dfu_bufsiz=0x10000\0" \
+	DFU_ALT_INFO_MMC \
+	DFU_ALT_INFO_EMMC \
+	DFU_ALT_INFO_RAM
 
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG