diff mbox series

[edk2,v2] BaseTools/Conf: disable DTC legacy phandle format

Message ID 20180201111513.13572-1-ard.biesheuvel@linaro.org
State Accepted
Commit 34a4ddda4d61ede41f575510dc5adcf933d3b6f5
Headers show
Series [edk2,v2] BaseTools/Conf: disable DTC legacy phandle format | expand

Commit Message

Ard Biesheuvel Feb. 1, 2018, 11:15 a.m. UTC 
By default, the device tree compiler emits phandle properties twice:
one called 'phandle' and another called 'linux,phandle'. Given that
Linux was updated in early 2010 [0] to accept the former (which is
what is specified in the ePAPR and device tree specifications), there
is no point in emitting both when compiling device trees for UEFI
platforms.

[0] 04b954a673dd02f585a2769c4945a43880faa989
"of/flattree: Make the kernel accept ePAPR style phandle information"

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---
 BaseTools/Conf/build_rule.template | 2 +-
 BaseTools/Conf/tools_def.template  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

-- 
2.11.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Laszlo Ersek Feb. 1, 2018, 3:53 p.m. UTC | #1 
On 02/01/18 12:15, Ard Biesheuvel wrote:
> By default, the device tree compiler emits phandle properties twice:

> one called 'phandle' and another called 'linux,phandle'. Given that

> Linux was updated in early 2010 [0] to accept the former (which is

> what is specified in the ePAPR and device tree specifications), there

> is no point in emitting both when compiling device trees for UEFI

> platforms.

> 

> [0] 04b954a673dd02f585a2769c4945a43880faa989

> "of/flattree: Make the kernel accept ePAPR style phandle information"

> 

> Contributed-under: TianoCore Contribution Agreement 1.1

> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---

>  BaseTools/Conf/build_rule.template | 2 +-

>  BaseTools/Conf/tools_def.template  | 1 +

>  2 files changed, 2 insertions(+), 1 deletion(-)

> 

> diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template

> index 3e6aa8ff0f34..a5e471eb3c10 100755

> --- a/BaseTools/Conf/build_rule.template

> +++ b/BaseTools/Conf/build_rule.template

> @@ -250,7 +250,7 @@

>  

>      <Command.GCC>

>          "$(PP)" $(DTCPP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i

> -        "$(DTC)" -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i

> +        "$(DTC)" $(DTC_FLAGS) -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i

>  

>  [Visual-Form-Representation-File]

>      <InputFile>

> diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template

> index 482ef263c274..99ad271471d9 100755

> --- a/BaseTools/Conf/tools_def.template

> +++ b/BaseTools/Conf/tools_def.template

> @@ -4467,6 +4467,7 @@ NOOPT_DDK3790xASL_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF

>  DEBUG_*_*_OBJCOPY_ADDDEBUGFLAG     = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_NAME).debug

>  RELEASE_*_*_OBJCOPY_ADDDEBUGFLAG   =

>  NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG     = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_NAME).debug

> +*_*_*_DTC_FLAGS                    = -H epapr

>  

>  DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-common

>  DEFINE GCC_IA32_CC_FLAGS           = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe

> 


Reviewed-by: Laszlo Ersek <lersek@redhat.com>

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Ard Biesheuvel Feb. 5, 2018, 1:58 p.m. UTC | #2 
On 1 February 2018 at 16:53, Laszlo Ersek <lersek@redhat.com> wrote:
> On 02/01/18 12:15, Ard Biesheuvel wrote:

>> By default, the device tree compiler emits phandle properties twice:

>> one called 'phandle' and another called 'linux,phandle'. Given that

>> Linux was updated in early 2010 [0] to accept the former (which is

>> what is specified in the ePAPR and device tree specifications), there

>> is no point in emitting both when compiling device trees for UEFI

>> platforms.

>>

>> [0] 04b954a673dd02f585a2769c4945a43880faa989

>> "of/flattree: Make the kernel accept ePAPR style phandle information"

>>

>> Contributed-under: TianoCore Contribution Agreement 1.1

>> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

>> ---

>>  BaseTools/Conf/build_rule.template | 2 +-

>>  BaseTools/Conf/tools_def.template  | 1 +

>>  2 files changed, 2 insertions(+), 1 deletion(-)

>>

>> diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template

>> index 3e6aa8ff0f34..a5e471eb3c10 100755

>> --- a/BaseTools/Conf/build_rule.template

>> +++ b/BaseTools/Conf/build_rule.template

>> @@ -250,7 +250,7 @@

>>

>>      <Command.GCC>

