[参考译文] AM623：以太网引导请重置电路板

From fa66b743bcd854739b5bf741b036ae538255694d Mon Sep 17 00:00:00 2001
From: Andreas Dannenberg <dannenberg@ti.com>
Date: Thu, 6 Jun 2024 01:15:56 -0500
Subject: [PATCH] u-boot-ti-staging: Fix SDK v9.2 AM62 Ethernet boot

Signed-off-by: Andreas Dannenberg <dannenberg@ti.com>
---
 ...m_r5_ethboot-Fix-syscon-related-buil.patch | 31 +++++++
 ...m_r5_ethboot-Reduce-memory-consumpti.patch | 87 +++++++++++++++++++
 ...-sk-common-u-boot-Fix-phy_gmii_sel-n.patch | 37 ++++++++
 .../u-boot/u-boot-ti-staging_%.bbappend       |  7 ++
 4 files changed, 162 insertions(+)
 create mode 100644 recipes-bsp/u-boot/u-boot-ti-staging/0001-configs-am62x_evm_r5_ethboot-Fix-syscon-related-buil.patch
 create mode 100644 recipes-bsp/u-boot/u-boot-ti-staging/0002-configs-am62x_evm_r5_ethboot-Reduce-memory-consumpti.patch
 create mode 100644 recipes-bsp/u-boot/u-boot-ti-staging/0003-arm-dts-k3-am62x-sk-common-u-boot-Fix-phy_gmii_sel-n.patch

