[PATCH] dtc: change default phandles to ePAPR style instead of both

[PATCH] dtc: change default phandles to ePAPR style instead of both

[Rob Herring]

Currently, both legacy (linux,phandle) and ePAPR (phandle) properties
are inserted into dtbs by default. The newer ePAPR style has been
supported in dtc and Linux kernel for 7 years. That should be a long
enough transition period. We can save a little space by not putting both
into the dtb.

Signed-off-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
---
 dtc.c              | 2 +-
 tests/run_tests.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dtc.c b/dtc.c
index f5eed9d72c02..5ed873c72ad1 100644
--- a/dtc.c
+++ b/dtc.c
@@ -31,7 +31,7 @@ int reservenum;		/* Number of memory reservation slots */
 int minsize;		/* Minimum blob size */
 int padsize;		/* Additional padding to blob */
 int alignsize;		/* Additional padding to blob accroding to the alignsize */
-int phandle_format = PHANDLE_BOTH;	/* Use linux,phandle or phandle properties */
+int phandle_format = PHANDLE_EPAPR;	/* Use linux,phandle or phandle properties */
 int generate_symbols;	/* enable symbols & fixup support */
 int generate_fixups;		/* suppress generation of fixups on symbol support */
 int auto_label_aliases;		/* auto generate labels -> aliases */
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 5df148048758..ccd301738726 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -420,7 +420,7 @@ dtc_tests () {
     run_dtc_test -I dts -O dtb -o dtc_path-references.test.dtb path-references.dts
     run_test path-references dtc_path-references.test.dtb
 
-    run_test phandle_format dtc_references.test.dtb both
+    run_test phandle_format dtc_references.test.dtb epapr
     for f in legacy epapr both; do
 	run_dtc_test -I dts -O dtb -H $f -o dtc_references.test.$f.dtb references.dts
 	run_test phandle_format dtc_references.test.$f.dtb $f
-- 
2.11.0

Re: [PATCH] dtc: change default phandles to ePAPR style instead of both

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 2189 bytes --]

On Wed, Jul 12, 2017 at 05:20:30PM -0500, Rob Herring wrote:
> Currently, both legacy (linux,phandle) and ePAPR (phandle) properties
> are inserted into dtbs by default. The newer ePAPR style has been
> supported in dtc and Linux kernel for 7 years. That should be a long
> enough transition period. We can save a little space by not putting both
> into the dtb.
> 
> Signed-off-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>

Seems reasonable, applied.

> ---
>  dtc.c              | 2 +-
>  tests/run_tests.sh | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/dtc.c b/dtc.c
> index f5eed9d72c02..5ed873c72ad1 100644
> --- a/dtc.c
> +++ b/dtc.c
> @@ -31,7 +31,7 @@ int reservenum;		/* Number of memory reservation slots */
>  int minsize;		/* Minimum blob size */
>  int padsize;		/* Additional padding to blob */
>  int alignsize;		/* Additional padding to blob accroding to the alignsize */
> -int phandle_format = PHANDLE_BOTH;	/* Use linux,phandle or phandle properties */
> +int phandle_format = PHANDLE_EPAPR;	/* Use linux,phandle or phandle properties */
>  int generate_symbols;	/* enable symbols & fixup support */
>  int generate_fixups;		/* suppress generation of fixups on symbol support */
>  int auto_label_aliases;		/* auto generate labels -> aliases */
> diff --git a/tests/run_tests.sh b/tests/run_tests.sh
> index 5df148048758..ccd301738726 100755
> --- a/tests/run_tests.sh
> +++ b/tests/run_tests.sh
> @@ -420,7 +420,7 @@ dtc_tests () {
>      run_dtc_test -I dts -O dtb -o dtc_path-references.test.dtb path-references.dts
>      run_test path-references dtc_path-references.test.dtb
>  
> -    run_test phandle_format dtc_references.test.dtb both
> +    run_test phandle_format dtc_references.test.dtb epapr
>      for f in legacy epapr both; do
>  	run_dtc_test -I dts -O dtb -H $f -o dtc_references.test.$f.dtb references.dts
>  	run_test phandle_format dtc_references.test.$f.dtb $f

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]