On 19-01-29 12:03:35, Tom Rini wrote:
On Tue, Jan 29, 2019 at 11:30:47AM +0000, Abel Vesa wrote:
This allows us to keep the basic dts[i] files up-to-date with the ones in kernel, but at the same time allowing the u-boot to add its own properties to the existing nodes.
Signed-off-by: Abel Vesa abel.vesa@nxp.com
arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi | 6 ++++++ arch/arm/dts/imx6dl-sabresd-u-boot.dtsi | 6 ++++++ arch/arm/dts/imx6q-sabreauto-u-boot.dtsi | 6 ++++++ arch/arm/dts/imx6q-sabresd-u-boot.dtsi | 6 ++++++ arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi | 23 +++++++++++++++++++++++ arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi | 14 ++++++++++++++ arch/arm/dts/imx6qdl-u-boot.dtsi | 4 ++-- arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi | 6 ++++++ arch/arm/dts/imx6qp-sabresd-u-boot.dtsi | 6 ++++++ 9 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 arch/arm/dts/imx6dl-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6dl-sabresd-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-sabresd-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-sabresd-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qp-sabreauto-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qp-sabresd-u-boot.dtsi
Since a lot of these files are just #include the main one, is there not some rule under u_boot_dtsi_options in scripts/Makefile.lib that would match and pick that main one up automatically?
OK, so I looked into it. The thing is, the CONFIG_SYS_SOC is not generic enough. Lets take an example. For imx6dl-sabresd.dts, in order to include the most generic one (or as you named it: 'the main one'), in this case imx6qdl-sabresd-u-boot.dtsi, the CONFIG_SYS_SOC should be set to imx6qdl instead of imx6dl. I don't know the implications if we make this rename, but this is why your suggestion doesn't work as is. So I'll keep all the files for now.
-- Tom