From 369ca1c4b2ca9ab6460f0d5551b247b153f444b3 Mon Sep 17 00:00:00 2001 From: Jun Zhu Date: Mon, 25 Apr 2022 11:35:11 +0800 Subject: ls1028ardb/ls1088ardb/ls1088ardb-pb: Correct MACHINEOVERRIDES Current setting cannot set the right overrider order as expected. For example: MACHINEOVERRIDES="fsl-lsch3:ls1088a:aarch64:use-nxp-bsp:qoriq:qoriq-arm64:ls1088ardb-pb" Update them to align with other Layerscape machines. Signed-off-by: Jun Zhu --- conf/machine/ls1028ardb.conf | 4 ++-- conf/machine/ls1088ardb-pb.conf | 4 ++-- conf/machine/ls1088ardb.conf | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/machine/ls1028ardb.conf b/conf/machine/ls1028ardb.conf index d70a5a61..268a60c3 100644 --- a/conf/machine/ls1028ardb.conf +++ b/conf/machine/ls1028ardb.conf @@ -4,13 +4,13 @@ #@DESCRIPTION: Machine configuration for running LS1028ARDB in 64-bit mode #@MAINTAINER: Chunrong.Guo +MACHINEOVERRIDES =. "fsl-lsch3:ls1028a:" + require conf/machine/include/qoriq-arm64.inc require conf/machine/include/arm/arch-arm64.inc MACHINE_FEATURES += "optee" -MACHINEOVERRIDES =. "fsl-lsch3:ls1028a:" - KERNEL_CLASSES = " kernel-fitimage " KERNEL_IMAGETYPES = "fitImage" diff --git a/conf/machine/ls1088ardb-pb.conf b/conf/machine/ls1088ardb-pb.conf index ecfe70ae..f9d05b69 100644 --- a/conf/machine/ls1088ardb-pb.conf +++ b/conf/machine/ls1088ardb-pb.conf @@ -4,11 +4,11 @@ #@DESCRIPTION: Machine configuration for running LS1088ARDB in 64-bit mode #@MAINTAINER: Chunrong Guo +MACHINEOVERRIDES =. "fsl-lsch3:ls1088a:" + require conf/machine/include/qoriq-arm64.inc require conf/machine/include/arm/arch-arm64.inc -MACHINEOVERRIDES =. "fsl-lsch3:ls1088a:" - MACHINE_FEATURES += "optee" KERNEL_CLASSES = " kernel-fitimage " diff --git a/conf/machine/ls1088ardb.conf b/conf/machine/ls1088ardb.conf index e433b7fc..1b7a4f3c 100644 --- a/conf/machine/ls1088ardb.conf +++ b/conf/machine/ls1088ardb.conf @@ -4,11 +4,11 @@ #@DESCRIPTION: Machine configuration for running LS1088ARDB in 64-bit mode #@MAINTAINER: Zongchun Yu +MACHINEOVERRIDES =. "fsl-lsch3:ls1088a:" + require conf/machine/include/qoriq-arm64.inc require conf/machine/include/arm/arch-arm64.inc -MACHINEOVERRIDES =. "fsl-lsch3:ls1088a:" - MACHINE_FEATURES += "optee" KERNEL_CLASSES = " kernel-fitimage " -- cgit v1.2.3-54-g00ecf