[PATCH v5 00/12] arm: am335x: Switch to upstream devicetree

public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed

* [PATCH v5 00/12] arm: am335x: Switch to upstream devicetree
@ 2026-04-10 13:31 Markus Schneider-Pargmann (TI)
  2026-04-10 13:31 ` [PATCH v5 01/12] arm: dts: am335x-evm: Add backlight to the panel Markus Schneider-Pargmann (TI)
                   ` (11 more replies)
  0 siblings, 12 replies; 22+ messages in thread
From: Markus Schneider-Pargmann (TI) @ 2026-04-10 13:31 UTC (permalink / raw)
  To: u-boot, Marc Murphy
  Cc: Tom Rini, Rasmus Villemoes, Kory Maincent, Marek Vasut,
	Romain Gantois, Parvathi Pudi, Basharath Hussain Khaja,
	Paul Barker, Andrew F. Davis, Simon Glass, Anshul Dalal,
	Michael Trimarchi, Markus Schneider-Pargmann (TI)

The series is split into two logical groups:

- Patches 1-3: Fixes for am335x-evm to boot and support the LCD panel
  with the current u-boot devicetree.
- Patches 4-12: Make upstream devicetree working with uboot. This
  adds tick-timer, adds compatibility of the board code for different
  USB probing, makes SPL smaller and updates the defconfig.

The series has been tested on am335x-evm. Note that I don't have all
other boards built with the am335x_*evm_*defconfig, so tests are
appreciated. buildman reports builds are working.

Dependencies:
  - net: cpsw: Add cpsw-switch DT binding support
      https://lore.kernel.org/r/20260410-topic-cpsw-switch-v2026-07-next-v1-0-c914724b13e4@baylibre.com

Best,
Markus

Signed-off-by: Markus Schneider-Pargmann (TI) <msp@baylibre.com>
---
Changes in v5:
- Add patch to add lcdc on beagle bone black to all boot phases. Without
  this patch booting uboot on bbb fails.
- Add patch to split SIMPLE_PM_BUS into two, one for SPL and one for
  normal u-boot. This was done to reduce the size of SPL.
- Link to v4: https://lore.kernel.org/r/20260127-topic-am33-evm-oftree-v2026-01-v4-0-0dadb0710ce7@baylibre.com

Changes in v4:
- Add patch to enable SPL_OPTIMIZE_INLINING to reduce size and fix the
  build
- Link to v3: https://lore.kernel.org/r/20251204-topic-am33-evm-oftree-v2026-01-v3-0-3d1566ce4dc7@baylibre.com

Changes in v3:
- Add patch to unify all config variants for the am335x-evm and similar
  boards. This also updates the upstream defconfig enablement patch to
  effectively switch all config variants to OF_UPSTREAM.
- Link to v2: https://lore.kernel.org/r/20251128-topic-am33-evm-oftree-v2026-01-v2-0-42a863304498@baylibre.com

Changes in v2:
- Most of the independent patches were extracted in smaller series
- Added patch to add vidconsole for am335x-evm
- Add chosen tick-timer to all devicetrees that are used with the
  am335x_evm_defconfig
- Link to v1: https://lore.kernel.org/r/20251118-topic-am33-evm-oftree-v2026-01-v1-0-91ce13c661e2@baylibre.com

---
Markus Schneider-Pargmann (TI) (12):
      arm: dts: am335x-evm: Add backlight to the panel
      configs: am335x_evm_defconfig: Enable panel
      include: configs: am335x_evm: Enable vidconsole
      configs: am335x_evm: Enable SPL_OPTIMIZE_INLINING
      configs: am335x_evm: Unify evm board defconfigs
      am33xx: Avoid hard failure on USB probe issue
      arm: dts: am335x-*-u-boot: Add chosen tick-timer
      arm: dts: am335x-boneblack-u-boot: Add lcdc to all boot phases
      am33xx: Fix comment about config symbols
      am33xx: Support upstream devicetree USB device
      dm: core: Split SIMPLE_PM_BUS into phases
      configs: am335x_evm_defconfig: Switch to upstream devicetree

 arch/arm/dts/am335x-bone-common-u-boot.dtsi        | 14 ++++
 arch/arm/dts/am335x-bone-u-boot.dtsi               |  6 ++
 arch/arm/dts/am335x-boneblack-u-boot.dtsi          | 17 ++++
 arch/arm/dts/am335x-bonegreen-u-boot.dtsi          |  6 ++
 arch/arm/dts/am335x-evm-u-boot.dtsi                |  6 ++
 arch/arm/dts/am335x-evm.dts                        |  3 +-
 arch/arm/dts/am335x-evmsk-u-boot.dtsi              |  6 ++
 arch/arm/dts/am335x-icev2-u-boot.dtsi              |  4 +
 arch/arm/dts/am335x-pocketbeagle-u-boot.dtsi       |  6 ++
 .../am335x-sancloud-bbe-extended-wifi-u-boot.dtsi  |  6 ++
 arch/arm/mach-omap2/am33xx/board.c                 | 21 +++--
 configs/am335x_evm.config                          | 86 +++++++++++++++++++
 configs/am335x_evm_defconfig                       | 96 ++++------------------
 configs/am335x_evm_spiboot_defconfig               | 85 +------------------
 configs/am335x_hs_evm.config                       | 14 ++++
 configs/am335x_hs_evm_defconfig                    | 95 +--------------------
 configs/am335x_hs_evm_uart_defconfig               | 94 +--------------------
 drivers/core/Kconfig                               |  8 ++
 drivers/core/Makefile                              |  2 +-
 include/configs/am335x_evm.h                       |  2 +
 20 files changed, 221 insertions(+), 356 deletions(-)
---
base-commit: 32750a1d473aa4932de6303e62afc5306aee2b1f
change-id: 20251118-topic-am33-evm-oftree-v2026-01-ea701e03f8cf
prerequisite-change-id: 20260410-topic-cpsw-switch-v2026-07-next-89e21f2d2446:v1
prerequisite-patch-id: 896e00f13956d28e056dd63764ad8906a0b626ef
prerequisite-patch-id: f612a9425d5a466c7585decbd8990d497a02cdfb
prerequisite-patch-id: 9b18f917297f98b76a75f3d16536283b4c1bc76b
prerequisite-patch-id: 2baa422fb10baa29bf4274a658eb7afba8c7b489

Best regards,
-- 
Markus Schneider-Pargmann (TI) <msp@baylibre.com>


^ permalink raw reply	[flat|nested] 22+ messages in thread

* [PATCH v5 01/12] arm: dts: am335x-evm: Add backlight to the panel
  2026-04-10 13:31 [PATCH v5 00/12] arm: am335x: Switch to upstream devicetree Markus Schneider-Pargmann (TI)
@ 2026-04-10 13:31 ` Markus Schneider-Pargmann (TI)
  2026-04-10 13:31 ` [PATCH v5 02/12] configs: am335x_evm_defconfig: Enable panel Markus Schneider-Pargmann (TI)
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 22+ messages in thread
From: Markus Schneider-Pargmann (TI) @ 2026-04-10 13:31 UTC (permalink / raw)
  To: u-boot, Marc Murphy
  Cc: Tom Rini, Rasmus Villemoes, Kory Maincent, Marek Vasut,
	Romain Gantois, Parvathi Pudi, Basharath Hussain Khaja,
	Paul Barker, Andrew F. Davis, Simon Glass, Anshul Dalal,
	Michael Trimarchi, Markus Schneider-Pargmann (TI)

Add backlight phandle reference to panel node. Without this reference,
the display driver cannot control backlight, leaving the panel dark.

Reviewed-by: Kory Maincent <kory.maincent@bootlin.com>
Signed-off-by: Markus Schneider-Pargmann (TI) <msp@baylibre.com>
---
 arch/arm/dts/am335x-evm.dts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/dts/am335x-evm.dts b/arch/arm/dts/am335x-evm.dts
index 1b5b627006822a9bb4df1c6433ce7eff114dc029..52ca4ff6809ad24fafbdd515fbcde840715cf20f 100644
--- a/arch/arm/dts/am335x-evm.dts
+++ b/arch/arm/dts/am335x-evm.dts
@@ -94,7 +94,7 @@
 		};
 	};
 
