From: "Nishanth Menon" <nm@ti.com>
To: <praneeth@ti.com>
Cc: <denis@denix.org>, <meta-ti@lists.yoctoproject.org>,
Nishanth Menon <nm@ti.com>
Subject: [dunfell/master][PATCH 5/7] conf/machine: am64xx: Consolidate image configuration to SoC include
Date: Wed, 31 Mar 2021 11:51:31 -0500 [thread overview]
Message-ID: <20210331165133.3746-6-nm@ti.com> (raw)
In-Reply-To: <20210331165133.3746-1-nm@ti.com>
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 <nm@ti.com>
---
conf/machine/am64xx-evm.conf | 8 --------
conf/machine/am64xx-sk.conf | 8 --------
conf/machine/include/am64xx.inc | 6 ++++++
3 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/conf/machine/am64xx-evm.conf b/conf/machine/am64xx-evm.conf
index eda310a32b14..c6ba2a8735f3 100644
--- a/conf/machine/am64xx-evm.conf
+++ b/conf/machine/am64xx-evm.conf
@@ -4,12 +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[depends] += "trusted-firmware-a:do_deploy"
-do_image_tar[depends] += "trusted-firmware-a:do_deploy"
-
-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 4cad8adcf1df..445ff72339d9 100644
--- a/conf/machine/am64xx-sk.conf
+++ b/conf/machine/am64xx-sk.conf
@@ -4,16 +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[depends] += "trusted-firmware-a:do_deploy"
-do_image_tar[depends] += "trusted-firmware-a:do_deploy"
-
-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 20441d8a757f..3173319df354 100644
--- a/conf/machine/include/am64xx.inc
+++ b/conf/machine/include/am64xx.inc
@@ -10,6 +10,12 @@ KERNEL_DEVICETREE = " \
ti/k3-am642-evm.dtb \
"
+IMAGE_BOOT_FILES = "tispl.bin u-boot.img"
+do_image_wic[depends] += "trusted-firmware-a:do_deploy"
+do_image_tar[depends] += "trusted-firmware-a:do_deploy"
+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"
--
2.31.0
next prev parent reply other threads:[~2021-03-31 16:51 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-31 16:51 [dunfell/master][PATCH 0/7] conf/machine: k3: cleanup wic files Nishanth Menon
2021-03-31 16:51 ` [dunfell/master][PATCH 1/7] conf/machine: k3: Add multi-certificate boot image support Nishanth Menon
2021-03-31 22:19 ` Denys Dmytriyenko
2021-03-31 16:51 ` [dunfell/master][PATCH 2/7] conf/machine: am65xx: Document boot images as legacy mode Nishanth Menon
2021-03-31 22:23 ` Denys Dmytriyenko
2021-03-31 23:57 ` Nishanth Menon
2021-03-31 16:51 ` [dunfell/master][PATCH 3/7] conf/machine: j7: " Nishanth Menon
2021-03-31 22:24 ` Denys Dmytriyenko
2021-03-31 16:51 ` [dunfell/master][PATCH 4/7] conf/machine: j7200-evm: Switch to multi-certificate boot images Nishanth Menon
2021-03-31 22:30 ` Denys Dmytriyenko
2021-03-31 16:51 ` Nishanth Menon [this message]
2021-03-31 22:33 ` [dunfell/master][PATCH 5/7] conf/machine: am64xx: Consolidate image configuration to SoC include Denys Dmytriyenko
2021-03-31 23:56 ` Nishanth Menon
2021-03-31 16:51 ` [dunfell/master][PATCH 6/7] conf/machine: am64xx: Switch to multi-certificate boot images Nishanth Menon
2021-03-31 22:35 ` Denys Dmytriyenko
[not found] ` <16718E3613B720CC.10817@lists.yoctoproject.org>
2021-03-31 22:35 ` [meta-ti] " Denys Dmytriyenko
2021-03-31 23:55 ` Nishanth Menon
2021-03-31 16:51 ` [dunfell/master][PATCH 7/7] conf/machine: k3: Lets build bmap files by default Nishanth Menon
2021-03-31 22:44 ` Denys Dmytriyenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210331165133.3746-6-nm@ti.com \
--to=nm@ti.com \
--cc=denis@denix.org \
--cc=meta-ti@lists.yoctoproject.org \
--cc=praneeth@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.