On Wed, Mar 31, 2021 at 11:51:31AM -0500, Nishanth Menon wrote: > 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.
I thought the plan was to soon merge am64xx-sk into am64xx-evm. But regardless, having these vars set for the entire SoC family is best. > Signed-off-by: Nishanth Menon <[email protected]> Reviewed-by: Denys Dmytriyenko <[email protected]> > --- > 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 > -- Regards, Denys Dmytriyenko <[email protected]> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13611): https://lists.yoctoproject.org/g/meta-ti/message/13611 Mute This Topic: https://lists.yoctoproject.org/mt/81754761/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