-	backlight {
+	pwm_backlight: backlight {
 		compatible = "pwm-backlight";
 		pwms = <&ecap0 0 50000 0>;
 		brightness-levels = <0 51 53 56 62 75 101 152 255>;
@@ -106,6 +106,7 @@
 		status = "okay";
 		pinctrl-names = "default";
 		pinctrl-0 = <&lcd_pins_s0>;
+		backlight = <&pwm_backlight>;
 		panel-info {
 			ac-bias           = <255>;
 			ac-bias-intrpt    = <0>;

-- 
2.53.0


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH v5 02/12] configs: am335x_evm_defconfig: Enable panel
  2026-04-10 13:31 [PATCH v5 00/12] arm: am335x: Switch to upstream devicetree Markus Schneider-Pargmann (TI)
  2026-04-10 13:31 ` [PATCH v5 01/12] arm: dts: am335x-evm: Add backlight to the panel Markus Schneider-Pargmann (TI)
@ 2026-04-10 13:31 ` Markus Schneider-Pargmann (TI)
  2026-04-10 13:31 ` [PATCH v5 03/12] include: configs: am335x_evm: Enable vidconsole Markus Schneider-Pargmann (TI)
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 22+ messages in thread
From: Markus Schneider-Pargmann (TI) @ 2026-04-10 13:31 UTC (permalink / raw)
  To: u-boot, Marc Murphy
  Cc: Tom Rini, Rasmus Villemoes, Kory Maincent, Marek Vasut,
	Romain Gantois, Parvathi Pudi, Basharath Hussain Khaja,
	Paul Barker, Andrew F. Davis, Simon Glass, Anshul Dalal,
	Michael Trimarchi, Markus Schneider-Pargmann (TI)

Enable LCD panel support on am335x-evm:
 - CLK_CCF and CLK_TI_* for display clock tree
 - DM_PWM and PWM_TI_ECAP for backlight control
 - VIDEO and AM335X_LCD for display controller

Reviewed-by: Kory Maincent <kory.maincent@bootlin.com>
Signed-off-by: Markus Schneider-Pargmann (TI) <msp@baylibre.com>
---
 configs/am335x_evm_defconfig | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index 5a3e0530a31663faf565e0afeede5765be16985b..bd188c252780fb541afbbe61a243bddaab79be93 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -60,8 +60,14 @@ CONFIG_NET_RETRY_COUNT=10
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_SYS_BOOTCOUNT_BE=y
+CONFIG_CLK=y
+CONFIG_CLK_CCF=y
 CONFIG_CLK_CDCE9XX=y
+CONFIG_CLK_TI_AM3_DPLL=y
 CONFIG_CLK_TI_CTRL=y
+CONFIG_CLK_TI_DIVIDER=y
+CONFIG_CLK_TI_GATE=y
+CONFIG_CLK_TI_MUX=y
 CONFIG_DFU_TFTP=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_NAND=y
@@ -71,6 +77,7 @@ CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=1
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
 CONFIG_DM_I2C=y
+CONFIG_MISC=y
 CONFIG_SYS_I2C_EEPROM_ADDR=0x50
 # CONFIG_MMC_HW_PARTITIONING is not set
 CONFIG_MMC_OMAP_HS=y
@@ -95,6 +102,8 @@ CONFIG_DM_PMIC=y
 # CONFIG_SPL_DM_PMIC is not set
 CONFIG_PMIC_TPS65217=y
 CONFIG_SPL_POWER_TPS65910=y
+CONFIG_DM_PWM=y
+CONFIG_PWM_TI_ECAP=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
@@ -113,6 +122,8 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0451
 CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
 CONFIG_USB_ETHER=y
 CONFIG_SPL_USB_ETHER=y
+CONFIG_VIDEO=y
+CONFIG_AM335X_LCD=y
 CONFIG_WDT=y
 # CONFIG_SPL_WDT is not set
 CONFIG_DYNAMIC_CRC_TABLE=y

-- 
2.53.0


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH v5 03/12] include: configs: am335x_evm: Enable vidconsole
  2026-04-10 13:31 [PATCH v5 00/12] arm: am335x: Switch to upstream devicetree Markus Schneider-Pargmann (TI)
  2026-04-10 13:31 ` [PATCH v5 01/12] arm: dts: am335x-evm: Add backlight to the panel Markus Schneider-Pargmann (TI)
  2026-04-10 13:31 ` [PATCH v5 02/12] configs: am335x_evm_defconfig: Enable panel Markus Schneider-Pargmann (TI)
@ 2026-04-10 13:31 ` Markus Schneider-Pargmann (TI)
  2026-04-10 13:31 ` [PATCH v5 04/12] configs: am335x_evm: Enable SPL_OPTIMIZE_INLINING Markus Schneider-Pargmann (TI)
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 22+ messages in thread
From: Markus Schneider-Pargmann (TI) @ 2026-04-10 13:31 UTC (permalink / raw)
  To: u-boot, Marc Murphy
  Cc: Tom Rini, Rasmus Villemoes, Kory Maincent, Marek Vasut,
	Romain Gantois, Parvathi Pudi, Basharath Hussain Khaja,
	Paul Barker, Andrew F. Davis, Simon Glass, Anshul Dalal,
	Michael Trimarchi, Markus Schneider-Pargmann (TI)

Enable vidconsole for the am335x-evm board.

Reviewed-by: Kory Maincent <kory.maincent@bootlin.com>
Signed-off-by: Markus Schneider-Pargmann (TI) <msp@baylibre.com>
---
 include/configs/am335x_evm.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index d2164b41d6d6e74c7da0554b966ad5ee1f78e8b2..babf065bc3ea8c63f562ecfb07080f471b489fcb 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -83,6 +83,8 @@
 	"fdtfile=undefined\0" \
 	"finduuid=part uuid mmc 0:2 uuid\0" \
 	"console=ttyO0,115200n8\0" \
+	"stdout=serial,vidconsole\0" \
+	"stderr=serial,vidconsole\0" \
 	"partitions=" \
 		"uuid_disk=${uuid_gpt_disk};" \
 		"name=bootloader,start=384K,size=1792K," \

-- 
2.53.0


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH v5 04/12] configs: am335x_evm: Enable SPL_OPTIMIZE_INLINING
  2026-04-10 13:31 [PATCH v5 00/12] arm: am335x: Switch to upstream devicetree Markus Schneider-Pargmann (TI)
                   ` (2 preceding siblings ...)
  2026-04-10 13:31 ` [PATCH v5 03/12] include: configs: am335x_evm: Enable vidconsole Markus Schneider-Pargmann (TI)
@ 2026-04-10 13:31 ` Markus Schneider-Pargmann (TI)
  2026-04-10 13:31 ` [PATCH v5 05/12] configs: am335x_evm: Unify evm board defconfigs Markus Schneider-Pargmann (TI)
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 22+ messages in thread
From: Markus Schneider-Pargmann (TI) @ 2026-04-10 13:31 UTC (permalink / raw)
  To: u-boot, Marc Murphy
  Cc: Tom Rini, Rasmus Villemoes, Kory Maincent, Marek Vasut,
	Romain Gantois, Parvathi Pudi, Basharath Hussain Khaja,
	Paul Barker, Andrew F. Davis, Simon Glass, Anshul Dalal,
	Michael Trimarchi, Markus Schneider-Pargmann (TI)

Enable SPL inline optimization to shrink the size. After enabling
OF_UPSTREAM the size is otherwise too big. Enable it before enabling
OF_UPSTREAM to maintain bisect ability.

Signed-off-by: Markus Schneider-Pargmann (TI) <msp@baylibre.com>
---
 configs/am335x_evm_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index bd188c252780fb541afbbe61a243bddaab79be93..17c0f840d3ad3cb6f09fa914655b304e90d0066a 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -23,6 +23,7 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_SPL_SYS_MALLOC=y
 CONFIG_SPL_SYS_MALLOC_SIZE=0x800000
 CONFIG_SPL_FIT_IMAGE_TINY=y
+CONFIG_SPL_OPTIMIZE_INLINING=y
 CONFIG_SPL_ETH=y
 # CONFIG_SPL_FS_EXT4 is not set
 CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot.img"

-- 
2.53.0


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH v5 05/12] configs: am335x_evm: Unify evm board defconfigs
  2026-04-10 13:31 [PATCH v5 00/12] arm: am335x: Switch to upstream devicetree Markus Schneider-Pargmann (TI)
                   ` (3 preceding siblings ...)
  2026-04-10 13:31 ` [PATCH v5 04/12] configs: am335x_evm: Enable SPL_OPTIMIZE_INLINING Markus Schneider-Pargmann (TI)
@ 2026-04-10 13:31 ` Markus Schneider-Pargmann (TI)
  2026-04-13  9:49   ` Kory Maincent
  2026-04-10 13:31 ` [PATCH v5 06/12] am33xx: Avoid hard failure on USB probe issue Markus Schneider-Pargmann (TI)
                   ` (6 subsequent siblings)
  11 siblings, 1 reply; 22+ messages in thread
From: Markus Schneider-Pargmann (TI) @ 2026-04-10 13:31 UTC (permalink / raw)
  To: u-boot, Marc Murphy
  Cc: Tom Rini, Rasmus Villemoes, Kory Maincent, Marek Vasut,
	Romain Gantois, Parvathi Pudi, Basharath Hussain Khaja,
	Paul Barker, Andrew F. Davis, Simon Glass, Anshul Dalal,
	Michael Trimarchi, Markus Schneider-Pargmann (TI)

Much of the config symbols between the evm boards are the same
independent of the actual board. This patch creates a hierarchy for the
am335x_evm configs:

  am335x_evm.config
  `-> am335x_evm_defconfig
  `-> am335x_evm_spiboot_defconfig
  `-> am335x_hs_evm.config
      `-> am335x_hs_evm_defconfig
      `-> am335x_hs_evm_uart_defconfig

Reviewed-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Markus Schneider-Pargmann (TI) <msp@baylibre.com>
---
 configs/am335x_evm.config            | 82 +++++++++++++++++++++++++++++++
 configs/am335x_evm_defconfig         | 84 +------------------------------
 configs/am335x_evm_spiboot_defconfig | 83 +------------------------------
 configs/am335x_hs_evm.config         | 14 ++++++
 configs/am335x_hs_evm_defconfig      | 95 +-----------------------------------
 configs/am335x_hs_evm_uart_defconfig | 94 +----------------------------------
 6 files changed, 104 insertions(+), 348 deletions(-)

diff --git a/configs/am335x_evm.config b/configs/am335x_evm.config
new file mode 100644
index 0000000000000000000000000000000000000000..9c12771a3299bcd0b1c5c14bb4c2306d7b02aae5
--- /dev/null
+++ b/configs/am335x_evm.config
@@ -0,0 +1,82 @@
+CONFIG_ARM=y
+CONFIG_ARCH_CPU_INIT=y
+CONFIG_ARCH_OMAP2PLUS=y
+CONFIG_TI_COMMON_CMD_OPTIONS=y
+CONFIG_SF_DEFAULT_SPEED=24000000
+CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
+CONFIG_AM33XX=y
+CONFIG_CLOCK_SYNTHESIZER=y
+CONFIG_SYS_BOOTM_LEN=0x1000000
+CONFIG_SPL=y
+CONFIG_TIMESTAMP=y
+CONFIG_SPL_LOAD_FIT=y
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_OF_BOARD_SETUP=y
+CONFIG_BOOTCOMMAND="run findfdt; run init_console; run finduuid; run distro_bootcmd"
+CONFIG_LOGLEVEL=3
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
+CONFIG_SPL_SYS_MALLOC=y
+CONFIG_SPL_SYS_MALLOC_SIZE=0x800000
+CONFIG_SPL_FIT_IMAGE_TINY=y
+CONFIG_SPL_OPTIMIZE_INLINING=y
+# CONFIG_SPL_FS_EXT4 is not set
+CONFIG_SPL_MTD=y
+CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
+CONFIG_CMD_NAND=y
+CONFIG_BOOTP_DNS2=y
+CONFIG_CMD_MTDPARTS=y
+# CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_OF_CONTROL=y
+CONFIG_ENV_OVERWRITE=y
+CONFIG_ENV_RELOC_GD_ENV_ADDR=y
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_VERSION_VARIABLE=y
+CONFIG_NET_RETRY_COUNT=10
+CONFIG_BOOTP_SEND_HOSTNAME=y
+CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_SYS_BOOTCOUNT_BE=y
+CONFIG_CLK_CDCE9XX=y
+CONFIG_DFU_MMC=y
+CONFIG_DFU_NAND=y
+CONFIG_DFU_RAM=y
+CONFIG_USB_FUNCTION_FASTBOOT=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_EEPROM_ADDR=0x50
+# CONFIG_MMC_HW_PARTITIONING is not set
+CONFIG_MMC_OMAP_HS=y
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
+CONFIG_SYS_NAND_ONFI_DETECTION=y
+CONFIG_SYS_NAND_PAGE_SIZE=0x800
+CONFIG_SYS_NAND_OOBSIZE=0x40
+CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
+CONFIG_SYS_NAND_U_BOOT_OFFS=0xc0000
+CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_PHY_ATHEROS=y
+CONFIG_PHY_SMSC=y
+CONFIG_MII=y
+CONFIG_DRIVER_TI_CPSW=y
+CONFIG_DM_PMIC=y
+# CONFIG_SPL_DM_PMIC is not set
+CONFIG_PMIC_TPS65217=y
+CONFIG_SPL_POWER_TPS65910=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_OMAP3_SPI=y
+CONFIG_TIMER=y
+CONFIG_OMAP_TIMER=y
+CONFIG_USB=y
+CONFIG_DM_USB_GADGET=y
+CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_TI=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
+CONFIG_USB_ETHER=y
+CONFIG_WDT=y
+# CONFIG_SPL_WDT is not set
+CONFIG_DYNAMIC_CRC_TABLE=y
+CONFIG_LZO=y
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index 17c0f840d3ad3cb6f09fa914655b304e90d0066a..448b0a8308fcca04732b81313c72f7fd2247d1ca 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -1,33 +1,12 @@
-CONFIG_ARM=y
-CONFIG_ARCH_CPU_INIT=y
-CONFIG_ARCH_OMAP2PLUS=y
-CONFIG_TI_COMMON_CMD_OPTIONS=y
-CONFIG_SF_DEFAULT_SPEED=24000000
-CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
-CONFIG_AM33XX=y
-CONFIG_CLOCK_SYNTHESIZER=y
+#include <configs/am335x_evm.config>
+
 CONFIG_AM335X_USB0=y
 CONFIG_AM335X_USB0_PERIPHERAL=y
 CONFIG_AM335X_USB1=y
-CONFIG_SYS_BOOTM_LEN=0x1000000
-CONFIG_SPL=y
-CONFIG_TIMESTAMP=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_OF_BOARD_SETUP=y
-CONFIG_BOOTCOMMAND="run findfdt; run init_console; run finduuid; run distro_bootcmd"
-CONFIG_LOGLEVEL=3
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
-CONFIG_SPL_SYS_MALLOC=y
-CONFIG_SPL_SYS_MALLOC_SIZE=0x800000
-CONFIG_SPL_FIT_IMAGE_TINY=y
-CONFIG_SPL_OPTIMIZE_INLINING=y
 CONFIG_SPL_ETH=y
-# CONFIG_SPL_FS_EXT4 is not set
 CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot.img"
-CONFIG_SPL_MTD=y
 CONFIG_SPL_MUSB_NEW=y
 CONFIG_SPL_NAND_DRIVERS=y
 CONFIG_SPL_NAND_ECC=y
@@ -42,90 +21,31 @@ CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR=0x1500
 CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS=0x200
 CONFIG_CMD_EXTENSION=y
 CONFIG_CMD_SPL_NAND_OFS=0x00080000
-CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
-CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_BOOTP_DNS2=y
-CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)"
-# CONFIG_SPL_EFI_PARTITION is not set
-CONFIG_OF_CONTROL=y
 CONFIG_OF_LIST="am335x-evm am335x-bone am335x-sancloud-bbe am335x-sancloud-bbe-lite am335x-sancloud-bbe-extended-wifi am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle am335x-bonegreen-eco"
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_SPL_ENV_IS_NOWHERE=y
-CONFIG_VERSION_VARIABLE=y
-CONFIG_NET_RETRY_COUNT=10
-CONFIG_BOOTP_SEND_HOSTNAME=y
-CONFIG_BOOTCOUNT_LIMIT=y
-CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_CLK=y
 CONFIG_CLK_CCF=y
-CONFIG_CLK_CDCE9XX=y
 CONFIG_CLK_TI_AM3_DPLL=y
 CONFIG_CLK_TI_CTRL=y
 CONFIG_CLK_TI_DIVIDER=y
 CONFIG_CLK_TI_GATE=y
 CONFIG_CLK_TI_MUX=y
 CONFIG_DFU_TFTP=y
-CONFIG_DFU_MMC=y
-CONFIG_DFU_NAND=y
-CONFIG_DFU_RAM=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=1
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
-CONFIG_DM_I2C=y
 CONFIG_MISC=y
-CONFIG_SYS_I2C_EEPROM_ADDR=0x50
-# CONFIG_MMC_HW_PARTITIONING is not set
-CONFIG_MMC_OMAP_HS=y
-CONFIG_MTD=y
-CONFIG_MTD_RAW_NAND=y
 CONFIG_SYS_NAND_BLOCK_SIZE=0x20000
-CONFIG_SYS_NAND_ONFI_DETECTION=y
-CONFIG_SYS_NAND_PAGE_SIZE=0x800
-CONFIG_SYS_NAND_OOBSIZE=0x40
-CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
-CONFIG_SYS_NAND_U_BOOT_OFFS=0xc0000
-CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_PHY_ATHEROS=y
-CONFIG_PHY_SMSC=y
 CONFIG_PHY_TI_DP83867=y
 CONFIG_PHY_GIGE=y
-CONFIG_MII=y
-CONFIG_DRIVER_TI_CPSW=y
-CONFIG_DM_PMIC=y
-# CONFIG_SPL_DM_PMIC is not set
-CONFIG_PMIC_TPS65217=y
-CONFIG_SPL_POWER_TPS65910=y
 CONFIG_DM_PWM=y
 CONFIG_PWM_TI_ECAP=y
-CONFIG_SPI=y
-CONFIG_DM_SPI=y
-CONFIG_OMAP3_SPI=y
-CONFIG_TIMER=y
-CONFIG_OMAP_TIMER=y
-CONFIG_USB=y
-CONFIG_DM_USB_GADGET=y
 CONFIG_SPL_DM_USB_GADGET=y
-CONFIG_USB_MUSB_HOST=y
-CONFIG_USB_MUSB_GADGET=y
-CONFIG_USB_MUSB_TI=y
-CONFIG_USB_GADGET=y
 CONFIG_SPL_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0451
-CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_ETHER=y
 CONFIG_SPL_USB_ETHER=y
 CONFIG_VIDEO=y
 CONFIG_AM335X_LCD=y
-CONFIG_WDT=y
-# CONFIG_SPL_WDT is not set
-CONFIG_DYNAMIC_CRC_TABLE=y
-CONFIG_LZO=y
diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig
index 97f56f36aa6c5912bbd5fec7580cd1cd204bec2f..eebd916c02a2cad0d01ab738aab37b11dd3a9645 100644
--- a/configs/am335x_evm_spiboot_defconfig
+++ b/configs/am335x_evm_spiboot_defconfig
@@ -1,108 +1,29 @@
-CONFIG_ARM=y
-CONFIG_ARCH_CPU_INIT=y
-CONFIG_ARCH_OMAP2PLUS=y
-CONFIG_TI_COMMON_CMD_OPTIONS=y
-CONFIG_SF_DEFAULT_SPEED=24000000
+#include <configs/am335x_evm.config>
+
 CONFIG_ENV_OFFSET=0x100000
 CONFIG_SPL_DM_SPI=y
-CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
-CONFIG_AM33XX=y
-CONFIG_CLOCK_SYNTHESIZER=y
 # CONFIG_SPL_MMC is not set
-CONFIG_SYS_BOOTM_LEN=0x1000000
-CONFIG_SPL=y
 # CONFIG_SPL_FS_FAT is not set
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI=y
-CONFIG_TIMESTAMP=y
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_OF_BOARD_SETUP=y
-CONFIG_BOOTCOMMAND="run findfdt; run init_console; run finduuid; run distro_bootcmd"
-CONFIG_LOGLEVEL=3
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
-CONFIG_SPL_SYS_MALLOC=y
-CONFIG_SPL_SYS_MALLOC_SIZE=0x800000
-CONFIG_SPL_FIT_IMAGE_TINY=y
-# CONFIG_SPL_FS_EXT4 is not set
-CONFIG_SPL_MTD=y
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_SPL_DM_SPI_FLASH=y
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
-CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
-CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_BOOTP_DNS2=y
-CONFIG_CMD_MTDPARTS=y
-# CONFIG_SPL_EFI_PARTITION is not set
-CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle am335x-bonegreen-eco"
-CONFIG_ENV_OVERWRITE=y
 # CONFIG_ENV_IS_IN_FAT is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_SPL_ENV_IS_NOWHERE=y
-CONFIG_VERSION_VARIABLE=y
-CONFIG_NET_RETRY_COUNT=10
-CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_SPL_OF_TRANSLATE=y
 CONFIG_SPL_TI_SYSC=y
-CONFIG_BOOTCOUNT_LIMIT=y
-CONFIG_SYS_BOOTCOUNT_BE=y
 CONFIG_SPL_CLK=y
-CONFIG_CLK_CDCE9XX=y
 CONFIG_CLK_TI_CTRL=y
 CONFIG_DFU_TFTP=y
-CONFIG_DFU_MMC=y
-CONFIG_DFU_NAND=y
-CONFIG_DFU_RAM=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=1
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
-CONFIG_DM_I2C=y
-CONFIG_SYS_I2C_EEPROM_ADDR=0x50
 # CONFIG_SPL_DM_MMC is not set
-# CONFIG_MMC_HW_PARTITIONING is not set
-CONFIG_MMC_OMAP_HS=y
-CONFIG_MTD=y
-CONFIG_MTD_RAW_NAND=y
-CONFIG_SYS_NAND_ONFI_DETECTION=y
-CONFIG_SYS_NAND_PAGE_SIZE=0x800
-CONFIG_SYS_NAND_OOBSIZE=0x40
-CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
-CONFIG_SYS_NAND_U_BOOT_OFFS=0xc0000
-CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_PHY_ATHEROS=y
-CONFIG_PHY_SMSC=y
-CONFIG_MII=y
-CONFIG_DRIVER_TI_CPSW=y
-CONFIG_DM_PMIC=y
-# CONFIG_SPL_DM_PMIC is not set
-CONFIG_PMIC_TPS65217=y
-CONFIG_SPL_POWER_TPS65910=y
-CONFIG_SPI=y
-CONFIG_DM_SPI=y
-CONFIG_OMAP3_SPI=y
-CONFIG_TIMER=y
-CONFIG_OMAP_TIMER=y
-CONFIG_USB=y
-CONFIG_DM_USB_GADGET=y
-CONFIG_USB_MUSB_HOST=y
-CONFIG_USB_MUSB_GADGET=y
-CONFIG_USB_MUSB_TI=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0451
-CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_ETHER=y
-CONFIG_WDT=y
-# CONFIG_SPL_WDT is not set
-CONFIG_DYNAMIC_CRC_TABLE=y
 CONFIG_RSA=y
-CONFIG_LZO=y
diff --git a/configs/am335x_hs_evm.config b/configs/am335x_hs_evm.config
new file mode 100644
index 0000000000000000000000000000000000000000..7ade2fb163b204ad8bcc9554455fdd3e81657890
--- /dev/null
+++ b/configs/am335x_hs_evm.config
@@ -0,0 +1,14 @@
+#include <configs/am335x_evm.config>
+
+CONFIG_TI_SECURE_DEVICE=y
+# CONFIG_SPL_ENV_SUPPORT is not set
+CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot.img"
+# CONFIG_SPL_NAND_SUPPORT is not set
+CONFIG_SPL_NAND_DRIVERS=y
+CONFIG_SPL_NAND_ECC=y
+CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)"
+CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle am335x-bonegreen-eco"
+CONFIG_SPL_DM_USB_GADGET=y
+CONFIG_SPL_TINY_MEMSET=y
+CONFIG_RSA=y
diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig
index e4eedd439c8a26052f57764059d660fbfabcb15b..8f140fa5b1e9d0edc80374fdd740e0ba9c65935d 100644
--- a/configs/am335x_hs_evm_defconfig
+++ b/configs/am335x_hs_evm_defconfig
@@ -1,96 +1,5 @@
-CONFIG_ARM=y
-CONFIG_ARCH_CPU_INIT=y
-CONFIG_ARCH_OMAP2PLUS=y
-CONFIG_TI_SECURE_DEVICE=y
-CONFIG_TI_COMMON_CMD_OPTIONS=y
-CONFIG_SF_DEFAULT_SPEED=24000000
-CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
-CONFIG_AM33XX=y
-CONFIG_CLOCK_SYNTHESIZER=y
+#include <configs/am335x_hs_evm.config>
+
 CONFIG_SPL_TEXT_BASE=0x40300350
