From 3598ecfcb5929156d971084f7982c232fc8cccff Mon Sep 17 00:00:00 2001 From: Andrew Davis Date: Fri, 26 May 2023 13:27:29 -0500 Subject: [PATCH] conf: machine: Do not override SPL_BINARY on AM65x and J721e In U-Boot the names of these files have been updated to match our expected defaults. Remove these fixups. Signed-off-by: Andrew Davis Signed-off-by: Ryan Eatmon --- meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf | 2 -- meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf | 2 -- meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf | 2 -- meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf | 2 -- 4 files changed, 8 deletions(-) diff --git a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf index 2a7b5990..b1b2490e 100644 --- a/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am65xx-evm-k3r5.conf @@ -8,6 +8,4 @@ SYSFW_SOC = "am65x" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" -SPL_BINARY = "tiboot3.${SPL_SUFFIX}_unsigned" - UBOOT_MACHINE = "am65x_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf index 5ac0c578..4fb2bf50 100644 --- a/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am65xx-hs-evm-k3r5.conf @@ -8,6 +8,4 @@ SYSFW_SOC = "am65x_sr2" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" -SPL_BINARY = "tiboot3.${SPL_SUFFIX}" - UBOOT_MACHINE = "am65x_hs_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf index d54af565..070bf7aa 100644 --- a/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j721e-evm-k3r5.conf @@ -8,6 +8,4 @@ SYSFW_SOC = "j721e" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" -SPL_BINARY = "tiboot3.${SPL_SUFFIX}_unsigned" - UBOOT_MACHINE = "j721e_evm_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf index c529985f..7904c660 100644 --- a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf @@ -8,6 +8,4 @@ SYSFW_SOC = "j721e_sr1_1" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs" -SPL_BINARY = "tiboot3.${SPL_SUFFIX}" - UBOOT_MACHINE = "j721e_evm_r5_defconfig"