[PATCH v4] bsps: Move optfdt* files to shared parent directory

Joel Sherrill joel at rtems.org
Fri Jul 16 16:40:35 UTC 2021


I'm doing a build sweep of all BSPs. When that completes, I plan to
push this unless there are comments.

On Fri, Jul 16, 2021 at 9:51 AM 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      | 16 ----------------
>  spec/build/bsps/arm/beagle/optfdtmxsz.yml       | 17 -----------------
>  spec/build/bsps/arm/beagle/optfdtro.yml         | 16 ----------------
>  spec/build/bsps/arm/beagle/optfdtuboot.yml      | 16 ----------------
>  spec/build/bsps/arm/imx/bspimx.yml              |  8 ++++----
>  spec/build/bsps/arm/imx/optfdtcpyro.yml         | 16 ----------------
>  spec/build/bsps/arm/imx/optfdtmxsz.yml          | 17 -----------------
>  spec/build/bsps/arm/imx/optfdtro.yml            | 16 ----------------
>  spec/build/bsps/arm/imx/optfdtuboot.yml         | 16 ----------------
>  spec/build/bsps/arm/raspberrypi/grp.yml         |  8 ++++++++
>  .../{arm/altera-cyclone-v => }/optfdtcpyro.yml  |  0
>  .../{arm/altera-cyclone-v => }/optfdtmxsz.yml   |  0
>  .../{arm/altera-cyclone-v => }/optfdtro.yml     |  0
>  .../{arm/altera-cyclone-v => }/optfdtuboot.yml  |  0
>  spec/build/bsps/powerpc/qoriq/grp.yml           |  4 ++--
>  spec/build/bsps/powerpc/qoriq/optfdtmxsz.yml    | 17 -----------------
>  spec/build/bsps/powerpc/qoriq/optfdtro.yml      | 16 ----------------
>  spec/build/bsps/riscv/riscv/grp.yml             |  8 ++++----
>  spec/build/bsps/riscv/riscv/optfdtcpyro.yml     | 16 ----------------
>  spec/build/bsps/riscv/riscv/optfdtmxsz.yml      | 17 -----------------
>  spec/build/bsps/riscv/riscv/optfdtro.yml        | 16 ----------------
>  spec/build/bsps/riscv/riscv/optfdtuboot.yml     | 16 ----------------
>  24 files changed, 26 insertions(+), 246 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%)
>  delete mode 100644 spec/build/bsps/powerpc/qoriq/optfdtmxsz.yml
>  delete mode 100644 spec/build/bsps/powerpc/qoriq/optfdtro.yml
>  delete mode 100644 spec/build/bsps/riscv/riscv/optfdtcpyro.yml
>  delete mode 100644 spec/build/bsps/riscv/riscv/optfdtmxsz.yml
>  delete mode 100644 spec/build/bsps/riscv/riscv/optfdtro.yml
>  delete mode 100644 spec/build/bsps/riscv/riscv/optfdtuboot.yml
>
> diff --git a/spec/build/bsps/arm/altera-cyclone-v/bspalteracyclonev.yml b/spec/build/bsps/arm/altera-cyclone-v/bspalteracyclonev.yml
> index da567ddd79..a9f3f7dabf 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..3452c3e5c8 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 5ec59adf4d..0000000000
> --- a/spec/build/bsps/arm/beagle/optfdtcpyro.yml
> +++ /dev/null
> @@ -1,16 +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-family: []
> -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 f3b2504e02..0000000000
> --- a/spec/build/bsps/arm/beagle/optfdtmxsz.yml
> +++ /dev/null
> @@ -1,17 +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-family: []
> -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 a72bc23c0e..0000000000
> --- a/spec/build/bsps/arm/beagle/optfdtro.yml
> +++ /dev/null
> @@ -1,16 +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-family: []
> -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 cfe94e577c..0000000000
> --- a/spec/build/bsps/arm/beagle/optfdtuboot.yml
> +++ /dev/null
> @@ -1,16 +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-family: []
> -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..14719745f0 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 5ec59adf4d..0000000000
> --- a/spec/build/bsps/arm/imx/optfdtcpyro.yml
> +++ /dev/null
> @@ -1,16 +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-family: []
> -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 f3b2504e02..0000000000
> --- a/spec/build/bsps/arm/imx/optfdtmxsz.yml
> +++ /dev/null
> @@ -1,17 +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-family: []
> -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 a72bc23c0e..0000000000
> --- a/spec/build/bsps/arm/imx/optfdtro.yml
> +++ /dev/null
> @@ -1,16 +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-family: []
> -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 cfe94e577c..0000000000
> --- a/spec/build/bsps/arm/imx/optfdtuboot.yml
> +++ /dev/null
> @@ -1,16 +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-family: []
> -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/raspberrypi/grp.yml b/spec/build/bsps/arm/raspberrypi/grp.yml
> index 7291e8b178..94627a9526 100644
> --- a/spec/build/bsps/arm/raspberrypi/grp.yml
> +++ b/spec/build/bsps/arm/raspberrypi/grp.yml
> @@ -41,6 +41,14 @@ links:
>    uid: linkcmds
>  - role: build-dependency
>    uid: ../../bspopts
> +- role: build-dependency
> +  uid: ../../optfdtcpyro
> +- role: build-dependency
> +  uid: ../../optfdtmxsz
> +- role: build-dependency
> +  uid: ../../optfdtro
> +- role: build-dependency
> +  uid: ../../optfdtuboot
>  type: build
>  use-after: []
>  use-before: []
> diff --git a/spec/build/bsps/arm/altera-cyclone-v/optfdtcpyro.yml b/spec/build/bsps/optfdtcpyro.yml
> similarity index 100%
> rename from spec/build/bsps/arm/altera-cyclone-v/optfdtcpyro.yml
> rename to spec/build/bsps/optfdtcpyro.yml
> diff --git a/spec/build/bsps/arm/altera-cyclone-v/optfdtmxsz.yml b/spec/build/bsps/optfdtmxsz.yml
> similarity index 100%
> rename from spec/build/bsps/arm/altera-cyclone-v/optfdtmxsz.yml
> rename to spec/build/bsps/optfdtmxsz.yml
> diff --git a/spec/build/bsps/arm/altera-cyclone-v/optfdtro.yml b/spec/build/bsps/optfdtro.yml
> similarity index 100%
> rename from spec/build/bsps/arm/altera-cyclone-v/optfdtro.yml
> rename to spec/build/bsps/optfdtro.yml
> diff --git a/spec/build/bsps/arm/altera-cyclone-v/optfdtuboot.yml b/spec/build/bsps/optfdtuboot.yml
> similarity index 100%
> rename from spec/build/bsps/arm/altera-cyclone-v/optfdtuboot.yml
> rename to spec/build/bsps/optfdtuboot.yml
> diff --git a/spec/build/bsps/powerpc/qoriq/grp.yml b/spec/build/bsps/powerpc/qoriq/grp.yml
> index 3e295cb599..08533ded6f 100644
> --- a/spec/build/bsps/powerpc/qoriq/grp.yml
> +++ b/spec/build/bsps/powerpc/qoriq/grp.yml
> @@ -68,9 +68,9 @@ links:
>  - role: build-dependency
>    uid: optexcfixdhdlr
>  - role: build-dependency
> -  uid: optfdtmxsz
> +  uid: ../../optfdtmxsz
>  - role: build-dependency
> -  uid: optfdtro
> +  uid: ../../optfdtro
>  - role: build-dependency
>    uid: opthid0
>  - role: build-dependency
> diff --git a/spec/build/bsps/powerpc/qoriq/optfdtmxsz.yml b/spec/build/bsps/powerpc/qoriq/optfdtmxsz.yml
> deleted file mode 100644
> index f3b2504e02..0000000000
> --- a/spec/build/bsps/powerpc/qoriq/optfdtmxsz.yml
> +++ /dev/null
> @@ -1,17 +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-family: []
> -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/powerpc/qoriq/optfdtro.yml b/spec/build/bsps/powerpc/qoriq/optfdtro.yml
> deleted file mode 100644
> index a72bc23c0e..0000000000
> --- a/spec/build/bsps/powerpc/qoriq/optfdtro.yml
> +++ /dev/null
> @@ -1,16 +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-family: []
> -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/riscv/riscv/grp.yml b/spec/build/bsps/riscv/riscv/grp.yml
> index 396f8986ec..77583d351e 100644
> --- a/spec/build/bsps/riscv/riscv/grp.yml
> +++ b/spec/build/bsps/riscv/riscv/grp.yml
> @@ -32,13 +32,13 @@ links:
>  - role: build-dependency
>    uid: optextirqmax
>  - 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: optfrdme310arty
>  - role: build-dependency
> diff --git a/spec/build/bsps/riscv/riscv/optfdtcpyro.yml b/spec/build/bsps/riscv/riscv/optfdtcpyro.yml
> deleted file mode 100644
> index 5ec59adf4d..0000000000
> --- a/spec/build/bsps/riscv/riscv/optfdtcpyro.yml
> +++ /dev/null
> @@ -1,16 +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-family: []
> -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/riscv/riscv/optfdtmxsz.yml b/spec/build/bsps/riscv/riscv/optfdtmxsz.yml
> deleted file mode 100644
> index 8a07a2ad08..0000000000
> --- a/spec/build/bsps/riscv/riscv/optfdtmxsz.yml
> +++ /dev/null
> @@ -1,17 +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: 65536
> -default-by-family: []
> -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/riscv/riscv/optfdtro.yml b/spec/build/bsps/riscv/riscv/optfdtro.yml
> deleted file mode 100644
> index a72bc23c0e..0000000000
> --- a/spec/build/bsps/riscv/riscv/optfdtro.yml
> +++ /dev/null
> @@ -1,16 +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-family: []
> -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/riscv/riscv/optfdtuboot.yml b/spec/build/bsps/riscv/riscv/optfdtuboot.yml
> deleted file mode 100644
> index cfe94e577c..0000000000
> --- a/spec/build/bsps/riscv/riscv/optfdtuboot.yml
> +++ /dev/null
> @@ -1,16 +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-family: []
> -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
> --
> 2.30.2
>
> _______________________________________________
> devel mailing list
> devel at rtems.org
> http://lists.rtems.org/mailman/listinfo/devel


More information about the devel mailing list