From e71ffa3603437350bf5aeeae37c5b4ad711d6498 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Wed, 21 Aug 2013 07:49:49 -0700 Subject: [PATCH] tune-*: don't die if the ccargs are expanded early Signed-off-by: Christopher Larson --- conf/machine/include/tune-ppce500mc.inc | 2 +- conf/machine/include/tune-ppce500v2.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/machine/include/tune-ppce500mc.inc b/conf/machine/include/tune-ppce500mc.inc index 94668e3..de5a43b 100644 --- a/conf/machine/include/tune-ppce500mc.inc +++ b/conf/machine/include/tune-ppce500mc.inc @@ -4,7 +4,7 @@ require conf/machine/include/powerpc/arch-powerpc.inc TUNEVALID[ppce500mc] = "Enable ppce500mc specific processor optimizations" -PPCE500MC_CCARG = "${@'-te500mc' if CSL_IS_PRO == '1' else '-mcpu=e500mc'}" +PPCE500MC_CCARG = "${@'-te500mc' if d.getVar('CSL_IS_PRO', True) == '1' else '-mcpu=e500mc'}" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", PPCE500MC_CCARG, "", d)}" AVAILTUNES += "ppce500mc" diff --git a/conf/machine/include/tune-ppce500v2.inc b/conf/machine/include/tune-ppce500v2.inc index f386c97..ed50df6 100644 --- a/conf/machine/include/tune-ppce500v2.inc +++ b/conf/machine/include/tune-ppce500v2.inc @@ -4,7 +4,7 @@ require conf/machine/include/powerpc/arch-powerpc.inc TUNEVALID[ppce500v2] = "Enable ppce500v2 specific processor optimizations" -PPCE500V2_CCARG = "${@'-te500v2' if CSL_IS_PRO == '1' else '-mcpu=8548 -mabi=spe -mspe -mfloat-gprs=double'}" +PPCE500V2_CCARG = "${@'-te500v2' if d.getVar('CSL_IS_PRO', True) == '1' else '-mcpu=8548 -mabi=spe -mspe -mfloat-gprs=double'}" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500v2", PPCE500V2_CCARG, "", d)}" # Note that SPE is implied by the ppce500v2 feature