From 6d4a13deb0ce2398e032c6a4d7035bbf953375ab Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Thu, 1 Apr 2021 05:57:34 +0000 Subject: [PATCH] conf/machine: am64xx: Consolidate image configuration to SoC include IMAGE type and dependencies can easily be centralized to SoC include file. This is necessary to make sure that we don't do the duplication and having multiple places to fix up. Signed-off-by: Nishanth Menon Reviewed-by: Denys Dmytriyenko --- conf/machine/am64xx-evm.conf | 5 ----- conf/machine/am64xx-sk.conf | 5 ----- conf/machine/include/am64xx.inc | 4 ++++ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/conf/machine/am64xx-evm.conf b/conf/machine/am64xx-evm.conf index 788b15ab..c6ba2a87 100644 --- a/conf/machine/am64xx-evm.conf +++ b/conf/machine/am64xx-evm.conf @@ -4,9 +4,4 @@ require conf/machine/include/am64xx.inc -IMAGE_BOOT_FILES = "tispl.bin u-boot.img" - UBOOT_MACHINE = "am64x_evm_a53_defconfig" - -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" diff --git a/conf/machine/am64xx-sk.conf b/conf/machine/am64xx-sk.conf index 70c9c4f6..445ff723 100644 --- a/conf/machine/am64xx-sk.conf +++ b/conf/machine/am64xx-sk.conf @@ -4,13 +4,8 @@ require conf/machine/include/am64xx.inc -IMAGE_BOOT_FILES = "tispl.bin u-boot.img" - UBOOT_MACHINE = "am64x_sk_a53_defconfig" -do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" -do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" - KERNEL_DEVICETREE = " \ ti/k3-am642-sk.dtb \ " diff --git a/conf/machine/include/am64xx.inc b/conf/machine/include/am64xx.inc index 20441d8a..56d01502 100644 --- a/conf/machine/include/am64xx.inc +++ b/conf/machine/include/am64xx.inc @@ -10,6 +10,10 @@ KERNEL_DEVICETREE = " \ ti/k3-am642-evm.dtb \ " +IMAGE_BOOT_FILES = "tispl.bin u-boot.img" +do_image_wic[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" +do_image_tar[mcdepends] = "mc::k3r5:ti-sci-fw:do_deploy" + TFA_BOARD = "lite" OPTEEMACHINE = "k3-am65x" OPTEEOUTPUTMACHINE = "k3"