summaryrefslogtreecommitdiffstats
path: root/conf/machine
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
commitf90a4147d6d9c0666fe7772827efd4b3d9a9a31c (patch)
tree9b5b865766d4e908a27fd68f36c58ea4e56da2aa /conf/machine
parentb67e1a2d0e0cbb6f5efdb260fe7d052222819213 (diff)
downloadmeta-fsl-arm-f90a4147d6d9c0666fe7772827efd4b3d9a9a31c.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>
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/include/qoriq-arm.inc (renamed from conf/machine/include/ls-base.inc)0
-rw-r--r--conf/machine/ls1021atwr.conf2
2 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/include/ls-base.inc b/conf/machine/include/qoriq-arm.inc
index 20a7594..20a7594 100644
--- a/conf/machine/include/ls-base.inc
+++ b/conf/machine/include/qoriq-arm.inc
diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf
index 916fb4b..4478e95 100644
--- a/conf/machine/ls1021atwr.conf
+++ b/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"