[PATCH rtems] bsps/arm/imx*: Fix location of shared headers

Christian Mauderer christian.mauderer at embedded-brains.de
Thu Dec 10 08:52:45 UTC 2020


When moving the headers from the imx BSP to the shared area, the wrong
directory has been selected. This patch fixes that problem.

Update #4180
---
 .../include/arm/freescale/imx/imx_iomuxreg.h          |  0
 .../include/arm/freescale/imx/imx_iomuxvar.h          |  0
 bsps/arm/{shared => }/include/bsp/imx-gpio.h          |  0
 bsps/arm/{shared => }/include/bsp/imx-iomux.h         |  0
 spec/build/bsps/arm/imx/bspimx.yml                    | 11 +++++------
 spec/build/bsps/arm/imxrt/bspimxrt.yml                | 11 +++++------
 6 files changed, 10 insertions(+), 12 deletions(-)
 rename bsps/arm/{shared => }/include/arm/freescale/imx/imx_iomuxreg.h (100%)
 rename bsps/arm/{shared => }/include/arm/freescale/imx/imx_iomuxvar.h (100%)
 rename bsps/arm/{shared => }/include/bsp/imx-gpio.h (100%)
 rename bsps/arm/{shared => }/include/bsp/imx-iomux.h (100%)

diff --git a/bsps/arm/shared/include/arm/freescale/imx/imx_iomuxreg.h b/bsps/arm/include/arm/freescale/imx/imx_iomuxreg.h
similarity index 100%
rename from bsps/arm/shared/include/arm/freescale/imx/imx_iomuxreg.h
rename to bsps/arm/include/arm/freescale/imx/imx_iomuxreg.h
diff --git a/bsps/arm/shared/include/arm/freescale/imx/imx_iomuxvar.h b/bsps/arm/include/arm/freescale/imx/imx_iomuxvar.h
similarity index 100%
rename from bsps/arm/shared/include/arm/freescale/imx/imx_iomuxvar.h
rename to bsps/arm/include/arm/freescale/imx/imx_iomuxvar.h
diff --git a/bsps/arm/shared/include/bsp/imx-gpio.h b/bsps/arm/include/bsp/imx-gpio.h
similarity index 100%
rename from bsps/arm/shared/include/bsp/imx-gpio.h
rename to bsps/arm/include/bsp/imx-gpio.h
diff --git a/bsps/arm/shared/include/bsp/imx-iomux.h b/bsps/arm/include/bsp/imx-iomux.h
similarity index 100%
rename from bsps/arm/shared/include/bsp/imx-iomux.h
rename to bsps/arm/include/bsp/imx-iomux.h
diff --git a/spec/build/bsps/arm/imx/bspimx.yml b/spec/build/bsps/arm/imx/bspimx.yml
index 5f448682ed..93628f0368 100644
--- a/spec/build/bsps/arm/imx/bspimx.yml
+++ b/spec/build/bsps/arm/imx/bspimx.yml
@@ -8,8 +8,7 @@ copyrights:
 cppflags: []
 enabled-by: true
 family: imx
-includes:
-  - bsps/arm/shared/include
+includes: []
 install:
 - destination: ${BSP_INCLUDEDIR}
   source:
@@ -21,16 +20,16 @@ install:
   - bsps/arm/imx/include/arm/freescale/imx/imx_ecspireg.h
   - bsps/arm/imx/include/arm/freescale/imx/imx_gpcreg.h
   - bsps/arm/imx/include/arm/freescale/imx/imx_i2creg.h
-  - bsps/arm/shared/include/arm/freescale/imx/imx_iomuxreg.h
-  - bsps/arm/shared/include/arm/freescale/imx/imx_iomuxvar.h
   - bsps/arm/imx/include/arm/freescale/imx/imx_srcreg.h
   - bsps/arm/imx/include/arm/freescale/imx/imx_uartreg.h
   - bsps/arm/imx/include/arm/freescale/imx/imx_wdogreg.h
+  - bsps/arm/include/arm/freescale/imx/imx_iomuxreg.h
+  - bsps/arm/include/arm/freescale/imx/imx_iomuxvar.h
 - destination: ${BSP_INCLUDEDIR}/bsp
   source:
-  - bsps/arm/shared/include/bsp/imx-gpio.h
   - bsps/arm/imx/include/bsp/irq.h
-  - bsps/arm/shared/include/bsp/imx-iomux.h
+  - bsps/arm/include/bsp/imx-gpio.h
+  - bsps/arm/include/bsp/imx-iomux.h
 - destination: ${BSP_INCLUDEDIR}/dev/clock
   source:
   - bsps/include/dev/clock/arm-generic-timer.h
diff --git a/spec/build/bsps/arm/imxrt/bspimxrt.yml b/spec/build/bsps/arm/imxrt/bspimxrt.yml
index 67161ba11f..bafd7ef3f9 100644
--- a/spec/build/bsps/arm/imxrt/bspimxrt.yml
+++ b/spec/build/bsps/arm/imxrt/bspimxrt.yml
@@ -8,8 +8,7 @@ copyrights:
 cppflags: []
 enabled-by: true
 family: imxrt
-includes:
-  - bsps/arm/shared/include
+includes: []
 install:
 - destination: ${BSP_INCLUDEDIR}
   source:
@@ -92,14 +91,14 @@ install:
   - bsps/arm/imxrt/include/tm27.h
 - destination: ${BSP_INCLUDEDIR}/arm/freescale/imx
   source:
-  - bsps/arm/shared/include/arm/freescale/imx/imx_iomuxreg.h
-  - bsps/arm/shared/include/arm/freescale/imx/imx_iomuxvar.h
+  - bsps/arm/include/arm/freescale/imx/imx_iomuxreg.h
+  - bsps/arm/include/arm/freescale/imx/imx_iomuxvar.h
 - destination: ${BSP_INCLUDEDIR}/bsp
   source:
   - bsps/arm/imxrt/include/bsp/flash-headers.h
   - bsps/arm/imxrt/include/bsp/irq.h
-  - bsps/arm/shared/include/bsp/imx-gpio.h
-  - bsps/arm/shared/include/bsp/imx-iomux.h
+  - bsps/arm/include/bsp/imx-gpio.h
+  - bsps/arm/include/bsp/imx-iomux.h
 - destination: ${BSP_INCLUDEDIR}/imxrt
   source:
   - bsps/arm/imxrt/include/imxrt/imxrt1050-pinfunc.h
-- 
2.26.2



More information about the devel mailing list