board: ti: am65x: migrate to OF_UPSTREAM

Rather than rely on manual updates from the arch/arm/dts directory,
enable CONFIG_OF_UPSTREAM to receive automatic device tree updates for
the am65x reference board.

Signed-off-by: Bryan Brattlof <bb@ti.com>
This commit is contained in:
Bryan Brattlof 2024-11-21 15:17:49 -06:00 committed by Tom Rini
parent 7fe55182d9
commit 262a62ad93
4 changed files with 6 additions and 6 deletions

View file

@ -1156,9 +1156,7 @@ dtb-$(CONFIG_STM32MP25X) += \
stm32mp257f-ev1.dtb stm32mp257f-ev1.dtb
dtb-$(CONFIG_SOC_K3_AM654) += \ dtb-$(CONFIG_SOC_K3_AM654) += \
k3-am654-base-board.dtb \ k3-am654-r5-base-board.dtb
k3-am654-r5-base-board.dtb \
k3-am654-icssg2.dtbo
dtb-$(CONFIG_SOC_K3_J721E) += k3-j721e-r5-common-proc-board.dtb \ dtb-$(CONFIG_SOC_K3_J721E) += k3-j721e-r5-common-proc-board.dtb \
k3-j7200-r5-common-proc-board.dtb \ k3-j7200-r5-common-proc-board.dtb \

View file

@ -95,10 +95,10 @@
#ifdef CONFIG_TARGET_AM654_A53_EVM #ifdef CONFIG_TARGET_AM654_A53_EVM
#define SPL_AM654_EVM_DTB "spl/dts/k3-am654-base-board.dtb" #define SPL_AM654_EVM_DTB "spl/dts/ti/k3-am654-base-board.dtb"
#define AM654_EVM_DTB "u-boot.dtb" #define AM654_EVM_DTB "u-boot.dtb"
#define AM654_EVM_ICSSG2_DTBO "arch/arm/dts/k3-am654-icssg2.dtbo" #define AM654_EVM_ICSSG2_DTBO "ti/k3-am654-icssg2.dtbo"
&binman { &binman {
ti-spl { ti-spl {

View file

@ -16,6 +16,7 @@ config TARGET_AM654_A53_EVM
select BOARD_LATE_INIT select BOARD_LATE_INIT
select BINMAN select BINMAN
imply TI_I2C_BOARD_DETECT imply TI_I2C_BOARD_DETECT
select OF_UPSTREAM
config TARGET_AM654_R5_EVM config TARGET_AM654_R5_EVM
bool "TI K3 based AM654 EVM running on R5" bool "TI K3 based AM654 EVM running on R5"

View file

@ -14,7 +14,7 @@ CONFIG_ENV_SIZE=0x20000
CONFIG_ENV_OFFSET=0x680000 CONFIG_ENV_OFFSET=0x680000
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_SPL_DM_SPI=y CONFIG_SPL_DM_SPI=y
CONFIG_DEFAULT_DEVICE_TREE="k3-am654-base-board" CONFIG_DEFAULT_DEVICE_TREE="ti/k3-am654-base-board"
CONFIG_DM_RESET=y CONFIG_DM_RESET=y
CONFIG_SPL_MMC=y CONFIG_SPL_MMC=y
CONFIG_SPL_SERIAL=y CONFIG_SPL_SERIAL=y
@ -76,6 +76,7 @@ CONFIG_CMD_UBI=y
# CONFIG_ISO_PARTITION is not set # CONFIG_ISO_PARTITION is not set
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_SPL_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_OVERLAY_LIST="ti/k3-am654-icssg2"
CONFIG_SPL_MULTI_DTB_FIT=y CONFIG_SPL_MULTI_DTB_FIT=y
CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
CONFIG_ENV_OVERWRITE=y CONFIG_ENV_OVERWRITE=y