diff --git a/recipes-bsp/u-boot/u-boot-ti-staging/0001-configs-am62x_evm_r5_ethboot-Fix-syscon-related-buil.patch b/recipes-bsp/u-boot/u-boot-ti-staging/0001-configs-am62x_evm_r5_ethboot-Fix-syscon-related-buil.patch
new file mode 100644
index 0000000..e7190bd
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-ti-staging/0001-configs-am62x_evm_r5_ethboot-Fix-syscon-related-buil.patch
@@ -0,0 +1,31 @@
+From 3a4a78a7fdd29550b31675ecd91a755c9d451fab Mon Sep 17 00:00:00 2001
+From: Andreas Dannenberg <dannenberg@ti.com>
+Date: Sat, 1 Jun 2024 22:26:44 -0500
+Subject: [PATCH 1/3] configs: am62x_evm_r5_ethboot: Fix syscon-related build
+ error
+
+The Ethernet boot defconfig needs the syscon driver to be enabled
+otherwise this will result in a build error as the Ethernet driver
+tries to read the MAC address from the efuses.
+
+Signed-off-by: Andreas Dannenberg <dannenberg@ti.com>
+---
+ configs/am62x_evm_r5_ethboot_defconfig | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configs/am62x_evm_r5_ethboot_defconfig b/configs/am62x_evm_r5_ethboot_defconfig
+index 701e9db392a..2380eb2d3fd 100644
+--- a/configs/am62x_evm_r5_ethboot_defconfig
++++ b/configs/am62x_evm_r5_ethboot_defconfig
+@@ -79,6 +79,8 @@ CONFIG_SPL_DM=y
+ CONFIG_SPL_DM_SEQ_ALIAS=y
+ CONFIG_REGMAP=y
+ CONFIG_SPL_REGMAP=y
++CONFIG_SYSCON=y
++CONFIG_SPL_SYSCON=y
+ CONFIG_SPL_OF_TRANSLATE=y
+ CONFIG_CLK=y
+ CONFIG_SPL_CLK=y
+-- 
+2.34.1
+
diff --git a/recipes-bsp/u-boot/u-boot-ti-staging/0002-configs-am62x_evm_r5_ethboot-Reduce-memory-consumpti.patch b/recipes-bsp/u-boot/u-boot-ti-staging/0002-configs-am62x_evm_r5_ethboot-Reduce-memory-consumpti.patch
new file mode 100644
index 0000000..2013d31
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-ti-staging/0002-configs-am62x_evm_r5_ethboot-Reduce-memory-consumpti.patch
@@ -0,0 +1,87 @@
+From ea3fbb314b55a38b3bcb392e87a7581bc8fd957a Mon Sep 17 00:00:00 2001
+From: Andreas Dannenberg <dannenberg@ti.com>
+Date: Thu, 6 Jun 2024 00:03:59 -0500
+Subject: [PATCH 2/3] configs: am62x_evm_r5_ethboot: Reduce memory consumption
+
+Disable some features not related/needed for Ethernet boot to free up
+more SRAM so that the Ethernet boot actually works.
+
+Signed-off-by: Andreas Dannenberg <dannenberg@ti.com>
+---
+ configs/am62x_evm_r5_ethboot_defconfig | 19 +++++++++----------
+ 1 file changed, 9 insertions(+), 10 deletions(-)
+
+diff --git a/configs/am62x_evm_r5_ethboot_defconfig b/configs/am62x_evm_r5_ethboot_defconfig
+index 2380eb2d3fd..adb53b28525 100644
+--- a/configs/am62x_evm_r5_ethboot_defconfig
++++ b/configs/am62x_evm_r5_ethboot_defconfig
+@@ -10,19 +10,16 @@ CONFIG_TARGET_AM625_R5_EVM=y
+ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x43c3a7f0
+ CONFIG_ENV_SIZE=0x20000
+-CONFIG_ENV_OFFSET=0x680000
+ CONFIG_DM_GPIO=y
+ CONFIG_DEFAULT_DEVICE_TREE="k3-am625-r5-sk"
+ CONFIG_SPL_TEXT_BASE=0x43c00000
+ CONFIG_DM_RESET=y
+-CONFIG_SPL_MMC=y
+ CONFIG_SPL_SERIAL=y
+ CONFIG_SPL_DRIVERS_MISC=y
+ CONFIG_SPL_STACK_R_ADDR=0x82000000
+ CONFIG_SPL_SYS_MALLOC_F_LEN=0x7000
+ CONFIG_SPL_SIZE_LIMIT=0x3A7F0
+ CONFIG_SPL_SIZE_LIMIT_PROVIDE_STACK=0x3500
+-CONFIG_SPL_LIBDISK_SUPPORT=y
+ CONFIG_SPL_LOAD_FIT=y
+ CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000
+ # CONFIG_DISPLAY_CPUINFO is not set
+@@ -44,8 +41,6 @@ CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y
+ CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x84000000
+ CONFIG_SYS_SPL_MALLOC_SIZE=0x1000000
+ CONFIG_SPL_EARLY_BSS=y
+-CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
+-CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400
+ CONFIG_SPL_DMA=y
+ CONFIG_SPL_ENV_SUPPORT=y
+ CONFIG_SPL_ETH=y
+@@ -60,28 +55,32 @@ CONFIG_SPL_RAM_DEVICE=y
+ CONFIG_SPL_REMOTEPROC=y
+ CONFIG_SPL_YMODEM_SUPPORT=y
+ CONFIG_HUSH_PARSER=y
+-CONFIG_CMD_ASKENV=y
+-CONFIG_CMD_GPT=y
++# CONFIG_CMD_EXPORTENV is not set
++# CONFIG_CMD_IMPORTENV is not set
++# CONFIG_CMD_EDITENV is not set
++# CONFIG_CMD_SAVEENV is not set
++# CONFIG_CMD_ENV_EXISTS is not set
++CONFIG_RANDOM_UUID=y
+ CONFIG_CMD_MMC=y
+ CONFIG_CMD_REMOTEPROC=y
+ # CONFIG_CMD_SETEXPR is not set
+ CONFIG_CMD_DHCP=y
+ CONFIG_CMD_TIME=y
+ CONFIG_CMD_FAT=y
++# CONFIG_DOS_PARTITION is not set
+ CONFIG_OF_CONTROL=y
+ CONFIG_SPL_OF_CONTROL=y
+ CONFIG_SPL_MULTI_DTB_FIT=y
+ CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
+-CONFIG_ENV_IS_IN_MMC=y
+ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+-CONFIG_SYS_MMC_ENV_PART=1
+ CONFIG_SPL_DM=y
+ CONFIG_SPL_DM_SEQ_ALIAS=y
+ CONFIG_REGMAP=y
+ CONFIG_SPL_REGMAP=y
+-CONFIG_SYSCON=y
+ CONFIG_SPL_SYSCON=y
+ CONFIG_SPL_OF_TRANSLATE=y
++# CONFIG_SPL_BLK is not set
++# CONFIG_BLOCK_CACHE is not set
+ CONFIG_CLK=y
+ CONFIG_SPL_CLK=y
+ CONFIG_SPL_CLK_CCF=y
+-- 
+2.34.1
+
diff --git a/recipes-bsp/u-boot/u-boot-ti-staging/0003-arm-dts-k3-am62x-sk-common-u-boot-Fix-phy_gmii_sel-n.patch b/recipes-bsp/u-boot/u-boot-ti-staging/0003-arm-dts-k3-am62x-sk-common-u-boot-Fix-phy_gmii_sel-n.patch
new file mode 100644
index 0000000..722e907
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-ti-staging/0003-arm-dts-k3-am62x-sk-common-u-boot-Fix-phy_gmii_sel-n.patch
@@ -0,0 +1,37 @@
+From c14b711645c6afd28459af762068d9ab08efbe20 Mon Sep 17 00:00:00 2001
+From: Andreas Dannenberg <dannenberg@ti.com>
+Date: Thu, 6 Jun 2024 00:58:50 -0500
+Subject: [PATCH 3/3] arm: dts: k3-am62x-sk-common-u-boot: Fix phy_gmii_sel
+ node
+
+Fix the phy_gmii_sel node by removing old/invalid declarations and
+enabling it for SPL use.
+
+Signed-off-by: Andreas Dannenberg <dannenberg@ti.com>
+---
+ arch/arm/dts/k3-am62x-sk-common-u-boot.dtsi | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/arch/arm/dts/k3-am62x-sk-common-u-boot.dtsi b/arch/arm/dts/k3-am62x-sk-common-u-boot.dtsi
+index 4265b434168..9ab7126df0d 100644
+--- a/arch/arm/dts/k3-am62x-sk-common-u-boot.dtsi
++++ b/arch/arm/dts/k3-am62x-sk-common-u-boot.dtsi
+@@ -148,12 +148,10 @@
+ 	/* This is WA because MDIO driver is not DM enabled */
+ 	pinctrl-0 = <&main_mdio1_pins_default &main_rgmii1_pins_default>;
+ 	bootph-pre-ram;
++};
+ 
+-	cpsw-phy-sel@04044 {
+-		compatible = "ti,am64-phy-gmii-sel";
+-		reg = <0x0 0x00104044 0x0 0x8>;
+-		bootph-pre-ram;
+-	};
++&phy_gmii_sel {
++	bootph-pre-ram;
+ };
+ 
+ &cpsw_port2 {
+-- 
+2.34.1
+
diff --git a/recipes-bsp/u-boot/u-boot-ti-staging_%.bbappend b/recipes-bsp/u-boot/u-boot-ti-staging_%.bbappend
index 8862d1f..fe32cdf 100644
--- a/recipes-bsp/u-boot/u-boot-ti-staging_%.bbappend
+++ b/recipes-bsp/u-boot/u-boot-ti-staging_%.bbappend
@@ -5,6 +5,13 @@ SRC_URI:append:sk = " \
 		    file://0001-configs-j721s2-Sign-the-am68-sk-dtb-by-default-for-h.patch \
 		    file://0001-configs-j784s4-Sign-the-am69-sk-dtb-by-default-for-h.patch \
 		    "
+
+SRC_URI:append = " \
+		    file://0001-configs-am62x_evm_r5_ethboot-Fix-syscon-related-buil.patch \
+		    file://0002-configs-am62x_evm_r5_ethboot-Reduce-memory-consumpti.patch \
+		    file://0003-arm-dts-k3-am62x-sk-common-u-boot-Fix-phy_gmii_sel-n.patch \
+		    "
+
 SRCREV:tie-jailhouse = "68f2264747f7a2a6883ab060d14ebade6d9bf51e"
 
 IPC_DM_FW = "ipc_echo_testb_mcu1_0_release_strip.xer5f"
-- 
2.34.1