-CONFIG_SYS_BOOTM_LEN=0x1000000
-CONFIG_SPL=y
-CONFIG_TIMESTAMP=y
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_OF_BOARD_SETUP=y
-CONFIG_BOOTCOMMAND="run findfdt; run init_console; run finduuid; run distro_bootcmd"
-CONFIG_LOGLEVEL=3
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_SPL_MAX_SIZE=0xb0b0
-CONFIG_SPL_SYS_MALLOC=y
-CONFIG_SPL_SYS_MALLOC_SIZE=0x800000
-CONFIG_SPL_FIT_IMAGE_TINY=y
-# CONFIG_SPL_ENV_SUPPORT is not set
-# CONFIG_SPL_FS_EXT4 is not set
-CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot.img"
-CONFIG_SPL_MTD=y
-# CONFIG_SPL_NAND_SUPPORT is not set
-CONFIG_SPL_NAND_DRIVERS=y
-CONFIG_SPL_NAND_ECC=y
 # CONFIG_SPL_YMODEM_SUPPORT is not set
-CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
-CONFIG_CMD_NAND=y
-CONFIG_BOOTP_DNS2=y
-CONFIG_CMD_MTDPARTS=y
-CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)"
-# CONFIG_SPL_EFI_PARTITION is not set
-CONFIG_OF_CONTROL=y
-CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle am335x-bonegreen-eco"
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-CONFIG_VERSION_VARIABLE=y
-CONFIG_NET_RETRY_COUNT=10
-CONFIG_BOOTP_SEND_HOSTNAME=y
-CONFIG_BOOTCOUNT_LIMIT=y
-CONFIG_SYS_BOOTCOUNT_BE=y
-CONFIG_CLK_CDCE9XX=y
-CONFIG_DFU_MMC=y
-CONFIG_DFU_NAND=y
-CONFIG_DFU_RAM=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_DM_I2C=y
-CONFIG_SYS_I2C_EEPROM_ADDR=0x50
-# CONFIG_MMC_HW_PARTITIONING is not set
-CONFIG_MMC_OMAP_HS=y
-CONFIG_MTD=y
-CONFIG_MTD_RAW_NAND=y
-CONFIG_SYS_NAND_ONFI_DETECTION=y
-CONFIG_SYS_NAND_PAGE_SIZE=0x800
-CONFIG_SYS_NAND_OOBSIZE=0x40
-CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
-CONFIG_SYS_NAND_U_BOOT_OFFS=0xc0000
-CONFIG_DM_SPI_FLASH=y
-CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_PHY_ATHEROS=y
-CONFIG_PHY_SMSC=y
-CONFIG_MII=y
-CONFIG_DRIVER_TI_CPSW=y
-CONFIG_DM_PMIC=y
-# CONFIG_SPL_DM_PMIC is not set
-CONFIG_PMIC_TPS65217=y
-CONFIG_SPL_POWER_TPS65910=y
-CONFIG_SPI=y
-CONFIG_DM_SPI=y
-CONFIG_OMAP3_SPI=y
-CONFIG_TIMER=y
-CONFIG_OMAP_TIMER=y
-CONFIG_USB=y
-CONFIG_DM_USB_GADGET=y
-CONFIG_SPL_DM_USB_GADGET=y
-CONFIG_USB_MUSB_HOST=y
-CONFIG_USB_MUSB_GADGET=y
-CONFIG_USB_MUSB_TI=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0451
-CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_ETHER=y
-CONFIG_WDT=y
-# CONFIG_SPL_WDT is not set
-CONFIG_DYNAMIC_CRC_TABLE=y
-CONFIG_SPL_TINY_MEMSET=y
-CONFIG_RSA=y
-CONFIG_LZO=y
diff --git a/configs/am335x_hs_evm_uart_defconfig b/configs/am335x_hs_evm_uart_defconfig
index f60f63f87d7018e10840b27ee9c5afc179c1e167..ff60802fdf1b01c53b650993d14b7ca0a081af9b 100644
--- a/configs/am335x_hs_evm_uart_defconfig
+++ b/configs/am335x_hs_evm_uart_defconfig
@@ -1,98 +1,8 @@
-CONFIG_ARM=y
-CONFIG_ARCH_CPU_INIT=y
-CONFIG_ARCH_OMAP2PLUS=y
-CONFIG_TI_SECURE_DEVICE=y
-CONFIG_TI_COMMON_CMD_OPTIONS=y
-CONFIG_SF_DEFAULT_SPEED=24000000
-CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
-CONFIG_AM33XX=y
-CONFIG_CLOCK_SYNTHESIZER=y
+#include <configs/am335x_hs_evm.config>
+
 # CONFIG_SPL_MMC is not set
 CONFIG_SPL_TEXT_BASE=0x40301950
