diff mbox

[RFC,2/3] ARM: use cmd_dtc_cpp for compilation of *.dts-cpp to *.dtb

Message ID 1348599998-2729-3-git-send-email-swarren@wwwdotorg.org (mailing list archive)
State New, archived
Headers show

Commit Message

Stephen Warren Sept. 25, 2012, 7:06 p.m. UTC
From: Stephen Warren <swarren@nvidia.com>

This allows DT source files to use the C pre-processor. A new file
extension is introduced for this purpose, since use of the pre-processor
must be optional; any property or node name that starts with "#" must be
escaped to prevent the pre-processor attempting to interpret it as a
directive. For this reason, skeleton.dtsi-cpp is introduced for *.dts-cpp
to include.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
 arch/arm/boot/Makefile              |    3 +++
 arch/arm/boot/dts/skeleton.dtsi-cpp |   13 +++++++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/boot/dts/skeleton.dtsi-cpp

Comments

Jean-Christophe PLAGNIOL-VILLARD Sept. 27, 2012, 5:47 a.m. UTC | #1
On 13:06 Tue 25 Sep     , Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
> 
> This allows DT source files to use the C pre-processor. A new file
> extension is introduced for this purpose, since use of the pre-processor
> must be optional; any property or node name that starts with "#" must be
> escaped to prevent the pre-processor attempting to interpret it as a
> directive. For this reason, skeleton.dtsi-cpp is introduced for *.dts-cpp
> to include.
> 
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
>  arch/arm/boot/Makefile              |    3 +++
>  arch/arm/boot/dts/skeleton.dtsi-cpp |   13 +++++++++++++
>  2 files changed, 16 insertions(+), 0 deletions(-)
>  create mode 100644 arch/arm/boot/dts/skeleton.dtsi-cpp
> 
> diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
> index 3fdab01..c5d7fca 100644
> --- a/arch/arm/boot/Makefile
> +++ b/arch/arm/boot/Makefile
> @@ -65,6 +65,9 @@ targets += $(dtb-y)
>  $(obj)/%.dtb: $(src)/dts/%.dts FORCE
>  	$(call if_changed_dep,dtc)
>  
> +$(obj)/%.dtb: $(src)/dts/%.dts-cpp FORCE
> +	$(call if_changed_dep,dtc_cpp)
> +
move this to Makefile.build so we wan use it acroos arch

Best Regards,
J.
Stephen Warren Sept. 27, 2012, 3:40 p.m. UTC | #2
On 09/26/2012 11:47 PM, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 13:06 Tue 25 Sep     , Stephen Warren wrote:
>> From: Stephen Warren <swarren@nvidia.com>
>>
>> This allows DT source files to use the C pre-processor. A new file
>> extension is introduced for this purpose, since use of the pre-processor
>> must be optional; any property or node name that starts with "#" must be
>> escaped to prevent the pre-processor attempting to interpret it as a
>> directive. For this reason, skeleton.dtsi-cpp is introduced for *.dts-cpp
>> to include.
>>
>> Signed-off-by: Stephen Warren <swarren@nvidia.com>
>> ---
>>  arch/arm/boot/Makefile              |    3 +++
>>  arch/arm/boot/dts/skeleton.dtsi-cpp |   13 +++++++++++++
>>  2 files changed, 16 insertions(+), 0 deletions(-)
>>  create mode 100644 arch/arm/boot/dts/skeleton.dtsi-cpp
>>
>> diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
>> index 3fdab01..c5d7fca 100644
>> --- a/arch/arm/boot/Makefile
>> +++ b/arch/arm/boot/Makefile
>> @@ -65,6 +65,9 @@ targets += $(dtb-y)
>>  $(obj)/%.dtb: $(src)/dts/%.dts FORCE
>>  	$(call if_changed_dep,dtc)
>>  
>> +$(obj)/%.dtb: $(src)/dts/%.dts-cpp FORCE
>> +	$(call if_changed_dep,dtc_cpp)
>> +
>
> move this to Makefile.build so we wan use it acroos arch

That would be an unrelated cleanup patch; the existing *.dts->*.dtb rule
is not there.
diff mbox

Patch

diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index 3fdab01..c5d7fca 100644
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -65,6 +65,9 @@  targets += $(dtb-y)
 $(obj)/%.dtb: $(src)/dts/%.dts FORCE
 	$(call if_changed_dep,dtc)
 
+$(obj)/%.dtb: $(src)/dts/%.dts-cpp FORCE
+	$(call if_changed_dep,dtc_cpp)
+
 $(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y))
 
 clean-files := *.dtb
diff --git a/arch/arm/boot/dts/skeleton.dtsi-cpp b/arch/arm/boot/dts/skeleton.dtsi-cpp
new file mode 100644
index 0000000..8bf6729
--- /dev/null
+++ b/arch/arm/boot/dts/skeleton.dtsi-cpp
@@ -0,0 +1,13 @@ 
+/*
+ * Skeleton device tree; the bare minimum needed to boot; just include and
+ * add a compatible value.  The bootloader will typically populate the memory
+ * node.
+ */
+
+/ {
+	\#address-cells = <1>;
+	\#size-cells = <1>;
+	chosen { };
+	aliases { };
+	memory { device_type = "memory"; reg = <0 0>; };
+};