From: Ting Liu <ting.liu@freescale.com>
Date: Fri, 10 Jul 2015 09:45:19 +0000 (+0800)
Subject: rename ls-base.inc -> qoriq-arm.inc
X-Git-Tag: 2.1~536
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=eac3a1c56631d675dfe9a3d19276c705ecb67a3c;p=meta-freescale.git

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>
---

diff --git a/meta-fsl-arm/conf/machine/include/ls-base.inc b/meta-fsl-arm/conf/machine/include/qoriq-arm.inc
similarity index 100%
rename from meta-fsl-arm/conf/machine/include/ls-base.inc
rename to 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 @@
 #@DESCRIPTION: Machine configuration for running LS1021ATWR in 32-bit mode
 #@MAINTAINER: Zhenhua Luo <zhenhua.luo@freescale.com>
 
-require conf/machine/include/ls-base.inc
+require conf/machine/include/qoriq-arm.inc
 require conf/machine/include/tune-cortexa7.inc
 
 SOC_FAMILY = "ls102xa"