-CONFIG_SYS_BOOTM_LEN=0x1000000
-CONFIG_SPL=y
 # CONFIG_SPL_FS_FAT is not set
 # CONFIG_SPL_LIBDISK_SUPPORT is not set
-CONFIG_TIMESTAMP=y
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_OF_BOARD_SETUP=y
-CONFIG_BOOTCOMMAND="run findfdt; run init_console; run finduuid; run distro_bootcmd"
-CONFIG_LOGLEVEL=3
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_SPL_MAX_SIZE=0x9ab0
-CONFIG_SPL_SYS_MALLOC=y
-CONFIG_SPL_SYS_MALLOC_SIZE=0x800000
-CONFIG_SPL_FIT_IMAGE_TINY=y
-# CONFIG_SPL_ENV_SUPPORT is not set
-# CONFIG_SPL_FS_EXT4 is not set
-CONFIG_SPL_MTD=y
-# CONFIG_SPL_NAND_SUPPORT is not set
-CONFIG_SPL_NAND_DRIVERS=y
-CONFIG_SPL_NAND_ECC=y
-CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
-CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set
-CONFIG_BOOTP_DNS2=y
-CONFIG_CMD_MTDPARTS=y
-CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)"
-# CONFIG_SPL_EFI_PARTITION is not set
-CONFIG_OF_CONTROL=y
-CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle am335x-bonegreen-eco"
-CONFIG_ENV_OVERWRITE=y
-CONFIG_ENV_RELOC_GD_ENV_ADDR=y
-CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-CONFIG_VERSION_VARIABLE=y
-CONFIG_NET_RETRY_COUNT=10
-CONFIG_BOOTP_SEND_HOSTNAME=y
-CONFIG_BOOTCOUNT_LIMIT=y
-CONFIG_SYS_BOOTCOUNT_BE=y
-CONFIG_CLK_CDCE9XX=y
-CONFIG_DFU_MMC=y
-CONFIG_DFU_NAND=y
-CONFIG_DFU_RAM=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_DM_I2C=y
-CONFIG_SYS_I2C_EEPROM_ADDR=0x50
-# CONFIG_MMC_HW_PARTITIONING is not set
-CONFIG_MMC_OMAP_HS=y
-CONFIG_MTD=y
-CONFIG_MTD_RAW_NAND=y
-CONFIG_SYS_NAND_ONFI_DETECTION=y
-CONFIG_SYS_NAND_PAGE_SIZE=0x800
-CONFIG_SYS_NAND_OOBSIZE=0x40
-CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
-CONFIG_SYS_NAND_U_BOOT_OFFS=0xc0000
-CONFIG_DM_SPI_FLASH=y
-CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_PHY_ATHEROS=y
-CONFIG_PHY_SMSC=y
-CONFIG_MII=y
-CONFIG_DRIVER_TI_CPSW=y
-CONFIG_DM_PMIC=y
-# CONFIG_SPL_DM_PMIC is not set
-CONFIG_PMIC_TPS65217=y
-CONFIG_SPL_POWER_TPS65910=y
-CONFIG_SPI=y
-CONFIG_DM_SPI=y
-CONFIG_OMAP3_SPI=y
-CONFIG_TIMER=y
-CONFIG_OMAP_TIMER=y
-CONFIG_USB=y
-CONFIG_DM_USB_GADGET=y
-CONFIG_SPL_DM_USB_GADGET=y
-CONFIG_USB_MUSB_HOST=y
-CONFIG_USB_MUSB_GADGET=y
-CONFIG_USB_MUSB_TI=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0451
-CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_ETHER=y
-CONFIG_WDT=y
-# CONFIG_SPL_WDT is not set
-CONFIG_DYNAMIC_CRC_TABLE=y
-CONFIG_SPL_TINY_MEMSET=y
-CONFIG_RSA=y
-CONFIG_LZO=y

-- 
2.53.0


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* Re: [PATCH v5 05/12] configs: am335x_evm: Unify evm board defconfigs
  2026-04-10 13:31 ` [PATCH v5 05/12] configs: am335x_evm: Unify evm board defconfigs Markus Schneider-Pargmann (TI)
@ 2026-04-13  9:49   ` Kory Maincent
  0 siblings, 0 replies; 22+ messages in thread
From: Kory Maincent @ 2026-04-13  9:49 UTC (permalink / raw)
  To: Markus Schneider-Pargmann (TI)
  Cc: u-boot, Marc Murphy, Tom Rini, Rasmus Villemoes, Marek Vasut,
	Romain Gantois, Parvathi Pudi, Basharath Hussain Khaja,
	Paul Barker, Andrew F. Davis, Simon Glass, Anshul Dalal,
	Michael Trimarchi

On Fri, 10 Apr 2026 15:31:45 +0200
"Markus Schneider-Pargmann (TI)" <msp@baylibre.com> wrote:

> Much of the config symbols between the evm boards are the same
> independent of the actual board. This patch creates a hierarchy for the
> am335x_evm configs:
> 
>   am335x_evm.config
>   `-> am335x_evm_defconfig
>   `-> am335x_evm_spiboot_defconfig
>   `-> am335x_hs_evm.config
>       `-> am335x_hs_evm_defconfig
>       `-> am335x_hs_evm_uart_defconfig
> 
> Reviewed-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Markus Schneider-Pargmann (TI) <msp@baylibre.com>

Reviewed-by: Kory Maincent <kory.maincent@bootlin.com>

Thank you!
-- 
Köry Maincent, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [PATCH v5 06/12] am33xx: Avoid hard failure on USB probe issue
  2026-04-10 13:31 [PATCH v5 00/12] arm: am335x: Switch to upstream devicetree Markus Schneider-Pargmann (TI)
                   ` (4 preceding siblings ...)
  2026-04-10 13:31 ` [PATCH v5 05/12] configs: am335x_evm: Unify evm board defconfigs Markus Schneider-Pargmann (TI)
@ 2026-04-10 13:31 ` Markus Schneider-Pargmann (TI)
  2026-04-10 13:31 ` [PATCH v5 07/12] arm: dts: am335x-*-u-boot: Add chosen tick-timer Markus Schneider-Pargmann (TI)
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 22+ messages in thread
From: Markus Schneider-Pargmann (TI) @ 2026-04-10 13:31 UTC (permalink / raw)
  To: u-boot, Marc Murphy
  Cc: Tom Rini, Rasmus Villemoes, Kory Maincent, Marek Vasut,
	Romain Gantois, Parvathi Pudi, Basharath Hussain Khaja,
	Paul Barker, Andrew F. Davis, Simon Glass, Anshul Dalal,
	Michael Trimarchi, Markus Schneider-Pargmann (TI)

Currently if USB fails to probe, U-Boot does not reach the console.

This patch does not fail if USB fails to probe making it easier to debug
in case of issues.

Reviewed-by: Kory Maincent <kory.maincent@bootlin.com>
Signed-off-by: Markus Schneider-Pargmann (TI) <msp@baylibre.com>
---
 arch/arm/mach-omap2/am33xx/board.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c
index 4e9ad8935e3b5020c4ed1d022ae4846a2dc9486f..90b341303c7309dc21b34cc01020db997f53c8f3 100644
--- a/arch/arm/mach-omap2/am33xx/board.c
+++ b/arch/arm/mach-omap2/am33xx/board.c
@@ -266,12 +266,17 @@ int arch_misc_init(void)
 	struct udevice *dev;
 	int ret;
 
+	/*
+	 * Trigger probe of the UCLASS_MISC device which is a USB wrapper driver
+	 * ti-musb-wrapper that handles all usb host and gadget devices.
+	 */
 	ret = uclass_first_device_err(UCLASS_MISC, &dev);
 	if (ret)
-		return ret;
+		printf("Failed probing USB %d, continue without USB\n", ret);
 
 #if defined(CONFIG_DM_ETH) && defined(CONFIG_USB_ETHER)
-	usb_ether_init();
+	if (!ret)
+		usb_ether_init();
 #endif
 
 	return 0;

-- 
2.53.0


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH v5 07/12] arm: dts: am335x-*-u-boot: Add chosen tick-timer
  2026-04-10 13:31 [PATCH v5 00/12] arm: am335x: Switch to upstream devicetree Markus Schneider-Pargmann (TI)
                   ` (5 preceding siblings ...)
  2026-04-10 13:31 ` [PATCH v5 06/12] am33xx: Avoid hard failure on USB probe issue Markus Schneider-Pargmann (TI)
@ 2026-04-10 13:31 ` Markus Schneider-Pargmann (TI)
  2026-04-10 13:31 ` [PATCH v5 08/12] arm: dts: am335x-boneblack-u-boot: Add lcdc to all boot phases Markus Schneider-Pargmann (TI)
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 22+ messages in thread
From: Markus Schneider-Pargmann (TI) @ 2026-04-10 13:31 UTC (permalink / raw)
  To: u-boot, Marc Murphy
  Cc: Tom Rini, Rasmus Villemoes, Kory Maincent, Marek Vasut,
	Romain Gantois, Parvathi Pudi, Basharath Hussain Khaja,
	Paul Barker, Andrew F. Davis, Simon Glass, Anshul Dalal,
	Michael Trimarchi, Markus Schneider-Pargmann (TI)

Upstream devicetrees do not have a binding for the tick-timer. Add it
for all boards built with the am335x_evm_defconfig.

Reviewed-by: Kory Maincent <kory.maincent@bootlin.com>
Signed-off-by: Markus Schneider-Pargmann (TI) <msp@baylibre.com>
---
 arch/arm/dts/am335x-bone-common-u-boot.dtsi                | 14 ++++++++++++++
 arch/arm/dts/am335x-bone-u-boot.dtsi                       |  6 ++++++
 arch/arm/dts/am335x-boneblack-u-boot.dtsi                  |  6 ++++++
 arch/arm/dts/am335x-bonegreen-u-boot.dtsi                  |  6 ++++++
 arch/arm/dts/am335x-evm-u-boot.dtsi                        |  6 ++++++
 arch/arm/dts/am335x-evmsk-u-boot.dtsi                      |  6 ++++++
 arch/arm/dts/am335x-icev2-u-boot.dtsi                      |  4 ++++
 arch/arm/dts/am335x-pocketbeagle-u-boot.dtsi               |  6 ++++++
 arch/arm/dts/am335x-sancloud-bbe-extended-wifi-u-boot.dtsi |  6 ++++++
 9 files changed, 60 insertions(+)

diff --git a/arch/arm/dts/am335x-bone-common-u-boot.dtsi b/arch/arm/dts/am335x-bone-common-u-boot.dtsi
new file mode 100644
index 0000000000000000000000000000000000000000..0fa2a311514b7776631797bb99d0d7f299df04bd
--- /dev/null
+++ b/arch/arm/dts/am335x-bone-common-u-boot.dtsi
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * am335x-bone-common U-Boot Additions
+ *
+ * Common u-boot configuration for all BeagleBone variants
+ */
+
+#include "am33xx-u-boot.dtsi"
+
+/ {
+	chosen {
+		tick-timer = &timer2;
+	};
+};
diff --git a/arch/arm/dts/am335x-bone-u-boot.dtsi b/arch/arm/dts/am335x-bone-u-boot.dtsi
new file mode 100644
index 0000000000000000000000000000000000000000..11264707882b62749779aeb0a12e4471c8ace999
--- /dev/null
+++ b/arch/arm/dts/am335x-bone-u-boot.dtsi
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * am335x-bone U-Boot Additions
+ */
+
+#include "am335x-bone-common-u-boot.dtsi"
diff --git a/arch/arm/dts/am335x-boneblack-u-boot.dtsi b/arch/arm/dts/am335x-boneblack-u-boot.dtsi
new file mode 100644
index 0000000000000000000000000000000000000000..e2afc77d9edc539323c73dee03511a9cd62d8ca8
--- /dev/null
+++ b/arch/arm/dts/am335x-boneblack-u-boot.dtsi
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * am335x-boneblack U-Boot Additions
+ */
+
+#include "am335x-bone-common-u-boot.dtsi"
diff --git a/arch/arm/dts/am335x-bonegreen-u-boot.dtsi b/arch/arm/dts/am335x-bonegreen-u-boot.dtsi
new file mode 100644
index 0000000000000000000000000000000000000000..47e371a816faa4c0f9625d0313109fadafaf8459
--- /dev/null
+++ b/arch/arm/dts/am335x-bonegreen-u-boot.dtsi
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * am335x-bonegreen U-Boot Additions
+ */
+
+#include "am335x-bone-common-u-boot.dtsi"
diff --git a/arch/arm/dts/am335x-evm-u-boot.dtsi b/arch/arm/dts/am335x-evm-u-boot.dtsi
index 72402c82928a72abe3847bfcc0771dabc571d8e6..2ebf60bf7d6ce007e033b75a25a10c60a83e218e 100644
--- a/arch/arm/dts/am335x-evm-u-boot.dtsi
+++ b/arch/arm/dts/am335x-evm-u-boot.dtsi
@@ -5,6 +5,12 @@
 
 #include "am33xx-u-boot.dtsi"
 
+/ {
+	chosen {
+		tick-timer = &timer2;
+	};
+};
+
 &l4_per {
 	bootph-all;
 	segment@300000 {
diff --git a/arch/arm/dts/am335x-evmsk-u-boot.dtsi b/arch/arm/dts/am335x-evmsk-u-boot.dtsi
index 669cb6bf165575c7e688e49fe15732c97c9c0121..06ee1eb7c3ed68e6ccc8630d209b50add20e4d20 100644
--- a/arch/arm/dts/am335x-evmsk-u-boot.dtsi
+++ b/arch/arm/dts/am335x-evmsk-u-boot.dtsi
@@ -7,6 +7,12 @@
 
 #include "am33xx-u-boot.dtsi"
 
+/ {
+	chosen {
+		tick-timer = &timer2;
+	};
+};
+
 &l4_per {
 
 	segment@300000 {
diff --git a/arch/arm/dts/am335x-icev2-u-boot.dtsi b/arch/arm/dts/am335x-icev2-u-boot.dtsi
index ac1feaa9d9f69b79211f34c44af1008a5aed30ca..4ae100a3a7fb6bbb4b618849a15eb370a10dde2a 100644
--- a/arch/arm/dts/am335x-icev2-u-boot.dtsi
+++ b/arch/arm/dts/am335x-icev2-u-boot.dtsi
@@ -6,6 +6,10 @@
 #include "am33xx-u-boot.dtsi"
 
 / {
+	chosen {
+		tick-timer = &timer2;
+	};
+
 	xtal25mhz: xtal25mhz {
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
diff --git a/arch/arm/dts/am335x-pocketbeagle-u-boot.dtsi b/arch/arm/dts/am335x-pocketbeagle-u-boot.dtsi
new file mode 100644
index 0000000000000000000000000000000000000000..52c4bc26e128b6f463659bba070de515e7997efe
--- /dev/null
+++ b/arch/arm/dts/am335x-pocketbeagle-u-boot.dtsi
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * am335x-pocketbeagle U-Boot Additions
+ */
+
+#include "am335x-bone-common-u-boot.dtsi"
diff --git a/arch/arm/dts/am335x-sancloud-bbe-extended-wifi-u-boot.dtsi b/arch/arm/dts/am335x-sancloud-bbe-extended-wifi-u-boot.dtsi
new file mode 100644
index 0000000000000000000000000000000000000000..17b86bdba3e43e7e9881e87a3ca0d3a36557c755
--- /dev/null
+++ b/arch/arm/dts/am335x-sancloud-bbe-extended-wifi-u-boot.dtsi
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * am335x-sancloud-bbe-extended-wifi U-Boot Additions
+ */
+
+#include "am335x-sancloud-bbe-u-boot.dtsi"

-- 
2.53.0


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH v5 08/12] arm: dts: am335x-boneblack-u-boot: Add lcdc to all boot phases
  2026-04-10 13:31 [PATCH v5 00/12] arm: am335x: Switch to upstream devicetree Markus Schneider-Pargmann (TI)
                   ` (6 preceding siblings ...)
  2026-04-10 13:31 ` [PATCH v5 07/12] arm: dts: am335x-*-u-boot: Add chosen tick-timer Markus Schneider-Pargmann (TI)
@ 2026-04-10 13:31 ` Markus Schneider-Pargmann (TI)
  2026-04-10 13:31 ` [PATCH v5 09/12] am33xx: Fix comment about config symbols Markus Schneider-Pargmann (TI)
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 22+ messages in thread
From: Markus Schneider-Pargmann (TI) @ 2026-04-10 13:31 UTC (permalink / raw)
  To: u-boot, Marc Murphy
  Cc: Tom Rini, Rasmus Villemoes, Kory Maincent, Marek Vasut,
	Romain Gantois, Parvathi Pudi, Basharath Hussain Khaja,
	Paul Barker, Andrew F. Davis, Simon Glass, Anshul Dalal,
	Michael Trimarchi, Markus Schneider-Pargmann (TI)

This is required for am335x to boot correctly.

Signed-off-by: Markus Schneider-Pargmann (TI) <msp@baylibre.com>
---
 arch/arm/dts/am335x-boneblack-u-boot.dtsi | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/arch/arm/dts/am335x-boneblack-u-boot.dtsi b/arch/arm/dts/am335x-boneblack-u-boot.dtsi
index e2afc77d9edc539323c73dee03511a9cd62d8ca8..366375bf446c4c49a12d210c1a24f1db2881f1c3 100644
--- a/arch/arm/dts/am335x-boneblack-u-boot.dtsi
+++ b/arch/arm/dts/am335x-boneblack-u-boot.dtsi
@@ -4,3 +4,14 @@
  */
 
 #include "am335x-bone-common-u-boot.dtsi"
+
+&l4_per {
+	segment@300000 {
+		target-module@e000 {
+			bootph-all;
+			lcdc: lcdc@0 {
+				bootph-all;
+			};
+		};
+	};
+};

-- 
2.53.0


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH v5 09/12] am33xx: Fix comment about config symbols
  2026-04-10 13:31 [PATCH v5 00/12] arm: am335x: Switch to upstream devicetree Markus Schneider-Pargmann (TI)
                   ` (7 preceding siblings ...)
  2026-04-10 13:31 ` [PATCH v5 08/12] arm: dts: am335x-boneblack-u-boot: Add lcdc to all boot phases Markus Schneider-Pargmann (TI)
@ 2026-04-10 13:31 ` Markus Schneider-Pargmann (TI)
  2026-04-10 13:31 ` [PATCH v5 10/12] am33xx: Support upstream devicetree USB device Markus Schneider-Pargmann (TI)
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 22+ messages in thread
From: Markus Schneider-Pargmann (TI) @ 2026-04-10 13:31 UTC (permalink / raw)
  To: u-boot, Marc Murphy
  Cc: Tom Rini, Rasmus Villemoes, Kory Maincent, Marek Vasut,
	Romain Gantois, Parvathi Pudi, Basharath Hussain Khaja,
	Paul Barker, Andrew F. Davis, Simon Glass, Anshul Dalal,
	Michael Trimarchi, Markus Schneider-Pargmann (TI)

Fix #else and #endif comments to match actual #if condition. Comments
incorrectly referenced CONFIG_USB_MUSB_* instead of CONFIG_AM335X_USB*
and CONFIG_XPL_BUILD.

Reviewed-by: Kory Maincent <kory.maincent@bootlin.com>
Signed-off-by: Markus Schneider-Pargmann (TI) <msp@baylibre.com>
---
 arch/arm/mach-omap2/am33xx/board.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c
index 90b341303c7309dc21b34cc01020db997f53c8f3..c3931900622957a5499fe6483473c61e3a62fff0 100644
--- a/arch/arm/mach-omap2/am33xx/board.c
+++ b/arch/arm/mach-omap2/am33xx/board.c
@@ -259,7 +259,7 @@ int arch_misc_init(void)
 {
 	return 0;
 }
-#else	/* CONFIG_USB_MUSB_* && CONFIG_AM335X_USB* && !CONFIG_DM_USB */
+#else /* CONFIG_AM335X_USB* && CONFIG_XPL_BUILD */
 
 int arch_misc_init(void)
 {
@@ -282,7 +282,7 @@ int arch_misc_init(void)
 	return 0;
 }
 
-#endif /* CONFIG_USB_MUSB_* && CONFIG_AM335X_USB* && !CONFIG_DM_USB */
+#endif /* CONFIG_AM335X_USB* && CONFIG_XPL_BUILD */
 
 #if !CONFIG_IS_ENABLED(SKIP_LOWLEVEL_INIT)
 

-- 
2.53.0


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH v5 10/12] am33xx: Support upstream devicetree USB device
  2026-04-10 13:31 [PATCH v5 00/12] arm: am335x: Switch to upstream devicetree Markus Schneider-Pargmann (TI)
                   ` (8 preceding siblings ...)
  2026-04-10 13:31 ` [PATCH v5 09/12] am33xx: Fix comment about config symbols Markus Schneider-Pargmann (TI)
@ 2026-04-10 13:31 ` Markus Schneider-Pargmann (TI)
  2026-04-10 13:31 ` [PATCH v5 11/12] dm: core: Split SIMPLE_PM_BUS into phases Markus Schneider-Pargmann (TI)
  2026-04-10 13:31 ` [PATCH v5 12/12] configs: am335x_evm_defconfig: Switch to upstream devicetree Markus Schneider-Pargmann (TI)
  11 siblings, 0 replies; 22+ messages in thread
From: Markus Schneider-Pargmann (TI) @ 2026-04-10 13:31 UTC (permalink / raw)
  To: u-boot, Marc Murphy
  Cc: Tom Rini, Rasmus Villemoes, Kory Maincent, Marek Vasut,
	Romain Gantois, Parvathi Pudi, Basharath Hussain Khaja,
	Paul Barker, Andrew F. Davis, Simon Glass, Anshul Dalal,
	Michael Trimarchi, Markus Schneider-Pargmann (TI)

Support musb being probed by ti,musb-am33xx. The non-upstream DT probing
used a wrapper driver that probed ti-musb-peripheral and ti-musb-host.
This wrapper registered as UCLASS_MISC, which is why it is requested in
this board.c file.

With the new devicetree the wrapper that registers as UCLASS_MISC is
gone, instead the UCLASS_USB and UCLASS_USB_GADGET_GENERIC have to be
requested.

Reviewed-by: Kory Maincent <kory.maincent@bootlin.com>
Signed-off-by: Markus Schneider-Pargmann (TI) <msp@baylibre.com>
---
 arch/arm/mach-omap2/am33xx/board.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c
index c3931900622957a5499fe6483473c61e3a62fff0..20556b8fb5f1eb469469006b3483003f716146b8 100644
--- a/arch/arm/mach-omap2/am33xx/board.c
+++ b/arch/arm/mach-omap2/am33xx/board.c
@@ -266,11 +266,17 @@ int arch_misc_init(void)
 	struct udevice *dev;
 	int ret;
 
-	/*
-	 * Trigger probe of the UCLASS_MISC device which is a USB wrapper driver
-	 * ti-musb-wrapper that handles all usb host and gadget devices.
-	 */
-	ret = uclass_first_device_err(UCLASS_MISC, &dev);
+	if (IS_ENABLED(CONFIG_OF_UPSTREAM)) {
+		uclass_first_device_err(UCLASS_USB, &dev);
+		ret = uclass_first_device_err(UCLASS_USB_GADGET_GENERIC, &dev);
+	} else {
+		/*
+		 * Trigger probe of the UCLASS_MISC device which is a USB
+		 * wrapper driver ti-musb-wrapper that handles all usb host and
+		 * gadget devices.
+		 */
+		ret = uclass_first_device_err(UCLASS_MISC, &dev);
+	}
 	if (ret)
 		printf("Failed probing USB %d, continue without USB\n", ret);
 

