summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTing Liu <ting.liu@freescale.com>2015-07-10 17:45:19 +0800
committerOtavio Salvador <otavio@ossystems.com.br>2015-07-13 14:00:59 -0300
commiteac3a1c56631d675dfe9a3d19276c705ecb67a3c (patch)
tree7cc4ad6e702fe9592dce3314c01fc466dd0ef4b4
parent7b90d509b6485b4a2236fb29e46dc9a21761c5a0 (diff)
downloadmeta-freescale-eac3a1c56631d675dfe9a3d19276c705ecb67a3c.tar.gz
rename ls-base.inc -> qoriq-arm.inc
Preparation for next merge stage with qoriq-ppc. Signed-off-by: Ting Liu <ting.liu@freescale.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--meta-fsl-arm/conf/machine/include/qoriq-arm.inc (renamed from meta-fsl-arm/conf/machine/include/ls-base.inc)0
-rw-r--r--meta-fsl-arm/conf/machine/ls1021atwr.conf2
2 files changed, 1 insertions, 1 deletions
diff --git a/meta-fsl-arm/conf/machine/include/ls-base.inc b/meta-fsl-arm/conf/machine/include/qoriq-arm.inc
index 20a75945..20a75945 100644
--- a/meta-fsl-arm/conf/machine/include/ls-base.inc
+++ b/meta-fsl-arm/conf/machine/include/qoriq-arm.inc
diff --git a/meta-fsl-arm/conf/machine/ls1021atwr.conf b/meta-fsl-arm/conf/machine/ls1021atwr.conf
index 916fb4bb..4478e953 100644
--- a/meta-fsl-arm/conf/machine/ls1021atwr.conf
+++ b/meta-fsl-arm/conf/machine/ls1021atwr.conf
@@ -4,7 +4,7 @@
4#@DESCRIPTION: Machine configuration for running LS1021ATWR in 32-bit mode 4#@DESCRIPTION: Machine configuration for running LS1021ATWR in 32-bit mode
5#@MAINTAINER: Zhenhua Luo <zhenhua.luo@freescale.com> 5#@MAINTAINER: Zhenhua Luo <zhenhua.luo@freescale.com>
6 6
7require conf/machine/include/ls-base.inc 7require conf/machine/include/qoriq-arm.inc
8require conf/machine/include/tune-cortexa7.inc 8require conf/machine/include/tune-cortexa7.inc
9 9
10SOC_FAMILY = "ls102xa" 10SOC_FAMILY = "ls102xa"