>>          "$(PP)" $(DTCPP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i

>> -        "$(DTC)" -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i

>> +        "$(DTC)" $(DTC_FLAGS) -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i

>>

>>  [Visual-Form-Representation-File]

>>      <InputFile>

>> diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template

>> index 482ef263c274..99ad271471d9 100755

>> --- a/BaseTools/Conf/tools_def.template

>> +++ b/BaseTools/Conf/tools_def.template

>> @@ -4467,6 +4467,7 @@ NOOPT_DDK3790xASL_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF

>>  DEBUG_*_*_OBJCOPY_ADDDEBUGFLAG     = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_NAME).debug

>>  RELEASE_*_*_OBJCOPY_ADDDEBUGFLAG   =

>>  NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG     = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_NAME).debug

>> +*_*_*_DTC_FLAGS                    = -H epapr

>>

>>  DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-common

>>  DEFINE GCC_IA32_CC_FLAGS           = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe

>>

>

> Reviewed-by: Laszlo Ersek <lersek@redhat.com>


Thank you.

Liming, any comments?
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Gao, Liming Feb. 6, 2018, 3:05 a.m. UTC | #3 
Reviewed-by: Liming Gao <liming.gao@intel.com>


>-----Original Message-----

>From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]

>Sent: Monday, February 05, 2018 9:59 PM

>To: Laszlo Ersek <lersek@redhat.com>

>Cc: edk2-devel@lists.01.org; Gao, Liming <liming.gao@intel.com>; Zhu,

>Yonghong <yonghong.zhu@intel.com>

>Subject: Re: [PATCH v2] BaseTools/Conf: disable DTC legacy phandle format

>

>On 1 February 2018 at 16:53, Laszlo Ersek <lersek@redhat.com> wrote:

>> On 02/01/18 12:15, Ard Biesheuvel wrote:

>>> By default, the device tree compiler emits phandle properties twice:

>>> one called 'phandle' and another called 'linux,phandle'. Given that

>>> Linux was updated in early 2010 [0] to accept the former (which is

>>> what is specified in the ePAPR and device tree specifications), there

>>> is no point in emitting both when compiling device trees for UEFI

>>> platforms.

>>>

>>> [0] 04b954a673dd02f585a2769c4945a43880faa989

>>> "of/flattree: Make the kernel accept ePAPR style phandle information"

>>>

>>> Contributed-under: TianoCore Contribution Agreement 1.1

>>> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

>>> ---

>>>  BaseTools/Conf/build_rule.template | 2 +-

>>>  BaseTools/Conf/tools_def.template  | 1 +

>>>  2 files changed, 2 insertions(+), 1 deletion(-)

>>>

>>> diff --git a/BaseTools/Conf/build_rule.template

>b/BaseTools/Conf/build_rule.template

>>> index 3e6aa8ff0f34..a5e471eb3c10 100755

>>> --- a/BaseTools/Conf/build_rule.template

>>> +++ b/BaseTools/Conf/build_rule.template

>>> @@ -250,7 +250,7 @@

>>>

>>>      <Command.GCC>

>>>          "$(PP)" $(DTCPP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i

>>> -        "$(DTC)" -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i

>>> +        "$(DTC)" $(DTC_FLAGS) -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i

>>>

>>>  [Visual-Form-Representation-File]

>>>      <InputFile>

>>> diff --git a/BaseTools/Conf/tools_def.template

>b/BaseTools/Conf/tools_def.template

>>> index 482ef263c274..99ad271471d9 100755

>>> --- a/BaseTools/Conf/tools_def.template

>>> +++ b/BaseTools/Conf/tools_def.template

>>> @@ -4467,6 +4467,7 @@ NOOPT_DDK3790xASL_IPF_DLINK_FLAGS    =

>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF

>>>  DEBUG_*_*_OBJCOPY_ADDDEBUGFLAG     = --add-gnu-

>debuglink=$(DEBUG_DIR)/$(MODULE_NAME).debug

>>>  RELEASE_*_*_OBJCOPY_ADDDEBUGFLAG   =

>>>  NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG     = --add-gnu-

>debuglink=$(DEBUG_DIR)/$(MODULE_NAME).debug

>>> +*_*_*_DTC_FLAGS                    = -H epapr

>>>

>>>  DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-builtin -fno-

>strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-

>common

>>>  DEFINE GCC_IA32_CC_FLAGS           = DEF(GCC_ALL_CC_FLAGS) -m32 -

>malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-

>stack-arg-probe

>>>

>>

>> Reviewed-by: Laszlo Ersek <lersek@redhat.com>

>

>Thank you.

>

>Liming, any comments?

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Ard Biesheuvel Feb. 6, 2018, 9:59 a.m. UTC | #4 
On 6 February 2018 at 03:05, Gao, Liming <liming.gao@intel.com> wrote:
> Reviewed-by: Liming Gao <liming.gao@intel.com>

>


Thanks. Pushed as 34a4ddda4d61ede41f575510dc5adcf933d3b6f5


>>-----Original Message-----

>>From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]