-- 
2.53.0


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH v5 11/12] dm: core: Split SIMPLE_PM_BUS into phases
  2026-04-10 13:31 [PATCH v5 00/12] arm: am335x: Switch to upstream devicetree Markus Schneider-Pargmann (TI)
                   ` (9 preceding siblings ...)
  2026-04-10 13:31 ` [PATCH v5 10/12] am33xx: Support upstream devicetree USB device Markus Schneider-Pargmann (TI)
@ 2026-04-10 13:31 ` Markus Schneider-Pargmann (TI)
  2026-04-11 14:37   ` Simon Glass
  2026-04-13  9:51   ` Kory Maincent
  2026-04-10 13:31 ` [PATCH v5 12/12] configs: am335x_evm_defconfig: Switch to upstream devicetree Markus Schneider-Pargmann (TI)
  11 siblings, 2 replies; 22+ messages in thread
From: Markus Schneider-Pargmann (TI) @ 2026-04-10 13:31 UTC (permalink / raw)
  To: u-boot, Marc Murphy
  Cc: Tom Rini, Rasmus Villemoes, Kory Maincent, Marek Vasut,
	Romain Gantois, Parvathi Pudi, Basharath Hussain Khaja,
	Paul Barker, Andrew F. Davis, Simon Glass, Anshul Dalal,
	Michael Trimarchi, Markus Schneider-Pargmann (TI)

Similar to SIMPLE_BUS, create a SPL_SIMPLE_PM_BUS additional to the
SIMPLE_PM_BUS. Most boards will not need SIMPLE_PM_BUS in SPL.

This is currently needed to reduce the SPL size for beagle bone black
with OF_UPSTREAM enabled.

Signed-off-by: Markus Schneider-Pargmann (TI) <msp@baylibre.com>
---
 drivers/core/Kconfig  | 8 ++++++++
 drivers/core/Makefile | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig
index 5419bf65b5d653464f8bf958382ede30954d6402..0471e2977d0a993afcafee11874d43016d6738b4 100644
--- a/drivers/core/Kconfig
+++ b/drivers/core/Kconfig
@@ -342,6 +342,14 @@ config SIMPLE_PM_BUS
 	  Supports the 'simple-pm-bus' driver, which is used for busses that
 	  have power domains and/or clocks which need to be enabled before use.
 
+config SPL_SIMPLE_PM_BUS
+	bool "Support simple-pm-bus driver in SPL"
+	depends on SPL_DM && SPL_OF_CONTROL && SPL_CLK && SPL_POWER_DOMAIN
+	help
+	  Supports the 'simple-pm-bus' driver, which is used for busses that
+	  have power domains and/or clocks which need to be enabled before use,
+	  in SPL.
+
 config OF_TRANSLATE
 	bool "Translate addresses using fdt_translate_address"
 	depends on DM && OF_CONTROL
diff --git a/drivers/core/Makefile b/drivers/core/Makefile
index a549890c22b997a8c3e7cd6ab08b2ed2ac7994b2..1073c26b2ed0009e15ccca0bac93a64d882f0df9 100644
--- a/drivers/core/Makefile
+++ b/drivers/core/Makefile
@@ -7,7 +7,7 @@ obj-$(CONFIG_$(PHASE_)ACPIGEN) += acpi.o
 obj-$(CONFIG_$(PHASE_)DEVRES) += devres.o
 obj-$(CONFIG_$(PHASE_)DM_DEVICE_REMOVE)	+= device-remove.o
 obj-$(CONFIG_$(PHASE_)SIMPLE_BUS)	+= simple-bus.o
-obj-$(CONFIG_SIMPLE_PM_BUS)	+= simple-pm-bus.o
+obj-$(CONFIG_$(PHASE_)SIMPLE_PM_BUS)	+= simple-pm-bus.o
 obj-$(CONFIG_DM)	+= dump.o
 obj-$(CONFIG_$(PHASE_)REGMAP)	+= regmap.o
 obj-$(CONFIG_$(PHASE_)SYSCON)	+= syscon-uclass.o

-- 
2.53.0


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* Re: [PATCH v5 11/12] dm: core: Split SIMPLE_PM_BUS into phases
  2026-04-10 13:31 ` [PATCH v5 11/12] dm: core: Split SIMPLE_PM_BUS into phases Markus Schneider-Pargmann (TI)
@ 2026-04-11 14:37   ` Simon Glass
  2026-04-15 14:26     ` Markus Schneider-Pargmann
  2026-04-13  9:51   ` Kory Maincent
  1 sibling, 1 reply; 22+ messages in thread
From: Simon Glass @ 2026-04-11 14:37 UTC (permalink / raw)
  To: Markus Schneider-Pargmann (TI)
  Cc: u-boot, Marc Murphy, Tom Rini, Rasmus Villemoes, Kory Maincent,
	Marek Vasut, Romain Gantois, Parvathi Pudi,
	Basharath Hussain Khaja, Paul Barker, Andrew F. Davis,
	Anshul Dalal, Michael Trimarchi

Hi Markus,

On Fri, 10 Apr 2026 at 07:33, Markus Schneider-Pargmann (TI)
<msp@baylibre.com> wrote:
>
> Similar to SIMPLE_BUS, create a SPL_SIMPLE_PM_BUS additional to the
> SIMPLE_PM_BUS. Most boards will not need SIMPLE_PM_BUS in SPL.
>
> This is currently needed to reduce the SPL size for beagle bone black
> with OF_UPSTREAM enabled.
>
> Signed-off-by: Markus Schneider-Pargmann (TI) <msp@baylibre.com>
> ---
>  drivers/core/Kconfig  | 8 ++++++++
>  drivers/core/Makefile | 2 +-
>  2 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig
> index 5419bf65b5d653464f8bf958382ede30954d6402..0471e2977d0a993afcafee11874d43016d6738b4 100644
> --- a/drivers/core/Kconfig
> +++ b/drivers/core/Kconfig
> @@ -342,6 +342,14 @@ config SIMPLE_PM_BUS
>           Supports the 'simple-pm-bus' driver, which is used for busses that
>           have power domains and/or clocks which need to be enabled before use.
>
> +config SPL_SIMPLE_PM_BUS
> +       bool "Support simple-pm-bus driver in SPL"
> +       depends on SPL_DM && SPL_OF_CONTROL && SPL_CLK && SPL_POWER_DOMAIN
> +       help
> +         Supports the 'simple-pm-bus' driver, which is used for busses that
> +         have power domains and/or clocks which need to be enabled before use,
> +         in SPL.
> +
>  config OF_TRANSLATE
>         bool "Translate addresses using fdt_translate_address"
>         depends on DM && OF_CONTROL
> diff --git a/drivers/core/Makefile b/drivers/core/Makefile
> index a549890c22b997a8c3e7cd6ab08b2ed2ac7994b2..1073c26b2ed0009e15ccca0bac93a64d882f0df9 100644
> --- a/drivers/core/Makefile
> +++ b/drivers/core/Makefile
> @@ -7,7 +7,7 @@ obj-$(CONFIG_$(PHASE_)ACPIGEN) += acpi.o
>  obj-$(CONFIG_$(PHASE_)DEVRES) += devres.o
>  obj-$(CONFIG_$(PHASE_)DM_DEVICE_REMOVE)        += device-remove.o
>  obj-$(CONFIG_$(PHASE_)SIMPLE_BUS)      += simple-bus.o
> -obj-$(CONFIG_SIMPLE_PM_BUS)    += simple-pm-bus.o
> +obj-$(CONFIG_$(PHASE_)SIMPLE_PM_BUS)   += simple-pm-bus.o
>  obj-$(CONFIG_DM)       += dump.o
>  obj-$(CONFIG_$(PHASE_)REGMAP)  += regmap.o
>  obj-$(CONFIG_$(PHASE_)SYSCON)  += syscon-uclass.o
>
> --
> 2.53.0
>

I'm assuming that this doesn't affect any existing boards.

Reviewed-by: Simon Glass <sjg@chromium.org>

Regards,
Simon

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v5 11/12] dm: core: Split SIMPLE_PM_BUS into phases
  2026-04-11 14:37   ` Simon Glass
@ 2026-04-15 14:26     ` Markus Schneider-Pargmann
  0 siblings, 0 replies; 22+ messages in thread
From: Markus Schneider-Pargmann @ 2026-04-15 14:26 UTC (permalink / raw)
  To: Simon Glass, Markus Schneider-Pargmann (TI)
  Cc: u-boot, Marc Murphy, Tom Rini, Rasmus Villemoes, Kory Maincent,
	Marek Vasut, Romain Gantois, Parvathi Pudi,
	Basharath Hussain Khaja, Paul Barker, Andrew F. Davis,
	Anshul Dalal, Michael Trimarchi

[-- Attachment #1: Type: text/plain, Size: 2721 bytes --]

Hi Simon,

On Sat Apr 11, 2026 at 4:37 PM CEST, Simon Glass wrote:
> Hi Markus,
>
> On Fri, 10 Apr 2026 at 07:33, Markus Schneider-Pargmann (TI)
> <msp@baylibre.com> wrote:
>>
>> Similar to SIMPLE_BUS, create a SPL_SIMPLE_PM_BUS additional to the
>> SIMPLE_PM_BUS. Most boards will not need SIMPLE_PM_BUS in SPL.
>>
>> This is currently needed to reduce the SPL size for beagle bone black
>> with OF_UPSTREAM enabled.
>>
>> Signed-off-by: Markus Schneider-Pargmann (TI) <msp@baylibre.com>
>> ---
>>  drivers/core/Kconfig  | 8 ++++++++
>>  drivers/core/Makefile | 2 +-
>>  2 files changed, 9 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig
>> index 5419bf65b5d653464f8bf958382ede30954d6402..0471e2977d0a993afcafee11874d43016d6738b4 100644
>> --- a/drivers/core/Kconfig
>> +++ b/drivers/core/Kconfig
>> @@ -342,6 +342,14 @@ config SIMPLE_PM_BUS
>>           Supports the 'simple-pm-bus' driver, which is used for busses that
>>           have power domains and/or clocks which need to be enabled before use.
>>
>> +config SPL_SIMPLE_PM_BUS
>> +       bool "Support simple-pm-bus driver in SPL"
>> +       depends on SPL_DM && SPL_OF_CONTROL && SPL_CLK && SPL_POWER_DOMAIN
>> +       help
>> +         Supports the 'simple-pm-bus' driver, which is used for busses that
>> +         have power domains and/or clocks which need to be enabled before use,
>> +         in SPL.
>> +
>>  config OF_TRANSLATE
>>         bool "Translate addresses using fdt_translate_address"
>>         depends on DM && OF_CONTROL
>> diff --git a/drivers/core/Makefile b/drivers/core/Makefile
>> index a549890c22b997a8c3e7cd6ab08b2ed2ac7994b2..1073c26b2ed0009e15ccca0bac93a64d882f0df9 100644
>> --- a/drivers/core/Makefile
>> +++ b/drivers/core/Makefile
>> @@ -7,7 +7,7 @@ obj-$(CONFIG_$(PHASE_)ACPIGEN) += acpi.o
>>  obj-$(CONFIG_$(PHASE_)DEVRES) += devres.o
>>  obj-$(CONFIG_$(PHASE_)DM_DEVICE_REMOVE)        += device-remove.o
>>  obj-$(CONFIG_$(PHASE_)SIMPLE_BUS)      += simple-bus.o
>> -obj-$(CONFIG_SIMPLE_PM_BUS)    += simple-pm-bus.o
>> +obj-$(CONFIG_$(PHASE_)SIMPLE_PM_BUS)   += simple-pm-bus.o
>>  obj-$(CONFIG_DM)       += dump.o
>>  obj-$(CONFIG_$(PHASE_)REGMAP)  += regmap.o
>>  obj-$(CONFIG_$(PHASE_)SYSCON)  += syscon-uclass.o
>>
>> --
>> 2.53.0
>>
>
> I'm assuming that this doesn't affect any existing boards.

I checked the configs that use SIMPLE_PM_BUS at the moment, I don't
think any of them needs them for SPL. There aren't many and none of them
have SPL_POWER_DOMAIN which would be needed for SIMPLE_PM_BUS to work in
SPL.

>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Thanks for reviewing!

Best
Markus

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 289 bytes --]

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v5 11/12] dm: core: Split SIMPLE_PM_BUS into phases
  2026-04-10 13:31 ` [PATCH v5 11/12] dm: core: Split SIMPLE_PM_BUS into phases Markus Schneider-Pargmann (TI)
  2026-04-11 14:37   ` Simon Glass
