From cdbc38d16b48598d59d2b395ed465bc7b0226d82 Mon Sep 17 00:00:00 2001 From: Zhenhua Luo Date: Wed, 12 Aug 2015 22:42:15 +0800 Subject: [PATCH] Replace qoriq-base.inc with qoriq-ppc.inc in qoriq tune files Signed-off-by: Zhenhua Luo Acked-by: Daiane Angolini Signed-off-by: Otavio Salvador --- conf/machine/include/e500mc.inc | 2 +- conf/machine/include/e500v2.inc | 2 +- conf/machine/include/e5500-64b.inc | 3 +-- conf/machine/include/e5500.inc | 2 +- conf/machine/include/e6500-64b.inc | 3 +-- conf/machine/include/e6500.inc | 3 +-- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc index 5871104d..f92ca412 100644 --- a/conf/machine/include/e500mc.inc +++ b/conf/machine/include/e500mc.inc @@ -1,6 +1,6 @@ TARGET_FPU = "hard" require conf/machine/include/tune-ppce500mc.inc -require conf/machine/include/qoriq-base.inc +require conf/machine/include/qoriq-ppc.inc MACHINEOVERRIDES .= ":e500mc" diff --git a/conf/machine/include/e500v2.inc b/conf/machine/include/e500v2.inc index a9372549..12c22a92 100644 --- a/conf/machine/include/e500v2.inc +++ b/conf/machine/include/e500v2.inc @@ -1,4 +1,4 @@ require conf/machine/include/tune-ppce500v2.inc -require conf/machine/include/qoriq-base.inc +require conf/machine/include/qoriq-ppc.inc MACHINEOVERRIDES .= ":e500v2" diff --git a/conf/machine/include/e5500-64b.inc b/conf/machine/include/e5500-64b.inc index d238ca89..481e652c 100644 --- a/conf/machine/include/e5500-64b.inc +++ b/conf/machine/include/e5500-64b.inc @@ -2,11 +2,10 @@ TARGET_FPU = "hard" DEFAULTTUNE ?= "ppc64e5500" require conf/machine/include/tune-ppce5500.inc -require conf/machine/include/qoriq-base.inc +require conf/machine/include/qoriq-ppc.inc MACHINEOVERRIDES .= ":e5500-64b" require conf/multilib.conf MULTILIBS ?= "multilib:lib32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce5500" - diff --git a/conf/machine/include/e5500.inc b/conf/machine/include/e5500.inc index 88f6d06e..0f47c996 100644 --- a/conf/machine/include/e5500.inc +++ b/conf/machine/include/e5500.inc @@ -1,6 +1,6 @@ TARGET_FPU = "hard" require conf/machine/include/tune-ppce5500.inc -require conf/machine/include/qoriq-base.inc +require conf/machine/include/qoriq-ppc.inc MACHINEOVERRIDES .= ":e5500" diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc index 522ee71f..2e5a4839 100644 --- a/conf/machine/include/e6500-64b.inc +++ b/conf/machine/include/e6500-64b.inc @@ -2,11 +2,10 @@ TARGET_FPU = "hard" DEFAULTTUNE ?= "ppc64e6500" require conf/machine/include/tune-ppce6500.inc -require conf/machine/include/qoriq-base.inc +require conf/machine/include/qoriq-ppc.inc MACHINEOVERRIDES .= ":e6500-64b" require conf/multilib.conf MULTILIBS ?= "multilib:lib32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce6500" - diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc index 4121fbef..b79f4aed 100644 --- a/conf/machine/include/e6500.inc +++ b/conf/machine/include/e6500.inc @@ -1,7 +1,7 @@ TARGET_FPU = "hard" require conf/machine/include/tune-ppce6500.inc -require conf/machine/include/qoriq-base.inc +require conf/machine/include/qoriq-ppc.inc MACHINEOVERRIDES .= ":e6500" @@ -10,4 +10,3 @@ BUILD_64BIT_KERNEL = "1" require conf/multilib.conf MULTILIBS ?= "multilib:lib64" DEFAULTTUNE_virtclass-multilib-lib64 ?= "ppc64e6500" - -- 2.40.1