Update #4180
---
bsps/arm/imx/headers.am | 5 -----
bsps/arm/shared/headers.am | 5 +++++
bsps/arm/{imx => shared}/include/bsp/imx-gpio.h | 0
bsps/arm/{imx/gpio => shared/pins}/imx-gpio.c | 0
c/src/lib/libbsp/arm/imx/Makefile.am | 2 +-
spec/build/bsps/arm/imx/bspimx.yml | 4 ++--
6 files changed, 8 insertions(+), 8 deletions(-)
rename bsps/arm/{imx => shared}/include/bsp/imx-gpio.h (100%)
rename bsps/arm/{imx/gpio => shared/pins}/imx-gpio.c (100%)
diff --git a/bsps/arm/imx/headers.am b/bsps/arm/imx/headers.am
index e7a2418dea..4db8035c38 100644
--- a/bsps/arm/imx/headers.am
+++ b/bsps/arm/imx/headers.am
@@ -17,9 +17,4 @@ include_arm_freescale_imx_HEADERS +=
../../../../../../bsps/arm/imx/include/arm/
include_bspdir = $(includedir)/bsp
include_bsp_HEADERS =
-include_bsp_HEADERS += ../../../../../../bsps/arm/imx/include/bsp/imx-gpio.h
include_bsp_HEADERS += ../../../../../../bsps/arm/imx/include/bsp/irq.h
-
-include_dev_clockdir = $(includedir)/dev/clock
-include_dev_clock_HEADERS =
-include_dev_clock_HEADERS +=
../../../../../../bsps/include/dev/clock/arm-generic-timer.h
diff --git a/bsps/arm/shared/headers.am b/bsps/arm/shared/headers.am
index 4fd7238f81..34474400ec 100644
--- a/bsps/arm/shared/headers.am
+++ b/bsps/arm/shared/headers.am
@@ -4,3 +4,8 @@ include_arm_freescale_imxdir = $(includedir)/arm/freescale/imx
include_arm_freescale_imx_HEADERS =
include_arm_freescale_imx_HEADERS +=
../../../../../../bsps/arm/shared/include/arm/freescale/imx/imx_iomuxreg.h
include_arm_freescale_imx_HEADERS +=
../../../../../../bsps/arm/shared/include/arm/freescale/imx/imx_iomuxvar.h
+
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS =
+include_bsp_HEADERS += ../../../../../../bsps/arm/shared/include/bsp/imx-gpio.h
+include_bsp_HEADERS +=
../../../../../../bsps/arm/shared/include/bsp/imx-iomux.h
diff --git a/bsps/arm/imx/include/bsp/imx-gpio.h
b/bsps/arm/shared/include/bsp/imx-gpio.h
similarity index 100%
rename from bsps/arm/imx/include/bsp/imx-gpio.h
rename to bsps/arm/shared/include/bsp/imx-gpio.h
diff --git a/bsps/arm/imx/gpio/imx-gpio.c b/bsps/arm/shared/pins/imx-gpio.c
similarity index 100%
rename from bsps/arm/imx/gpio/imx-gpio.c
rename to bsps/arm/shared/pins/imx-gpio.c
diff --git a/c/src/lib/libbsp/arm/imx/Makefile.am
b/c/src/lib/libbsp/arm/imx/Makefile.am
index 80871a286c..c9537a773d 100644
--- a/c/src/lib/libbsp/arm/imx/Makefile.am
+++ b/c/src/lib/libbsp/arm/imx/Makefile.am
@@ -66,7 +66,7 @@ librtemsbsp_a_SOURCES +=
../../../../../../bsps/arm/shared/cache/cache-cp15.c
librtemsbsp_a_SOURCES +=
../../../../../../bsps/arm/shared/cache/cache-v7ar-disable-data.S
# GPIO
-librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/imx/gpio/imx-gpio.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/pins/imx-gpio.c
# I2C
librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/imx/i2c/imx-i2c.c
diff --git a/spec/build/bsps/arm/imx/bspimx.yml
b/spec/build/bsps/arm/imx/bspimx.yml
index 442c631b3a..6b3cfdbb2e 100644
--- a/spec/build/bsps/arm/imx/bspimx.yml
+++ b/spec/build/bsps/arm/imx/bspimx.yml
@@ -28,7 +28,7 @@ install:
- bsps/arm/imx/include/arm/freescale/imx/imx_wdogreg.h
- destination: ${BSP_INCLUDEDIR}/bsp
source:
- - bsps/arm/imx/include/bsp/imx-gpio.h
+ - bsps/arm/shared/include/bsp/imx-gpio.h
- bsps/arm/imx/include/bsp/irq.h
- bsps/arm/shared/include/bsp/imx-iomux.h
- destination: ${BSP_INCLUDEDIR}/dev/clock
@@ -83,7 +83,7 @@ links:
uid: ../../bspopts
source:
- bsps/arm/imx/console/console-config.c
-- bsps/arm/imx/gpio/imx-gpio.c
+- bsps/arm/shared/pins/imx-gpio.c
- bsps/arm/imx/i2c/imx-i2c.c
- bsps/arm/imx/spi/imx-ecspi.c
- bsps/arm/imx/start/bspreset.c
--
2.26.2
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
