diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2018-01-05 09:24:22 +0000 |
|---|---|---|
| committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2018-02-23 11:11:43 +0800 |
| commit | b73df328730147d292bd1335f274c508a3074f3e (patch) | |
| tree | 43336d4f71e490ae7b3bcdc8594ad0aae3be92dc | |
| parent | 166be39c8d7924213472c588481c2093069901ca (diff) | |
| download | edk2-b73df328730147d292bd1335f274c508a3074f3e.tar.gz edk2-b73df328730147d292bd1335f274c508a3074f3e.tar.bz2 edk2-b73df328730147d292bd1335f274c508a3074f3e.zip | |
BaseTools/Conf: disable DTC legacy phandle format
By default, the device tree compiler emits phandle properties twice:
once called 'phandle' and again 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>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
(cherry picked from commit 34a4ddda4d61ede41f575510dc5adcf933d3b6f5)
| -rwxr-xr-x | BaseTools/Conf/build_rule.template | 2 | ||||
| -rwxr-xr-x | BaseTools/Conf/tools_def.template | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template index 3e6aa8ff0f..a5e471eb3c 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 482ef263c2..99ad271471 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
|