[PATCH v2] bsps/arm: Move optfdt* files to shared parent directory

Gedare Bloom gedare at rtems.org
Tue Jun 29 20:41:20 UTC 2021 

PS: loosely related, there is
arm/altera-cyclone-v/optfdten.yml:name: BSP_FDT_IS_SUPPORTED

It looks like other BSPs are deriving this check by conditioning it on
BSP_START_COPY_FDT_FROM_U_BOOT

This could probably be made consistent across these FDT-supporting BSPs.

Gedare

On Tue, Jun 29, 2021 at 2:37 PM Gedare Bloom <gedare at rtems.org> wrote:
>
> On Tue, Jun 29, 2021 at 12:27 PM Christian Mauderer <oss at c-mauderer.de> wrote:
> >
> > PS: Wouldn't it make sense to move these even further up? There is for
> > example ./spec/build/bsps/riscv/riscv/optfdtcpyro.yml too. A short md5
> > shows that it's the same file again.
> >
>
> Yes. Pranav, can you prepare a patch to move these into spec/build/bsps?
>
> I see....
> cd spec/build/bsps
> grep -r FDT_BLOB
>
> powerpc/qoriq
> pops up too.
>
>
> > Best regards
> >
> > Christian
> >
> > On 29/06/2021 20:23, Christian Mauderer wrote:
> > > arm/imx7, arm/altcycv_devkit, arm/raspberrypi and arm/beagleboneblack
> > > compile with the patch. I tried libbsd media01 on beagleboneblack and it
> > > works.
> > >
> > > Best regards
> > >
> > > Christian
> > >
> > > On 29/06/2021 18:56, Gedare Bloom wrote:
> > >> I don't have an arm toolchain, if someone can pick this up and test
> > >> compile the affected BSPs, it looks ok to me.
> > >>
> > >> On Sun, Jun 27, 2021 at 2:46 PM pranav <dangipranav at gmail.com> wrote:
> > >>>
> > >>> ---
> > >>>   .../arm/altera-cyclone-v/bspalteracyclonev.yml   |  8 ++++----
> > >>>   spec/build/bsps/arm/beagle/grp.yml               |  8 ++++----
> > >>>   spec/build/bsps/arm/beagle/optfdtcpyro.yml       | 15 ---------------
> > >>>   spec/build/bsps/arm/beagle/optfdtmxsz.yml        | 16 ----------------
> > >>>   spec/build/bsps/arm/beagle/optfdtro.yml          | 15 ---------------
> > >>>   spec/build/bsps/arm/beagle/optfdtuboot.yml       | 15 ---------------
> > >>>   spec/build/bsps/arm/imx/bspimx.yml               |  8 ++++----
> > >>>   spec/build/bsps/arm/imx/optfdtcpyro.yml          | 15 ---------------
> > >>>   spec/build/bsps/arm/imx/optfdtmxsz.yml           | 16 ----------------
> > >>>   spec/build/bsps/arm/imx/optfdtro.yml             | 15 ---------------
> > >>>   spec/build/bsps/arm/imx/optfdtuboot.yml          | 15 ---------------
> > >>>   .../arm/{altera-cyclone-v => }/optfdtcpyro.yml   |  0
> > >>>   .../arm/{altera-cyclone-v => }/optfdtmxsz.yml    |  0
> > >>>   .../bsps/arm/{altera-cyclone-v => }/optfdtro.yml |  0
> > >>>   .../arm/{altera-cyclone-v => }/optfdtuboot.yml   |  0
> > >>>   spec/build/bsps/arm/raspberrypi/grp.yml          |  8 ++++++++
> > >>>   16 files changed, 20 insertions(+), 134 deletions(-)
> > >>>   delete mode 100644 spec/build/bsps/arm/beagle/optfdtcpyro.yml
> > >>>   delete mode 100644 spec/build/bsps/arm/beagle/optfdtmxsz.yml
> > >>>   delete mode 100644 spec/build/bsps/arm/beagle/optfdtro.yml
> > >>>   delete mode 100644 spec/build/bsps/arm/beagle/optfdtuboot.yml
> > >>>   delete mode 100644 spec/build/bsps/arm/imx/optfdtcpyro.yml
> > >>>   delete mode 100644 spec/build/bsps/arm/imx/optfdtmxsz.yml
> > >>>   delete mode 100644 spec/build/bsps/arm/imx/optfdtro.yml
> > >>>   delete mode 100644 spec/build/bsps/arm/imx/optfdtuboot.yml
> > >>>   rename spec/build/bsps/arm/{altera-cyclone-v => }/optfdtcpyro.yml
> > >>> (100%)
> > >>>   rename spec/build/bsps/arm/{altera-cyclone-v => }/optfdtmxsz.yml
> > >>> (100%)
> > >>>   rename spec/build/bsps/arm/{altera-cyclone-v => }/optfdtro.yml (100%)
> > >>>   rename spec/build/bsps/arm/{altera-cyclone-v => }/optfdtuboot.yml
> > >>> (100%)
> > >>>
> > >>> diff --git
> > >>> a/spec/build/bsps/arm/altera-cyclone-v/bspalteracyclonev.yml
> > >>> b/spec/build/bsps/arm/altera-cyclone-v/bspalteracyclonev.yml
> > >>> index da567ddd79..faf7203cd4 100644
> > >>> --- a/spec/build/bsps/arm/altera-cyclone-v/bspalteracyclonev.yml
> > >>> +++ b/spec/build/bsps/arm/altera-cyclone-v/bspalteracyclonev.yml
> > >>> @@ -73,15 +73,15 @@ links:
> > >>>   - role: build-dependency
> > >>>     uid: optconuart1
> > >>>   - role: build-dependency
> > >>> -  uid: optfdtcpyro
> > >>> +  uid: ../optfdtcpyro
> > >>>   - role: build-dependency
> > >>>     uid: optfdten
> > >>>   - role: build-dependency
> > >>> -  uid: optfdtmxsz
> > >>> +  uid: ../optfdtmxsz
> > >>>   - role: build-dependency
> > >>> -  uid: optfdtro
> > >>> +  uid: ../optfdtro
> > >>>   - role: build-dependency
> > >>> -  uid: optfdtuboot
> > >>> +  uid: ../optfdtuboot
> > >>>   - role: build-dependency
> > >>>     uid: opti2cspeed
> > >>>   - role: build-dependency
> > >>> diff --git a/spec/build/bsps/arm/beagle/grp.yml
> > >>> b/spec/build/bsps/arm/beagle/grp.yml
> > >>> index 1375913fd0..20fafa79a0 100644
> > >>> --- a/spec/build/bsps/arm/beagle/grp.yml
> > >>> +++ b/spec/build/bsps/arm/beagle/grp.yml
> > >>> @@ -22,13 +22,13 @@ links:
> > >>>   - role: build-dependency
> > >>>     uid: optdm3730
> > >>>   - role: build-dependency
> > >>> -  uid: optfdtcpyro
> > >>> +  uid: ../optfdtcpyro
> > >>>   - role: build-dependency
> > >>> -  uid: optfdtmxsz
> > >>> +  uid: ../optfdtmxsz
> > >>>   - role: build-dependency
> > >>> -  uid: optfdtro
> > >>> +  uid: ../optfdtro
> > >>>   - role: build-dependency
> > >>> -  uid: optfdtuboot
> > >>> +  uid: ../optfdtuboot
> > >>>   - role: build-dependency
> > >>>     uid: ../grp
> > >>>   - role: build-dependency
> > >>> diff --git a/spec/build/bsps/arm/beagle/optfdtcpyro.yml
> > >>> b/spec/build/bsps/arm/beagle/optfdtcpyro.yml
> > >>> deleted file mode 100644
> > >>> index c26b1ae051..0000000000
> > >>> --- a/spec/build/bsps/arm/beagle/optfdtcpyro.yml
> > >>> +++ /dev/null
> > >>> @@ -1,15 +0,0 @@
> > >>> -SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
> > >>> -actions:
> > >>> -- get-boolean: null
> > >>> -- define-condition: null
> > >>> -build-type: option
> > >>> -copyrights:
> > >>> -- Copyright (C) 2020 embedded brains GmbH
> > >>> (http://www.embedded-brains.de)
> > >>> -default: true
> > >>> -default-by-variant: []
> > >>> -description: |
> > >>> -  copy the FDT blob into the read-only load area via bsp_fdt_copy()
> > >>> -enabled-by: true
> > >>> -links: []
> > >>> -name: BSP_FDT_BLOB_COPY_TO_READ_ONLY_LOAD_AREA
> > >>> -type: build
> > >>> diff --git a/spec/build/bsps/arm/beagle/optfdtmxsz.yml
> > >>> b/spec/build/bsps/arm/beagle/optfdtmxsz.yml
> > >>> deleted file mode 100644
> > >>> index 14af766230..0000000000
> > >>> --- a/spec/build/bsps/arm/beagle/optfdtmxsz.yml
> > >>> +++ /dev/null
> > >>> @@ -1,16 +0,0 @@
> > >>> -SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
> > >>> -actions:
> > >>> -- get-integer: null
> > >>> -- define: null
> > >>> -build-type: option
> > >>> -copyrights:
> > >>> -- Copyright (C) 2020 embedded brains GmbH
> > >>> (http://www.embedded-brains.de)
> > >>> -default: 262144
> > >>> -default-by-variant: []
> > >>> -description: |
> > >>> -  maximum size of the FDT blob in bytes
> > >>> -enabled-by: true
> > >>> -format: '{}'
> > >>> -links: []
> > >>> -name: BSP_FDT_BLOB_SIZE_MAX
> > >>> -type: build
> > >>> diff --git a/spec/build/bsps/arm/beagle/optfdtro.yml
> > >>> b/spec/build/bsps/arm/beagle/optfdtro.yml
> > >>> deleted file mode 100644
> > >>> index a61bb2924b..0000000000
> > >>> --- a/spec/build/bsps/arm/beagle/optfdtro.yml
> > >>> +++ /dev/null
> > >>> @@ -1,15 +0,0 @@
> > >>> -SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
> > >>> -actions:
> > >>> -- get-boolean: null
> > >>> -- define-condition: null
> > >>> -build-type: option
> > >>> -copyrights:
> > >>> -- Copyright (C) 2020 embedded brains GmbH
> > >>> (http://www.embedded-brains.de)
> > >>> -default: true
> > >>> -default-by-variant: []
> > >>> -description: |
> > >>> -  place the FDT blob into the read-only data area
> > >>> -enabled-by: true
> > >>> -links: []
> > >>> -name: BSP_FDT_BLOB_READ_ONLY
> > >>> -type: build
> > >>> diff --git a/spec/build/bsps/arm/beagle/optfdtuboot.yml
> > >>> b/spec/build/bsps/arm/beagle/optfdtuboot.yml
> > >>> deleted file mode 100644
> > >>> index 5805e912ff..0000000000
> > >>> --- a/spec/build/bsps/arm/beagle/optfdtuboot.yml
> > >>> +++ /dev/null
> > >>> @@ -1,15 +0,0 @@
> > >>> -SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
> > >>> -actions:
> > >>> -- get-boolean: null
> > >>> -- define-condition: null
> > >>> -build-type: option
> > >>> -copyrights:
> > >>> -- Copyright (C) 2020 embedded brains GmbH
> > >>> (http://www.embedded-brains.de)
> > >>> -default: true
> > >>> -default-by-variant: []
> > >>> -description: |
> > >>> -  copy the U-Boot provided FDT to an internal storage
> > >>> -enabled-by: true
> > >>> -links: []
> > >>> -name: BSP_START_COPY_FDT_FROM_U_BOOT
> > >>> -type: build
> > >>> diff --git a/spec/build/bsps/arm/imx/bspimx.yml
> > >>> b/spec/build/bsps/arm/imx/bspimx.yml
> > >>> index c65e02db2b..faaca77e63 100644
> > >>> --- a/spec/build/bsps/arm/imx/bspimx.yml
> > >>> +++ b/spec/build/bsps/arm/imx/bspimx.yml
> > >>> @@ -61,13 +61,13 @@ links:
> > >>>   - role: build-dependency
> > >>>     uid: optconirq
> > >>>   - role: build-dependency
> > >>> -  uid: optfdtcpyro
> > >>> +  uid: ../optfdtcpyro
> > >>>   - role: build-dependency
> > >>> -  uid: optfdtmxsz
> > >>> +  uid: ../optfdtmxsz
> > >>>   - role: build-dependency
> > >>> -  uid: optfdtro
> > >>> +  uid: ../optfdtro
> > >>>   - role: build-dependency
> > >>> -  uid: optfdtuboot
> > >>> +  uid: ../optfdtuboot
> > >>>   - role: build-dependency
> > >>>     uid: optresetvec
> > >>>   - role: build-dependency
> > >>> diff --git a/spec/build/bsps/arm/imx/optfdtcpyro.yml
> > >>> b/spec/build/bsps/arm/imx/optfdtcpyro.yml
> > >>> deleted file mode 100644
> > >>> index c26b1ae051..0000000000
> > >>> --- a/spec/build/bsps/arm/imx/optfdtcpyro.yml
> > >>> +++ /dev/null
> > >>> @@ -1,15 +0,0 @@
> > >>> -SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
> > >>> -actions:
> > >>> -- get-boolean: null
> > >>> -- define-condition: null
> > >>> -build-type: option
> > >>> -copyrights:
> > >>> -- Copyright (C) 2020 embedded brains GmbH
> > >>> (http://www.embedded-brains.de)
> > >>> -default: true
> > >>> -default-by-variant: []
> > >>> -description: |
> > >>> -  copy the FDT blob into the read-only load area via bsp_fdt_copy()
> > >>> -enabled-by: true
> > >>> -links: []
> > >>> -name: BSP_FDT_BLOB_COPY_TO_READ_ONLY_LOAD_AREA
> > >>> -type: build
> > >>> diff --git a/spec/build/bsps/arm/imx/optfdtmxsz.yml
> > >>> b/spec/build/bsps/arm/imx/optfdtmxsz.yml
> > >>> deleted file mode 100644
> > >>> index 14af766230..0000000000
> > >>> --- a/spec/build/bsps/arm/imx/optfdtmxsz.yml
> > >>> +++ /dev/null
> > >>> @@ -1,16 +0,0 @@
> > >>> -SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
> > >>> -actions:
> > >>> -- get-integer: null
> > >>> -- define: null
> > >>> -build-type: option
> > >>> -copyrights:
> > >>> -- Copyright (C) 2020 embedded brains GmbH
> > >>> (http://www.embedded-brains.de)
> > >>> -default: 262144
> > >>> -default-by-variant: []
> > >>> -description: |
> > >>> -  maximum size of the FDT blob in bytes
> > >>> -enabled-by: true
> > >>> -format: '{}'
> > >>> -links: []
> > >>> -name: BSP_FDT_BLOB_SIZE_MAX
> > >>> -type: build
> > >>> diff --git a/spec/build/bsps/arm/imx/optfdtro.yml
> > >>> b/spec/build/bsps/arm/imx/optfdtro.yml
> > >>> deleted file mode 100644
> > >>> index a61bb2924b..0000000000
> > >>> --- a/spec/build/bsps/arm/imx/optfdtro.yml
> > >>> +++ /dev/null
> > >>> @@ -1,15 +0,0 @@
> > >>> -SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
> > >>> -actions:
> > >>> -- get-boolean: null
> > >>> -- define-condition: null
> > >>> -build-type: option
> > >>> -copyrights:
> > >>> -- Copyright (C) 2020 embedded brains GmbH
> > >>> (http://www.embedded-brains.de)
> > >>> -default: true
> > >>> -default-by-variant: []
> > >>> -description: |
> > >>> -  place the FDT blob into the read-only data area
> > >>> -enabled-by: true
> > >>> -links: []
> > >>> -name: BSP_FDT_BLOB_READ_ONLY
> > >>> -type: build
> > >>> diff --git a/spec/build/bsps/arm/imx/optfdtuboot.yml
> > >>> b/spec/build/bsps/arm/imx/optfdtuboot.yml
> > >>> deleted file mode 100644
> > >>> index 5805e912ff..0000000000
> > >>> --- a/spec/build/bsps/arm/imx/optfdtuboot.yml
> > >>> +++ /dev/null
> > >>> @@ -1,15 +0,0 @@
> > >>> -SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
> > >>> -actions:
> > >>> -- get-boolean: null
> > >>> -- define-condition: null
> > >>> -build-type: option
> > >>> -copyrights:
> > >>> -- Copyright (C) 2020 embedded brains GmbH
> > >>> (http://www.embedded-brains.de)
> > >>> -default: true
> > >>> -default-by-variant: []
> > >>> -description: |
> > >>> -  copy the U-Boot provided FDT to an internal storage
> > >>> -enabled-by: true
> > >>> -links: []
> > >>> -name: BSP_START_COPY_FDT_FROM_U_BOOT
> > >>> -type: build
> > >>> diff --git a/spec/build/bsps/arm/altera-cyclone-v/optfdtcpyro.yml
> > >>> b/spec/build/bsps/arm/optfdtcpyro.yml
> > >>> similarity index 100%
> > >>> rename from spec/build/bsps/arm/altera-cyclone-v/optfdtcpyro.yml
> > >>> rename to spec/build/bsps/arm/optfdtcpyro.yml
> > >>> diff --git a/spec/build/bsps/arm/altera-cyclone-v/optfdtmxsz.yml
> > >>> b/spec/build/bsps/arm/optfdtmxsz.yml
> > >>> similarity index 100%
> > >>> rename from spec/build/bsps/arm/altera-cyclone-v/optfdtmxsz.yml
> > >>> rename to spec/build/bsps/arm/optfdtmxsz.yml
> > >>> diff --git a/spec/build/bsps/arm/altera-cyclone-v/optfdtro.yml
> > >>> b/spec/build/bsps/arm/optfdtro.yml
> > >>> similarity index 100%
> > >>> rename from spec/build/bsps/arm/altera-cyclone-v/optfdtro.yml
> > >>> rename to spec/build/bsps/arm/optfdtro.yml
> > >>> diff --git a/spec/build/bsps/arm/altera-cyclone-v/optfdtuboot.yml
> > >>> b/spec/build/bsps/arm/optfdtuboot.yml
> > >>> similarity index 100%
> > >>> rename from spec/build/bsps/arm/altera-cyclone-v/optfdtuboot.yml
> > >>> rename to spec/build/bsps/arm/optfdtuboot.yml
> > >>> diff --git a/spec/build/bsps/arm/raspberrypi/grp.yml
> > >>> b/spec/build/bsps/arm/raspberrypi/grp.yml
> > >>> index 7291e8b178..e6b0a1cf75 100644
> > >>> --- a/spec/build/bsps/arm/raspberrypi/grp.yml
> > >>> +++ b/spec/build/bsps/arm/raspberrypi/grp.yml
> > >>> @@ -31,6 +31,14 @@ links:
> > >>>     uid: optrpi2
> > >>>   - role: build-dependency
> > >>>     uid: optspiiomode
> > >>> +- role: build-dependency
> > >>> +  uid: ../optfdtuboot
> > >>> +- role: build-dependency
> > >>> +  uid: ../optfdtcpyro
> > >>> +- role: build-dependency
> > >>> +  uid: ../optfdtmxsz
> > >>> +- role: build-dependency
> > >>> +  uid: ../optfdtro
> > >>>   - role: build-dependency
> > >>>     uid: ../start
> > >>>   - role: build-dependency
> > >>> --
> > >>> 2.27.0
> > >>>
> > >>> _______________________________________________
> > >>> devel mailing list
> > >>> devel at rtems.org
> > >>> http://lists.rtems.org/mailman/listinfo/devel
> > >> _______________________________________________
> > >> devel mailing list
> > >> devel at rtems.org
> > >> http://lists.rtems.org/mailman/listinfo/devel
> > >>
> > > _______________________________________________
> > > devel mailing list
> > > devel at rtems.org
> > > http://lists.rtems.org/mailman/listinfo/devel
> > >

More information about the devel mailing list