>>Sent: Monday, February 05, 2018 9:59 PM

>>To: Laszlo Ersek <lersek@redhat.com>

>>Cc: edk2-devel@lists.01.org; Gao, Liming <liming.gao@intel.com>; Zhu,

>>Yonghong <yonghong.zhu@intel.com>

>>Subject: Re: [PATCH v2] BaseTools/Conf: disable DTC legacy phandle format

>>

>>On 1 February 2018 at 16:53, Laszlo Ersek <lersek@redhat.com> wrote:

>>> On 02/01/18 12:15, Ard Biesheuvel wrote:

>>>> By default, the device tree compiler emits phandle properties twice:

>>>> one called 'phandle' and another called 'linux,phandle'. Given that

>>>> Linux was updated in early 2010 [0] to accept the former (which is

>>>> what is specified in the ePAPR and device tree specifications), there

>>>> is no point in emitting both when compiling device trees for UEFI

>>>> platforms.

>>>>

>>>> [0] 04b954a673dd02f585a2769c4945a43880faa989

>>>> "of/flattree: Make the kernel accept ePAPR style phandle information"

>>>>

>>>> Contributed-under: TianoCore Contribution Agreement 1.1

>>>> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

>>>> ---

>>>>  BaseTools/Conf/build_rule.template | 2 +-

>>>>  BaseTools/Conf/tools_def.template  | 1 +

>>>>  2 files changed, 2 insertions(+), 1 deletion(-)

>>>>

>>>> diff --git a/BaseTools/Conf/build_rule.template

>>b/BaseTools/Conf/build_rule.template

>>>> index 3e6aa8ff0f34..a5e471eb3c10 100755

>>>> --- a/BaseTools/Conf/build_rule.template

>>>> +++ b/BaseTools/Conf/build_rule.template

>>>> @@ -250,7 +250,7 @@

>>>>

>>>>      <Command.GCC>

>>>>          "$(PP)" $(DTCPP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i

>>>> -        "$(DTC)" -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i

>>>> +        "$(DTC)" $(DTC_FLAGS) -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i

>>>>

>>>>  [Visual-Form-Representation-File]

>>>>      <InputFile>

>>>> diff --git a/BaseTools/Conf/tools_def.template

>>b/BaseTools/Conf/tools_def.template

>>>> index 482ef263c274..99ad271471d9 100755

>>>> --- a/BaseTools/Conf/tools_def.template

>>>> +++ b/BaseTools/Conf/tools_def.template

>>>> @@ -4467,6 +4467,7 @@ NOOPT_DDK3790xASL_IPF_DLINK_FLAGS    =

>>/NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF

>>>>  DEBUG_*_*_OBJCOPY_ADDDEBUGFLAG     = --add-gnu-

>>debuglink=$(DEBUG_DIR)/$(MODULE_NAME).debug

>>>>  RELEASE_*_*_OBJCOPY_ADDDEBUGFLAG   =

>>>>  NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG     = --add-gnu-

>>debuglink=$(DEBUG_DIR)/$(MODULE_NAME).debug

>>>> +*_*_*_DTC_FLAGS                    = -H epapr

>>>>

>>>>  DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-builtin -fno-

>>strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-

>>common

>>>>  DEFINE GCC_IA32_CC_FLAGS           = DEF(GCC_ALL_CC_FLAGS) -m32 -

>>malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-

>>stack-arg-probe

>>>>

>>>

>>> Reviewed-by: Laszlo Ersek <lersek@redhat.com>

>>

>>Thank you.

>>

>>Liming, any comments?

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
diff mbox series

Patch

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 3e6aa8ff0f34..a5e471eb3c10 100755
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -250,7 +250,7 @@ 
 
     <Command.GCC>
         "$(PP)" $(DTCPP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
-        "$(DTC)" -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i
+        "$(DTC)" $(DTC_FLAGS) -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i
 
 [Visual-Form-Representation-File]
     <InputFile>
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 482ef263c274..99ad271471d9 100755
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -4467,6 +4467,7 @@  NOOPT_DDK3790xASL_IPF_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /LTCG /DLL /OPT:REF
 DEBUG_*_*_OBJCOPY_ADDDEBUGFLAG     = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_NAME).debug
 RELEASE_*_*_OBJCOPY_ADDDEBUGFLAG   =
 NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG     = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_NAME).debug
+*_*_*_DTC_FLAGS                    = -H epapr
 
 DEFINE GCC_ALL_CC_FLAGS            = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-common
 DEFINE GCC_IA32_CC_FLAGS           = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe