Skip to contentSkip to conversation

am335x: Update list of defconfigs

PATCH New Tom Rini 2 participants 12 messages Jun 30, 2020

Subsystems (3)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/4 am335x: Update list of defconfigs

Both the am335x_boneblack and am335x_evm_usbspl configs have been gone for a while, remove their entries from MAINTAINERS.

---
 board/ti/am335x/MAINTAINERS | 2 --
 1 file changed, 2 deletions(-)
board/ti/am335x/MAINTAINERS +0 -2
index 565f7055cdd3..e100adfd68ec 100644
@@ -3,7 +3,5 @@ M:	Tom Rini <[email protected]>
 S:	Maintained
 F:	board/ti/am335x/
 F:	include/configs/am335x_evm.h
-F:	configs/am335x_boneblack_defconfig
 F:	configs/am335x_boneblack_vboot_defconfig
 F:	configs/am335x_evm_defconfig
-F:	configs/am335x_evm_usbspl_defconfig
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 1/4 am335x: Update list of defconfigs

Quoted 4 lines · Tom Rini

Both the am335x_boneblack and am335x_evm_usbspl configs have been gone for a while, remove their entries from MAINTAINERS.

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/a6839f03/attachment.sig>
author
#2 lore raw

PATCH 2/4 omap3_beagle: Disable USB support

In reply to Tom Rini

Disable USB support for now. There is non-trivial work required to fully move the OMAP3 platforms to DM. While this work is in-progress, disable USB support for now as we've gone well past the migration deadline.

---
 configs/omap3_beagle_defconfig | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)
configs/omap3_beagle_defconfig +2 -18
index ed7cb8f2ff63..236a4f4f5f5a 100644
@@ -9,6 +9,7 @@ CONFIG_NR_DRAM_BANKS=2
 CONFIG_SPL=y
 CONFIG_SPL_TEXT_BASE=0x40200000
 CONFIG_DISTRO_DEFAULTS=y
+CONFIG_ANDROID_BOOT_IMAGE=y
 CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd"
 CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="usb start"
@@ -31,7 +32,6 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_SPI=y
-CONFIG_CMD_USB=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FS_UUID=y
@@ -50,8 +50,6 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_OF_TRANSLATE=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_FASTBOOT_BUF_ADDR=0x82000000
 CONFIG_LED_STATUS=y
 CONFIG_LED_STATUS0=y
 CONFIG_LED_STATUS_BIT=1
@@ -73,24 +71,10 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
 CONFIG_SPL_NAND_SIMPLE=y
+CONFIG_DM_ETH=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
-CONFIG_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_OMAP3=y
-CONFIG_USB_MUSB_GADGET=y
-CONFIG_USB_MUSB_OMAP2PLUS=y
-CONFIG_TWL4030_USB=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="TI"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0451
-CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_ETHER=y
-CONFIG_USB_HOST_ETHER=y
-CONFIG_USB_ETHER_ASIX=y
-CONFIG_USB_ETHER_MCS7830=y
-CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_VIDEO_OMAP3=y
 CONFIG_FAT_WRITE=y
 CONFIG_BCH=y
Signature · 1 line
2.17.1
#3 lore raw

PATCH 2/4 omap3_beagle: Disable USB support

Quoted 9 lines · Tom Rini

Disable USB support for now. There is non-trivial work required to fully move the OMAP3 platforms to DM. While this work is in-progress, disable USB support for now as we've gone well past the migration deadline.

---

I don't have a beagle, but I have DM_USB working on two different OMAP3 boards. I am curious to know what's left or what's not working.

adam

Quoted 61 lines
 configs/omap3_beagle_defconfig | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)
configs/omap3_beagle_defconfig +2 -19
index ed7cb8f2ff63..236a4f4f5f5a 100644
@@ -9,6 +9,7 @@ CONFIG_NR_DRAM_BANKS=2
 CONFIG_SPL=y
 CONFIG_SPL_TEXT_BASE=0x40200000
 CONFIG_DISTRO_DEFAULTS=y
+CONFIG_ANDROID_BOOT_IMAGE=y
 CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd"
 CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="usb start"
@@ -31,7 +32,6 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_SPI=y
-CONFIG_CMD_USB=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FS_UUID=y
@@ -50,8 +50,6 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_OF_TRANSLATE=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_FASTBOOT_BUF_ADDR=0x82000000
 CONFIG_LED_STATUS=y
 CONFIG_LED_STATUS0=y
 CONFIG_LED_STATUS_BIT=1
@@ -73,24 +71,10 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
 CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
 CONFIG_SPL_NAND_SIMPLE=y
+CONFIG_DM_ETH=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
-CONFIG_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_OMAP3=y
-CONFIG_USB_MUSB_GADGET=y
-CONFIG_USB_MUSB_OMAP2PLUS=y
-CONFIG_TWL4030_USB=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="TI"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0451
-CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_ETHER=y
-CONFIG_USB_HOST_ETHER=y
-CONFIG_USB_ETHER_ASIX=y
-CONFIG_USB_ETHER_MCS7830=y
-CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_VIDEO_OMAP3=y
 CONFIG_FAT_WRITE=y
 CONFIG_BCH=y
--

2.17.1

author
#4 lore raw

PATCH 2/4 omap3_beagle: Disable USB support

Quoted 7 lines · Adam Ford
Quoted 6 lines · Tom Rini

Disable USB support for now. There is non-trivial work required to fully move the OMAP3 platforms to DM. While this work is in-progress, disable USB support for now as we've gone well past the migration deadline.

Quoted 6 lines
Quoted 3 lines

---

I don't have a beagle, but I have DM_USB working on two different OMAP3 boards. I am curious to know what's left or what's not working.

Oh? I thought when we talked last there was still more to do to fully migrate things over. Where should I check again to see what I need to do on beagle to convert it over? Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/3eac2728/attachment.sig>
#5 lore raw

PATCH 2/4 omap3_beagle: Disable USB support

Quoted 13 lines · Tom Rini
Quoted 11 lines · Adam Ford
Quoted 9 lines · Tom Rini

Disable USB support for now. There is non-trivial work required to fully move the OMAP3 platforms to DM. While this work is in-progress, disable USB support for now as we've gone well past the migration deadline.

---

Quoted 6 lines
Quoted 2 lines

I don't have a beagle, but I have DM_USB working on two different OMAP3 boards. I am curious to know what's left or what's not working.

Oh? I thought when we talked last there was still more to do to fully migrate things over. Where should I check again to see what I need to do on beagle to convert it over? Thanks!

With [1], the DM support for the EHCI controller was added. There is still some work to be done to make it better, because there are still some #defines that need to assign the reset GPIO's. Ideally we'd get rid of the GPIO defines and use the device tree to address the reset. It isn't perfect, but it's better than having no USB at all. The am3517_evm and omap3_logic_somlv have them working. Make sure the board files have the legacy USB stuff removed [2]

[1] - https://gitlab.denx.de/u-boot/u-boot/-/commit/94ed66194f150c308d1713965a28abce3ac6e200
[2] - https://gitlab.denx.de/u-boot/u-boot/-/commit/76f6d52e61a1968702af69d6cea463b9d9332a96

Let me know if there is anything I can do to help.

adam

Quoted 3 lines

--
Tom

author
#6 lore raw

PATCH 2/4 omap3_beagle: Disable USB support

Quoted 29 lines · Adam Ford
Quoted 13 lines · Tom Rini
Quoted 11 lines · Adam Ford
Quoted 9 lines · Tom Rini

Disable USB support for now. There is non-trivial work required to fully move the OMAP3 platforms to DM. While this work is in-progress, disable USB support for now as we've gone well past the migration deadline.

---

Quoted 6 lines
Quoted 2 lines

I don't have a beagle, but I have DM_USB working on two different OMAP3 boards. I am curious to know what's left or what's not working.

Oh? I thought when we talked last there was still more to do to fully migrate things over. Where should I check again to see what I need to do on beagle to convert it over? Thanks!

With [1], the DM support for the EHCI controller was added. There is still some work to be done to make it better, because there are still some #defines that need to assign the reset GPIO's. Ideally we'd get rid of the GPIO defines and use the device tree to address the reset. It isn't perfect, but it's better than having no USB at all. The am3517_evm and omap3_logic_somlv have them working. Make sure the board files have the legacy USB stuff removed [2]

Quoted 4 lines

[1] - https://gitlab.denx.de/u-boot/u-boot/-/commit/94ed66194f150c308d1713965a28abce3ac6e200
[2] - https://gitlab.denx.de/u-boot/u-boot/-/commit/76f6d52e61a1968702af69d6cea463b9d9332a96

Let me know if there is anything I can do to help.

Hunh, thanks. I thought I had tried this much before but had things blow up. With [2] it's a quick conversion and passing basic sanity checks. Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/5c616ad8/attachment.sig>
author
#7 lore raw

PATCH 2/4 omap3_beagle: Disable USB support

In reply to Tom Rini
Quoted 7 lines · Tom Rini

Disable USB support for now. There is non-trivial work required to fully move the OMAP3 platforms to DM. While this work is in-progress, disable USB support for now as we've gone well past the migration deadline.

As Adam noted, I should just convert this instead. It does in fact convert easily at this point, so I'm rejecting this patch and will post a conversion instead soon.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/d2186e3f/attachment.sig>
author
#8 lore raw

PATCH 3/4 ti816x_evm: Enable DM_MMC

In reply to Tom Rini

This platform is already using DM in general and the MMC controller is the early generation of what is compatible with "ti,omap4-hsmmc" so enable DM_MMC (which in turn gets BLK enabled).

---
 configs/ti816x_evm_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/ti816x_evm_defconfig +1 -0
index 17aa6a02067c..033d35df4d02 100644
@@ -47,6 +47,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_OMAP24XX=y
+CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
Signature · 1 line
2.17.1
author
#9 lore raw

PATCH 3/4 ti816x_evm: Enable DM_MMC

Quoted 5 lines · Tom Rini

This platform is already using DM in general and the MMC controller is the early generation of what is compatible with "ti,omap4-hsmmc" so enable DM_MMC (which in turn gets BLK enabled).

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/46800ee0/attachment.sig>
author
#10 lore raw

PATCH 4/4 ti814x: Remove platform

In reply to Tom Rini

The TI814x (DM814x) platform is rather old and in need of a lot of migration work. As much of that work is well past the deadline, remove this platform.

---
 arch/arm/mach-omap2/Kconfig  |   1 -
 board/ti/ti814x/Kconfig      |  15 ---
 board/ti/ti814x/MAINTAINERS  |   6 --
 board/ti/ti814x/Makefile     |  11 --
 board/ti/ti814x/evm.c        | 190 -----------------------------------
 board/ti/ti814x/evm.h        |   8 --
 board/ti/ti814x/mux.c        |  86 ----------------
 configs/ti814x_evm_defconfig |  45 ---------
 8 files changed, 362 deletions(-)
 delete mode 100644 board/ti/ti814x/Kconfig
 delete mode 100644 board/ti/ti814x/MAINTAINERS
 delete mode 100644 board/ti/ti814x/Makefile
 delete mode 100644 board/ti/ti814x/evm.c
 delete mode 100644 board/ti/ti814x/evm.h
 delete mode 100644 board/ti/ti814x/mux.c
 delete mode 100644 configs/ti814x_evm_defconfig
arch/arm/mach-omap2/Kconfig +0 -1
index 4c87cbc00f74..48bc80a6390a 100644
@@ -181,7 +181,6 @@ source "board/BuR/brppt1/Kconfig"
 source "board/siemens/draco/Kconfig"
 source "board/siemens/pxm2/Kconfig"
 source "board/siemens/rut/Kconfig"
-source "board/ti/ti814x/Kconfig"
 source "board/ti/ti816x/Kconfig"
 source "board/ti/am43xx/Kconfig"
 source "board/ti/am335x/Kconfig"
board/ti/ti814x/Kconfig deleted +0 -15
deleted file mode 100644
index 2960099a8e5b..000000000000
@@ -1,15 +0,0 @@
-if TARGET_TI814X_EVM
-
-config SYS_BOARD
-	default "ti814x"
-
-config SYS_VENDOR
-	default "ti"
-
-config SYS_SOC
-	default "am33xx"
-
-config SYS_CONFIG_NAME
-	default "ti814x_evm"
-
-endif
board/ti/ti814x/MAINTAINERS deleted +0 -6
deleted file mode 100644
index b2ee39e8a339..000000000000
@@ -1,6 +0,0 @@
-TI814X BOARD
-M:	Tom Rini <[email protected]>
-S:	Maintained
-F:	board/ti/ti814x/
-F:	include/configs/ti814x_evm.h
-F:	configs/ti814x_evm_defconfig
board/ti/ti814x/Makefile deleted +0 -11
deleted file mode 100644
index c5ff8d072851..000000000000
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Makefile
-#
-# Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
-
-ifdef CONFIG_SPL_BUILD
-obj-y	:= mux.o
-endif
-
-obj-y	+= evm.o
board/ti/ti814x/evm.c deleted +0 -190

190 lines not on this page · raw message

board/ti/ti814x/evm.h deleted +0 -8
deleted file mode 100644
index 6aebec62d4a4..000000000000
@@ -1,8 +0,0 @@
-#ifndef _EVM_H
-#define _EVM_H
-
-void enable_uart0_pin_mux(void);
-void enable_mmc1_pin_mux(void);
-void enable_enet_pin_mux(void);
-
-#endif /* _EVM_H */
board/ti/ti814x/mux.c deleted +0 -86

86 lines not on this page · raw message

configs/ti814x_evm_defconfig deleted +0 -45

45 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#11 lore raw

PATCH 4/4 ti814x: Remove platform

Quoted 5 lines · Tom Rini

The TI814x (DM814x) platform is rather old and in need of a lot of migration work. As much of that work is well past the deadline, remove this platform.

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/c73bec6e/attachment.sig>