| Message ID | 20200706154015.29257-1-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 8f208c28e1017cac20e0b2043231f5099b5f29c9 |
| Headers | show |
| Series | arm64: dts: renesas: Restructure Makefile | expand |
Hi Geert, Thanks for your work. On 2020-07-06 17:40:15 +0200, Geert Uytterhoeven wrote: > Make the Makefile for building Renesas DTB files easier to read and > maintain: > - Get rid of line continuations, > - Use a single entry per line, > - Sort SoCs and boards alphabetically, > - Separate SoCs by blank lines. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> > --- > To be queued in renesas-devel for v5.9. > > arch/arm64/boot/dts/renesas/Makefile | 69 ++++++++++++++++++---------- > 1 file changed, 45 insertions(+), 24 deletions(-) > > diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile > index 21cc6346908226ad..5f00f90a89bd6a6a 100644 > --- a/arch/arm64/boot/dts/renesas/Makefile > +++ b/arch/arm64/boot/dts/renesas/Makefile > @@ -1,30 +1,51 @@ > # SPDX-License-Identifier: GPL-2.0 > -dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m.dtb \ > - r8a774a1-hihope-rzg2m-rev2.dtb > -dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-ex.dtb \ > - r8a774a1-hihope-rzg2m-rev2-ex.dtb > -dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-ex-idk-1110wr.dtb \ > - r8a774a1-hihope-rzg2m-rev2-ex-idk-1110wr.dtb > -dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n.dtb \ > - r8a774b1-hihope-rzg2n-rev2.dtb > -dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n-ex.dtb \ > - r8a774b1-hihope-rzg2n-rev2-ex.dtb > -dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n-ex-idk-1110wr.dtb \ > - r8a774b1-hihope-rzg2n-rev2-ex-idk-1110wr.dtb > -dtb-$(CONFIG_ARCH_R8A774C0) += r8a774c0-cat874.dtb r8a774c0-ek874.dtb \ > - r8a774c0-ek874-idk-2121wr.dtb \ > - r8a774c0-ek874-mipi-2.1.dtb > +dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m.dtb > +dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-ex.dtb > +dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-ex-idk-1110wr.dtb > +dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-rev2.dtb > +dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-rev2-ex.dtb > +dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-rev2-ex-idk-1110wr.dtb > + > +dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n.dtb > +dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n-ex.dtb > +dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n-ex-idk-1110wr.dtb > +dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n-rev2.dtb > +dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n-rev2-ex.dtb > +dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n-rev2-ex-idk-1110wr.dtb > + > +dtb-$(CONFIG_ARCH_R8A774C0) += r8a774c0-cat874.dtb > +dtb-$(CONFIG_ARCH_R8A774C0) += r8a774c0-ek874.dtb > +dtb-$(CONFIG_ARCH_R8A774C0) += r8a774c0-ek874-idk-2121wr.dtb > +dtb-$(CONFIG_ARCH_R8A774C0) += r8a774c0-ek874-mipi-2.1.dtb > + > dtb-$(CONFIG_ARCH_R8A77950) += r8a77950-salvator-x.dtb > -dtb-$(CONFIG_ARCH_R8A77950) += r8a77950-ulcb.dtb r8a77950-ulcb-kf.dtb > -dtb-$(CONFIG_ARCH_R8A77951) += r8a77951-salvator-x.dtb r8a77951-salvator-xs.dtb > -dtb-$(CONFIG_ARCH_R8A77951) += r8a77951-ulcb.dtb r8a77951-ulcb-kf.dtb > -dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-salvator-x.dtb r8a77960-salvator-xs.dtb > -dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-ulcb.dtb r8a77960-ulcb-kf.dtb > +dtb-$(CONFIG_ARCH_R8A77950) += r8a77950-ulcb.dtb > +dtb-$(CONFIG_ARCH_R8A77950) += r8a77950-ulcb-kf.dtb > + > +dtb-$(CONFIG_ARCH_R8A77951) += r8a77951-salvator-x.dtb > +dtb-$(CONFIG_ARCH_R8A77951) += r8a77951-salvator-xs.dtb > +dtb-$(CONFIG_ARCH_R8A77951) += r8a77951-ulcb.dtb > +dtb-$(CONFIG_ARCH_R8A77951) += r8a77951-ulcb-kf.dtb > + > +dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-salvator-x.dtb > +dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-salvator-xs.dtb > +dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-ulcb.dtb > +dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-ulcb-kf.dtb > + > dtb-$(CONFIG_ARCH_R8A77961) += r8a77961-salvator-xs.dtb > dtb-$(CONFIG_ARCH_R8A77961) += r8a77961-ulcb.dtb > -dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-salvator-x.dtb r8a77965-salvator-xs.dtb > -dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-ulcb.dtb r8a77965-ulcb-kf.dtb > -dtb-$(CONFIG_ARCH_R8A77970) += r8a77970-eagle.dtb r8a77970-v3msk.dtb > -dtb-$(CONFIG_ARCH_R8A77980) += r8a77980-condor.dtb r8a77980-v3hsk.dtb > + > +dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-salvator-x.dtb > +dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-salvator-xs.dtb > +dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-ulcb.dtb > +dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-ulcb-kf.dtb > + > +dtb-$(CONFIG_ARCH_R8A77970) += r8a77970-eagle.dtb > +dtb-$(CONFIG_ARCH_R8A77970) += r8a77970-v3msk.dtb > + > +dtb-$(CONFIG_ARCH_R8A77980) += r8a77980-condor.dtb > +dtb-$(CONFIG_ARCH_R8A77980) += r8a77980-v3hsk.dtb > + > dtb-$(CONFIG_ARCH_R8A77990) += r8a77990-ebisu.dtb > + > dtb-$(CONFIG_ARCH_R8A77995) += r8a77995-draak.dtb > -- > 2.17.1 >
diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile index 21cc6346908226ad..5f00f90a89bd6a6a 100644 --- a/arch/arm64/boot/dts/renesas/Makefile +++ b/arch/arm64/boot/dts/renesas/Makefile @@ -1,30 +1,51 @@ # SPDX-License-Identifier: GPL-2.0 -dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m.dtb \ - r8a774a1-hihope-rzg2m-rev2.dtb -dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-ex.dtb \ - r8a774a1-hihope-rzg2m-rev2-ex.dtb -dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-ex-idk-1110wr.dtb \ - r8a774a1-hihope-rzg2m-rev2-ex-idk-1110wr.dtb -dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n.dtb \ - r8a774b1-hihope-rzg2n-rev2.dtb -dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n-ex.dtb \ - r8a774b1-hihope-rzg2n-rev2-ex.dtb -dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n-ex-idk-1110wr.dtb \ - r8a774b1-hihope-rzg2n-rev2-ex-idk-1110wr.dtb -dtb-$(CONFIG_ARCH_R8A774C0) += r8a774c0-cat874.dtb r8a774c0-ek874.dtb \ - r8a774c0-ek874-idk-2121wr.dtb \ - r8a774c0-ek874-mipi-2.1.dtb +dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m.dtb +dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-ex.dtb +dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-ex-idk-1110wr.dtb +dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-rev2.dtb +dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-rev2-ex.dtb +dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-rev2-ex-idk-1110wr.dtb + +dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n.dtb +dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n-ex.dtb +dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n-ex-idk-1110wr.dtb +dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n-rev2.dtb +dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n-rev2-ex.dtb +dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n-rev2-ex-idk-1110wr.dtb + +dtb-$(CONFIG_ARCH_R8A774C0) += r8a774c0-cat874.dtb +dtb-$(CONFIG_ARCH_R8A774C0) += r8a774c0-ek874.dtb +dtb-$(CONFIG_ARCH_R8A774C0) += r8a774c0-ek874-idk-2121wr.dtb +dtb-$(CONFIG_ARCH_R8A774C0) += r8a774c0-ek874-mipi-2.1.dtb + dtb-$(CONFIG_ARCH_R8A77950) += r8a77950-salvator-x.dtb -dtb-$(CONFIG_ARCH_R8A77950) += r8a77950-ulcb.dtb r8a77950-ulcb-kf.dtb -dtb-$(CONFIG_ARCH_R8A77951) += r8a77951-salvator-x.dtb r8a77951-salvator-xs.dtb -dtb-$(CONFIG_ARCH_R8A77951) += r8a77951-ulcb.dtb r8a77951-ulcb-kf.dtb -dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-salvator-x.dtb r8a77960-salvator-xs.dtb -dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-ulcb.dtb r8a77960-ulcb-kf.dtb +dtb-$(CONFIG_ARCH_R8A77950) += r8a77950-ulcb.dtb +dtb-$(CONFIG_ARCH_R8A77950) += r8a77950-ulcb-kf.dtb + +dtb-$(CONFIG_ARCH_R8A77951) += r8a77951-salvator-x.dtb +dtb-$(CONFIG_ARCH_R8A77951) += r8a77951-salvator-xs.dtb +dtb-$(CONFIG_ARCH_R8A77951) += r8a77951-ulcb.dtb +dtb-$(CONFIG_ARCH_R8A77951) += r8a77951-ulcb-kf.dtb + +dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-salvator-x.dtb +dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-salvator-xs.dtb +dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-ulcb.dtb +dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-ulcb-kf.dtb + dtb-$(CONFIG_ARCH_R8A77961) += r8a77961-salvator-xs.dtb dtb-$(CONFIG_ARCH_R8A77961) += r8a77961-ulcb.dtb -dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-salvator-x.dtb r8a77965-salvator-xs.dtb -dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-ulcb.dtb r8a77965-ulcb-kf.dtb -dtb-$(CONFIG_ARCH_R8A77970) += r8a77970-eagle.dtb r8a77970-v3msk.dtb -dtb-$(CONFIG_ARCH_R8A77980) += r8a77980-condor.dtb r8a77980-v3hsk.dtb + +dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-salvator-x.dtb +dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-salvator-xs.dtb +dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-ulcb.dtb +dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-ulcb-kf.dtb + +dtb-$(CONFIG_ARCH_R8A77970) += r8a77970-eagle.dtb +dtb-$(CONFIG_ARCH_R8A77970) += r8a77970-v3msk.dtb + +dtb-$(CONFIG_ARCH_R8A77980) += r8a77980-condor.dtb +dtb-$(CONFIG_ARCH_R8A77980) += r8a77980-v3hsk.dtb + dtb-$(CONFIG_ARCH_R8A77990) += r8a77990-ebisu.dtb + dtb-$(CONFIG_ARCH_R8A77995) += r8a77995-draak.dtb
Make the Makefile for building Renesas DTB files easier to read and maintain: - Get rid of line continuations, - Use a single entry per line, - Sort SoCs and boards alphabetically, - Separate SoCs by blank lines. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- To be queued in renesas-devel for v5.9. arch/arm64/boot/dts/renesas/Makefile | 69 ++++++++++++++++++---------- 1 file changed, 45 insertions(+), 24 deletions(-)