@ 2026-04-13  9:51   ` Kory Maincent
  1 sibling, 0 replies; 22+ messages in thread
From: Kory Maincent @ 2026-04-13  9:51 UTC (permalink / raw)
  To: Markus Schneider-Pargmann (TI)
  Cc: u-boot, Marc Murphy, Tom Rini, Rasmus Villemoes, Marek Vasut,
	Romain Gantois, Parvathi Pudi, Basharath Hussain Khaja,
	Paul Barker, Andrew F. Davis, Simon Glass, Anshul Dalal,
	Michael Trimarchi

On Fri, 10 Apr 2026 15:31:51 +0200
"Markus Schneider-Pargmann (TI)" <msp@baylibre.com> wrote:

> Similar to SIMPLE_BUS, create a SPL_SIMPLE_PM_BUS additional to the
> SIMPLE_PM_BUS. Most boards will not need SIMPLE_PM_BUS in SPL.
> 
> This is currently needed to reduce the SPL size for beagle bone black
> with OF_UPSTREAM enabled.
> 
> Signed-off-by: Markus Schneider-Pargmann (TI) <msp@baylibre.com>

Reviewed-by: Kory Maincent <kory.maincent@bootlin.com>

Thank you!
-- 
Köry Maincent, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [PATCH v5 12/12] configs: am335x_evm_defconfig: Switch to upstream devicetree
  2026-04-10 13:31 [PATCH v5 00/12] arm: am335x: Switch to upstream devicetree Markus Schneider-Pargmann (TI)
                   ` (10 preceding siblings ...)
  2026-04-10 13:31 ` [PATCH v5 11/12] dm: core: Split SIMPLE_PM_BUS into phases Markus Schneider-Pargmann (TI)
@ 2026-04-10 13:31 ` Markus Schneider-Pargmann (TI)
  2026-04-10 19:57   ` Fabio Estevam
  2026-04-13 12:01   ` Kory Maincent
  11 siblings, 2 replies; 22+ messages in thread
From: Markus Schneider-Pargmann (TI) @ 2026-04-10 13:31 UTC (permalink / raw)
  To: u-boot, Marc Murphy
  Cc: Tom Rini, Rasmus Villemoes, Kory Maincent, Marek Vasut,
	Romain Gantois, Parvathi Pudi, Basharath Hussain Khaja,
	Paul Barker, Andrew F. Davis, Simon Glass, Anshul Dalal,
	Michael Trimarchi, Markus Schneider-Pargmann (TI)

The upstream devicetree uses simple-pm-bus, so CONFIG_POWER_DOMAIN is
required now. CONFIG_POWER_DOMAIN enables probing power domains, the PRM
power domain driver is requierd as well now.

This switches all evm defconfig variants to use the upstream devicetree.

Signed-off-by: Markus Schneider-Pargmann (TI) <msp@baylibre.com>
---
 configs/am335x_evm.config            | 6 +++++-
 configs/am335x_evm_defconfig         | 2 +-
 configs/am335x_evm_spiboot_defconfig | 2 +-
 configs/am335x_hs_evm.config         | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/configs/am335x_evm.config b/configs/am335x_evm.config
index 9c12771a3299bcd0b1c5c14bb4c2306d7b02aae5..fbc070c930e4d2d85739c9e428c4b130490cd6bc 100644
--- a/configs/am335x_evm.config
+++ b/configs/am335x_evm.config
@@ -3,7 +3,10 @@ CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_TI_COMMON_CMD_OPTIONS=y
 CONFIG_SF_DEFAULT_SPEED=24000000
-CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
+CONFIG_DEFAULT_DEVICE_TREE="ti/omap/am335x-evm"
+CONFIG_POWER_DOMAIN=y
+CONFIG_TI_OMAP_PRM_POWER_DOMAIN=y
+CONFIG_SIMPLE_PM_BUS=y
 CONFIG_AM33XX=y
 CONFIG_CLOCK_SYNTHESIZER=y
 CONFIG_SYS_BOOTM_LEN=0x1000000
@@ -12,6 +15,7 @@ CONFIG_TIMESTAMP=y
 CONFIG_SPL_LOAD_FIT=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_OF_BOARD_SETUP=y
+CONFIG_OF_UPSTREAM=y
 CONFIG_BOOTCOMMAND="run findfdt; run init_console; run finduuid; run distro_bootcmd"
 CONFIG_LOGLEVEL=3
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index 448b0a8308fcca04732b81313c72f7fd2247d1ca..9281178f914085b199e3d35e95d0ce1f3c0faaa5 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -24,7 +24,7 @@ CONFIG_CMD_SPL_NAND_OFS=0x00080000
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)"
-CONFIG_OF_LIST="am335x-evm am335x-bone am335x-sancloud-bbe am335x-sancloud-bbe-lite am335x-sancloud-bbe-extended-wifi am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle am335x-bonegreen-eco"
+CONFIG_OF_LIST="ti/omap/am335x-evm ti/omap/am335x-bone ti/omap/am335x-sancloud-bbe ti/omap/am335x-sancloud-bbe-lite ti/omap/am335x-sancloud-bbe-extended-wifi ti/omap/am335x-boneblack ti/omap/am335x-evmsk ti/omap/am335x-bonegreen ti/omap/am335x-icev2 ti/omap/am335x-pocketbeagle ti/omap/am335x-bonegreen-eco"
 CONFIG_SPL_ENV_IS_NOWHERE=y
 CONFIG_CLK=y
 CONFIG_CLK_CCF=y
diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig
index eebd916c02a2cad0d01ab738aab37b11dd3a9645..bbaca6c8800baf19377a457e49db446159e338a8 100644
--- a/configs/am335x_evm_spiboot_defconfig
+++ b/configs/am335x_evm_spiboot_defconfig
@@ -12,7 +12,7 @@ CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle am335x-bonegreen-eco"
+CONFIG_OF_LIST="ti/omap/am335x-evm ti/omap/am335x-bone ti/omap/am335x-boneblack ti/omap/am335x-evmsk ti/omap/am335x-bonegreen ti/omap/am335x-icev2 ti/omap/am335x-pocketbeagle ti/omap/am335x-bonegreen-eco"
 # CONFIG_ENV_IS_IN_FAT is not set
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPL_ENV_IS_NOWHERE=y
diff --git a/configs/am335x_hs_evm.config b/configs/am335x_hs_evm.config
index 7ade2fb163b204ad8bcc9554455fdd3e81657890..0bc8556b1d4b18a413ecd6879ab85be54f2730ef 100644
--- a/configs/am335x_hs_evm.config
+++ b/configs/am335x_hs_evm.config
@@ -8,7 +8,7 @@ CONFIG_SPL_NAND_DRIVERS=y
 CONFIG_SPL_NAND_ECC=y
 CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)"
-CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle am335x-bonegreen-eco"
+CONFIG_OF_LIST="ti/omap/am335x-evm ti/omap/am335x-bone ti/omap/am335x-boneblack ti/omap/am335x-evmsk ti/omap/am335x-bonegreen ti/omap/am335x-icev2 ti/omap/am335x-pocketbeagle ti/omap/am335x-bonegreen-eco"
 CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_RSA=y

-- 
2.53.0


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* Re: [PATCH v5 12/12] configs: am335x_evm_defconfig: Switch to upstream devicetree
  2026-04-10 13:31 ` [PATCH v5 12/12] configs: am335x_evm_defconfig: Switch to upstream devicetree Markus Schneider-Pargmann (TI)
@ 2026-04-10 19:57   ` Fabio Estevam
  2026-04-10 21:52     ` Andrew Davis
  2026-04-13 12:01   ` Kory Maincent
  1 sibling, 1 reply; 22+ messages in thread
From: Fabio Estevam @ 2026-04-10 19:57 UTC (permalink / raw)
  To: Markus Schneider-Pargmann (TI)
  Cc: u-boot, Marc Murphy, Tom Rini, Rasmus Villemoes, Kory Maincent,
	Marek Vasut, Romain Gantois, Parvathi Pudi,
	Basharath Hussain Khaja, Paul Barker, Andrew F. Davis,
	Simon Glass, Anshul Dalal, Michael Trimarchi

On Fri, Apr 10, 2026 at 10:34 AM Markus Schneider-Pargmann (TI)
<msp@baylibre.com> wrote:

> -CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
> +CONFIG_DEFAULT_DEVICE_TREE="ti/omap/am335x-evm"

You should also remove arch/arm/dts/am335x-evm.dts as it is no longer
needed after this change.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v5 12/12] configs: am335x_evm_defconfig: Switch to upstream devicetree
  2026-04-10 19:57   ` Fabio Estevam
@ 2026-04-10 21:52     ` Andrew Davis
  2026-04-15 14:27       ` Markus Schneider-Pargmann
  0 siblings, 1 reply; 22+ messages in thread
From: Andrew Davis @ 2026-04-10 21:52 UTC (permalink / raw)
  To: Fabio Estevam, Markus Schneider-Pargmann (TI)
  Cc: u-boot, Marc Murphy, Tom Rini, Rasmus Villemoes, Kory Maincent,
	Marek Vasut, Romain Gantois, Parvathi Pudi,
	Basharath Hussain Khaja, Paul Barker, Simon Glass, Anshul Dalal,
	Michael Trimarchi

On 4/10/26 2:57 PM, Fabio Estevam wrote:
> On Fri, Apr 10, 2026 at 10:34 AM Markus Schneider-Pargmann (TI)
> <msp@baylibre.com> wrote:
> 
>> -CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
>> +CONFIG_DEFAULT_DEVICE_TREE="ti/omap/am335x-evm"
> 
> You should also remove arch/arm/dts/am335x-evm.dts as it is no longer
> needed after this change.

Same for all the other DTS files:

CONFIG_OF_LIST="ti/omap/am335x-evm ti/omap/am335x-bone ti/omap/am335x-sancloud-bbe ti/omap/am335x-sancloud-bbe-lite ti/omap/am335x-sancloud-bbe-extended-wifi ti/omap/am335x-boneblack ti/omap/am335x-evmsk ti/omap/am335x-bonegreen ti/omap/am335x-icev2 ti/omap/am335x-pocketbeagle ti/omap/am335x-bonegreen-eco"

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v5 12/12] configs: am335x_evm_defconfig: Switch to upstream devicetree
  2026-04-10 21:52     ` Andrew Davis
