From d1fec62587dc22b880a858217e0af71007b33ad9 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Thu, 1 Apr 2021 05:08:12 +0000 Subject: [PATCH] conf/machine: am64*, j7200: cleanup k3r5 configs Remove duplicate machine-specific redefines of UBOOT_BINARY, UBOOT_IMAGE and UBOOT_SYMLINK variables, as they are already defined with same values in the common k3r5.inc file. Signed-off-by: Denys Dmytriyenko Reviewed-by: Nishanth Menon --- conf/machine/am64xx-evm-k3r5.conf | 3 --- conf/machine/am64xx-sk-k3r5.conf | 3 --- conf/machine/j7200-evm-k3r5.conf | 3 --- 3 files changed, 9 deletions(-) diff --git a/conf/machine/am64xx-evm-k3r5.conf b/conf/machine/am64xx-evm-k3r5.conf index dfeaeb57..afd36b72 100644 --- a/conf/machine/am64xx-evm-k3r5.conf +++ b/conf/machine/am64xx-evm-k3r5.conf @@ -9,6 +9,3 @@ SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" UBOOT_MACHINE = "am64x_evm_r5_defconfig" -UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" diff --git a/conf/machine/am64xx-sk-k3r5.conf b/conf/machine/am64xx-sk-k3r5.conf index 1256db72..07ca5902 100644 --- a/conf/machine/am64xx-sk-k3r5.conf +++ b/conf/machine/am64xx-sk-k3r5.conf @@ -9,6 +9,3 @@ SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" UBOOT_MACHINE = "am64x_sk_r5_defconfig" -UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" diff --git a/conf/machine/j7200-evm-k3r5.conf b/conf/machine/j7200-evm-k3r5.conf index a8894810..68061883 100644 --- a/conf/machine/j7200-evm-k3r5.conf +++ b/conf/machine/j7200-evm-k3r5.conf @@ -9,6 +9,3 @@ SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" UBOOT_MACHINE = "j7200_evm_r5_defconfig" -UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}" -UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"