Hi, This is a bit painful series, so apologies in advance for the patchbomb. I did'nt see any clean way to do this, so here goes.
First: there are dts mismatches and overrides being done in u-boot in varied manner that should have been submitted to kernel.org in the first place, so, https://lore.kernel.org/linux-devicetree/20230414073328.381336-1...@ti.com/ This series picks some of those nodes up and marks them so that merge is a lot more logical. There are still stuff like esm and cpsw that will need a little more work. This series cleans up the dt, switches to .env mode and finally defaults to distroboot with none of the fancy stuff. I have tried to maintain bisectability, but the r5-sk stuff is a bit too broken for me to succeed cleanly.. but it did'nt make sense to confuse review by squashing everything up. Let me know if there is a better bisect option, and I can try. Logs are available: (including a log with the last two patches applied for distoboot default) https://gist.github.com/nmenon/6b09f55251225d3f3cce076c32a33bba Tested along with the ethernet fixup I had sent earlier: https://lore.kernel.org/u-boot/20230414042433.3436425-1...@ti.com/ Baseline for these patches: 9e804638bfe2 Merge tag 'for-v2023-07-rc1' of https://source.denx.de/u-boot/custodians/u-boot-i2c Nishanth Menon (23): Revert "ARM: dts: k3-am642-sk-u-boot: add PMIC node" arm: dts: k3-am64: Update devicetree to sync with v6.3-rc6 arm: dts: k3-am642-sk: Add a note to handle pinmux till MDIO DM conversion is done arm: dts: k3-am642-sk: Fix mmc1 pinmux pull polarity arm: dts: k3-am642-sk: Add main_uart1 description arm: dts: k3-am642-sk: Add main_i2c0 and eeprom arm: dts: k3-am642-sk-u-boot: Drop the i2c node arm: dts: k3-am642-sk-u-boot: Drop redundant usb dr_mode property arm: dts: k3-am642-sk-u-boot: Mark main_uart0 to be used for spl arm: dts: k3-am642-sk-u-boot: Document timer as missing upstream arm: dts: k3-am642-sk-u-boot: Drop aliases and stdout arm: dts: k3-am642-r5-sk: Use am642-sk.dts and k3-am642-sk-u-boot.dtsi arm: dts: k3-am642-evm: Move the mdio pinmux down to evm.dts arm: dts: k3-am642-evm: Add DDR vtt regulator arm: dts: k3-am642-evm: Add main_uart1 description arm: dts: k3-am642-evm: Add main_i2c0 and eeprom arm: dts: k3-am642-evm-u-boot: Drop the i2c node arm: dts: k3-am642-evm-u-boot: Drop stdout and cosmetic fixups arm: dts: k3-am642-evm-u-boot: Re-organize the pinmux arm: dts: k3-am642-evm-u-boot: Add missing pinmux notations arm: dts: k3-am642-r5-evm: Use am642-evm.dts and k3-am642-evm-u-boot.dtsi include: configs: am64x_evm: Change to using .env configs: am64x_evm_a53_defconfig: Just use distroboot arch/arm/dts/k3-am642-evm-u-boot.dtsi | 52 ++++--- arch/arm/dts/k3-am642-evm.dts | 60 +++++++- arch/arm/dts/k3-am642-r5-evm.dts | 203 ++++---------------------- arch/arm/dts/k3-am642-r5-sk.dts | 194 +++--------------------- arch/arm/dts/k3-am642-sk-u-boot.dtsi | 89 ++--------- arch/arm/dts/k3-am642-sk.dts | 54 ++++++- arch/arm/dts/k3-am642.dtsi | 1 + board/ti/am64x/Kconfig | 3 + board/ti/am64x/am64x.env | 37 +++++ configs/am64x_evm_a53_defconfig | 2 +- include/configs/am64x_evm.h | 117 ++++----------- 11 files changed, 266 insertions(+), 546 deletions(-) create mode 100644 board/ti/am64x/am64x.env -- 2.40.0
