summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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"