@ 2026-04-15 14:27       ` Markus Schneider-Pargmann
  0 siblings, 0 replies; 22+ messages in thread
From: Markus Schneider-Pargmann @ 2026-04-15 14:27 UTC (permalink / raw)
  To: Andrew Davis, Fabio Estevam, Markus Schneider-Pargmann (TI)
  Cc: u-boot, Marc Murphy, Tom Rini, Rasmus Villemoes, Kory Maincent,
	Marek Vasut, Romain Gantois, Parvathi Pudi,
	Basharath Hussain Khaja, Paul Barker, Simon Glass, Anshul Dalal,
	Michael Trimarchi

[-- Attachment #1: Type: text/plain, Size: 860 bytes --]

Hi Fabio, Andrew,

On Fri Apr 10, 2026 at 11:52 PM CEST, Andrew Davis wrote:
> On 4/10/26 2:57 PM, Fabio Estevam wrote:
>> On Fri, Apr 10, 2026 at 10:34 AM Markus Schneider-Pargmann (TI)
>> <msp@baylibre.com> wrote:
>> 
>>> -CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
>>> +CONFIG_DEFAULT_DEVICE_TREE="ti/omap/am335x-evm"
>> 
>> You should also remove arch/arm/dts/am335x-evm.dts as it is no longer
>> needed after this change.
>
> Same for all the other DTS files:
>
> CONFIG_OF_LIST="ti/omap/am335x-evm ti/omap/am335x-bone ti/omap/am335x-sancloud-bbe ti/omap/am335x-sancloud-bbe-lite ti/omap/am335x-sancloud-bbe-extended-wifi ti/omap/am335x-boneblack ti/omap/am335x-evmsk ti/omap/am335x-bonegreen ti/omap/am335x-icev2 ti/omap/am335x-pocketbeagle ti/omap/am335x-bonegreen-eco"

Good point, thanks. I will add a patch for that.

Best
Markus

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 289 bytes --]

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v5 12/12] configs: am335x_evm_defconfig: Switch to upstream devicetree
  2026-04-10 13:31 ` [PATCH v5 12/12] configs: am335x_evm_defconfig: Switch to upstream devicetree Markus Schneider-Pargmann (TI)
  2026-04-10 19:57   ` Fabio Estevam
@ 2026-04-13 12:01   ` Kory Maincent
  2026-04-15 13:11     ` Markus Schneider-Pargmann
  1 sibling, 1 reply; 22+ messages in thread
From: Kory Maincent @ 2026-04-13 12:01 UTC (permalink / raw)
  To: Markus Schneider-Pargmann (TI)
  Cc: u-boot, Marc Murphy, Tom Rini, Rasmus Villemoes, Marek Vasut,
	Romain Gantois, Parvathi Pudi, Basharath Hussain Khaja,
	Paul Barker, Andrew F. Davis, Simon Glass, Anshul Dalal,
	Michael Trimarchi

On Fri, 10 Apr 2026 15:31:52 +0200
"Markus Schneider-Pargmann (TI)" <msp@baylibre.com> wrote:

> The upstream devicetree uses simple-pm-bus, so CONFIG_POWER_DOMAIN is
> required now. CONFIG_POWER_DOMAIN enables probing power domains, the PRM
> power domain driver is requierd as well now.
> 
> This switches all evm defconfig variants to use the upstream devicetree.

Hello,

This patch breaks the BeagleBone Green Eco boot.

U-Boot SPL 2026.04-00765-g42087b117172 (Apr 13 2026 - 11:59:01 +0200)
Trying to boot from MMC1

U-Boot 2026.04-00765-g42087b117172 (Apr 13 2026 - 11:59:01 +0200)

CPU  : AM335X-GP rev 2.1
Model: Seeed Studio BeagleBone Green Eco
DRAM:  512 MiB
Core:  201 devices, 17 uclasses, devicetree: separate
Could not initialize timer (err -19)

resetting ...

> 
> Signed-off-by: Markus Schneider-Pargmann (TI) <msp@baylibre.com>
> ---
>  configs/am335x_evm.config            | 6 +++++-
>  configs/am335x_evm_defconfig         | 2 +-
>  configs/am335x_evm_spiboot_defconfig | 2 +-
>  configs/am335x_hs_evm.config         | 2 +-
>  4 files changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/configs/am335x_evm.config b/configs/am335x_evm.config
> index
> 9c12771a3299bcd0b1c5c14bb4c2306d7b02aae5..fbc070c930e4d2d85739c9e428c4b130490cd6bc
> 100644 --- a/configs/am335x_evm.config +++ b/configs/am335x_evm.config
> @@ -3,7 +3,10 @@ CONFIG_ARCH_CPU_INIT=y
>  CONFIG_ARCH_OMAP2PLUS=y
>  CONFIG_TI_COMMON_CMD_OPTIONS=y
>  CONFIG_SF_DEFAULT_SPEED=24000000
> -CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
> +CONFIG_DEFAULT_DEVICE_TREE="ti/omap/am335x-evm"
> +CONFIG_POWER_DOMAIN=y
> +CONFIG_TI_OMAP_PRM_POWER_DOMAIN=y
> +CONFIG_SIMPLE_PM_BUS=y
>  CONFIG_AM33XX=y
>  CONFIG_CLOCK_SYNTHESIZER=y
>  CONFIG_SYS_BOOTM_LEN=0x1000000
> @@ -12,6 +15,7 @@ CONFIG_TIMESTAMP=y
>  CONFIG_SPL_LOAD_FIT=y
>  CONFIG_DISTRO_DEFAULTS=y
>  CONFIG_OF_BOARD_SETUP=y
> +CONFIG_OF_UPSTREAM=y
>  CONFIG_BOOTCOMMAND="run findfdt; run init_console; run finduuid; run
> distro_bootcmd" CONFIG_LOGLEVEL=3
>  CONFIG_SYS_CONSOLE_INFO_QUIET=y
> diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
> index
> 448b0a8308fcca04732b81313c72f7fd2247d1ca..9281178f914085b199e3d35e95d0ce1f3c0faaa5
> 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig
> @@ -24,7 +24,7 @@ CONFIG_CMD_SPL_NAND_OFS=0x00080000
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
>  CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)"
> -CONFIG_OF_LIST="am335x-evm am335x-bone am335x-sancloud-bbe
> am335x-sancloud-bbe-lite am335x-sancloud-bbe-extended-wifi am335x-boneblack
> am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle
> am335x-bonegreen-eco" +CONFIG_OF_LIST="ti/omap/am335x-evm ti/omap/am335x-bone
> ti/omap/am335x-sancloud-bbe ti/omap/am335x-sancloud-bbe-lite
> ti/omap/am335x-sancloud-bbe-extended-wifi ti/omap/am335x-boneblack
> ti/omap/am335x-evmsk ti/omap/am335x-bonegreen ti/omap/am335x-icev2
> ti/omap/am335x-pocketbeagle ti/omap/am335x-bonegreen-eco"
> CONFIG_SPL_ENV_IS_NOWHERE=y CONFIG_CLK=y CONFIG_CLK_CCF=y diff --git
> a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig
> index
> eebd916c02a2cad0d01ab738aab37b11dd3a9645..bbaca6c8800baf19377a457e49db446159e338a8
> 100644 --- a/configs/am335x_evm_spiboot_defconfig +++
> b/configs/am335x_evm_spiboot_defconfig @@ -12,7 +12,7 @@
> CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x20000 # CONFIG_CMD_SETEXPR
> is not set CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_LIST="am335x-evm am335x-bone
> am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2
> am335x-pocketbeagle am335x-bonegreen-eco" +CONFIG_OF_LIST="ti/omap/am335x-evm
> ti/omap/am335x-bone ti/omap/am335x-boneblack ti/omap/am335x-evmsk
> ti/omap/am335x-bonegreen ti/omap/am335x-icev2 ti/omap/am335x-pocketbeagle
> ti/omap/am335x-bonegreen-eco" # CONFIG_ENV_IS_IN_FAT is not set
> CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPL_ENV_IS_NOWHERE=y diff --git
> a/configs/am335x_hs_evm.config b/configs/am335x_hs_evm.config index
> 7ade2fb163b204ad8bcc9554455fdd3e81657890..0bc8556b1d4b18a413ecd6879ab85be54f2730ef
> 100644 --- a/configs/am335x_hs_evm.config +++ b/configs/am335x_hs_evm.config
> @@ -8,7 +8,7 @@ CONFIG_SPL_NAND_DRIVERS=y CONFIG_SPL_NAND_ECC=y
> CONFIG_MTDIDS_DEFAULT="nand0=nand.0"
> CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)"
> -CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk
> am335x-bonegreen am335x-icev2 am335x-pocketbeagle am335x-bonegreen-eco"
> +CONFIG_OF_LIST="ti/omap/am335x-evm ti/omap/am335x-bone
> ti/omap/am335x-boneblack ti/omap/am335x-evmsk ti/omap/am335x-bonegreen
> ti/omap/am335x-icev2 ti/omap/am335x-pocketbeagle
> ti/omap/am335x-bonegreen-eco" CONFIG_SPL_DM_USB_GADGET=y
> CONFIG_SPL_TINY_MEMSET=y CONFIG_RSA=y
> 



-- 
Köry Maincent, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v5 12/12] configs: am335x_evm_defconfig: Switch to upstream devicetree
  2026-04-13 12:01   ` Kory Maincent
@ 2026-04-15 13:11     ` Markus Schneider-Pargmann
  0 siblings, 0 replies; 22+ messages in thread
From: Markus Schneider-Pargmann @ 2026-04-15 13:11 UTC (permalink / raw)
  To: Kory Maincent, Markus Schneider-Pargmann (TI)
  Cc: u-boot, Marc Murphy, Tom Rini, Rasmus Villemoes, Marek Vasut,
	Romain Gantois, Parvathi Pudi, Basharath Hussain Khaja,
	Paul Barker, Andrew F. Davis, Simon Glass, Anshul Dalal,
	Michael Trimarchi

[-- Attachment #1: Type: text/plain, Size: 1131 bytes --]

Hi Kory,

On Mon Apr 13, 2026 at 2:01 PM CEST, Kory Maincent wrote:
> On Fri, 10 Apr 2026 15:31:52 +0200
> "Markus Schneider-Pargmann (TI)" <msp@baylibre.com> wrote:
>
>> The upstream devicetree uses simple-pm-bus, so CONFIG_POWER_DOMAIN is
>> required now. CONFIG_POWER_DOMAIN enables probing power domains, the PRM
>> power domain driver is requierd as well now.
>> 
>> This switches all evm defconfig variants to use the upstream devicetree.
>
> Hello,
>
> This patch breaks the BeagleBone Green Eco boot.
>
> U-Boot SPL 2026.04-00765-g42087b117172 (Apr 13 2026 - 11:59:01 +0200)
> Trying to boot from MMC1
>
> U-Boot 2026.04-00765-g42087b117172 (Apr 13 2026 - 11:59:01 +0200)
>
> CPU  : AM335X-GP rev 2.1
> Model: Seeed Studio BeagleBone Green Eco
> DRAM:  512 MiB
> Core:  201 devices, 17 uclasses, devicetree: separate
> Could not initialize timer (err -19)
>
> resetting ...

Thanks a lot for review, testing and the log. It seems the BeagleBone
Green Eco is missing a -u-boot.dtsi that sets the tick-timer. I hope
that's the only issue, I will fix it for the next version.

Best
Markus


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 289 bytes --]

^ permalink raw reply	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2026-04-15 14:28 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-04-10 13:31 [PATCH v5 00/12] arm: am335x: Switch to upstream devicetree Markus Schneider-Pargmann (TI)
2026-04-10 13:31 ` [PATCH v5 01/12] arm: dts: am335x-evm: Add backlight to the panel Markus Schneider-Pargmann (TI)
2026-04-10 13:31 ` [PATCH v5 02/12] configs: am335x_evm_defconfig: Enable panel Markus Schneider-Pargmann (TI)
2026-04-10 13:31 ` [PATCH v5 03/12] include: configs: am335x_evm: Enable vidconsole Markus Schneider-Pargmann (TI)
2026-04-10 13:31 ` [PATCH v5 04/12] configs: am335x_evm: Enable SPL_OPTIMIZE_INLINING Markus Schneider-Pargmann (TI)
2026-04-10 13:31 ` [PATCH v5 05/12] configs: am335x_evm: Unify evm board defconfigs Markus Schneider-Pargmann (TI)
2026-04-13  9:49   ` Kory Maincent
2026-04-10 13:31 ` [PATCH v5 06/12] am33xx: Avoid hard failure on USB probe issue Markus Schneider-Pargmann (TI)
2026-04-10 13:31 ` [PATCH v5 07/12] arm: dts: am335x-*-u-boot: Add chosen tick-timer Markus Schneider-Pargmann (TI)
2026-04-10 13:31 ` [PATCH v5 08/12] arm: dts: am335x-boneblack-u-boot: Add lcdc to all boot phases Markus Schneider-Pargmann (TI)
2026-04-10 13:31 ` [PATCH v5 09/12] am33xx: Fix comment about config symbols Markus Schneider-Pargmann (TI)
2026-04-10 13:31 ` [PATCH v5 10/12] am33xx: Support upstream devicetree USB device Markus Schneider-Pargmann (TI)
2026-04-10 13:31 ` [PATCH v5 11/12] dm: core: Split SIMPLE_PM_BUS into phases Markus Schneider-Pargmann (TI)
2026-04-11 14:37   ` Simon Glass
2026-04-15 14:26     ` Markus Schneider-Pargmann
2026-04-13  9:51   ` Kory Maincent
2026-04-10 13:31 ` [PATCH v5 12/12] configs: am335x_evm_defconfig: Switch to upstream devicetree Markus Schneider-Pargmann (TI)
2026-04-10 19:57   ` Fabio Estevam
2026-04-10 21:52     ` Andrew Davis
2026-04-15 14:27       ` Markus Schneider-Pargmann
2026-04-13 12:01   ` Kory Maincent
2026-04-15 13:11     ` Markus Schneider-Pargmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox