bsps: Move I2C drivers to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

38 files changed, 22 insertions, 22 deletions

diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/i2c/i2cdrv-config.c b/bsps/arm/altera-cyclone-v/i2c/i2cdrv-config.c
index 3c29b61e50..3c29b61e50 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/i2c/i2cdrv-config.c
+++ b/bsps/arm/altera-cyclone-v/i2c/i2cdrv-config.c
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/i2c/i2cdrv-config.h b/bsps/arm/altera-cyclone-v/i2c/i2cdrv-config.h
index 650974751e..650974751e 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/i2c/i2cdrv-config.h
+++ b/bsps/arm/altera-cyclone-v/i2c/i2cdrv-config.h
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/i2c/i2cdrv.c b/bsps/arm/altera-cyclone-v/i2c/i2cdrv.c
index 3ea23551d8..3ea23551d8 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/i2c/i2cdrv.c
+++ b/bsps/arm/altera-cyclone-v/i2c/i2cdrv.c
diff --git a/c/src/lib/libbsp/arm/atsam/i2c/atsam_i2c_bus.c b/bsps/arm/atsam/i2c/atsam_i2c_bus.c
index bace7e656e..bace7e656e 100644
--- a/c/src/lib/libbsp/arm/atsam/i2c/atsam_i2c_bus.c
+++ b/bsps/arm/atsam/i2c/atsam_i2c_bus.c
diff --git a/c/src/lib/libbsp/arm/atsam/i2c/atsam_i2c_init.c b/bsps/arm/atsam/i2c/atsam_i2c_init.c
index 1c31fbe899..1c31fbe899 100644
--- a/c/src/lib/libbsp/arm/atsam/i2c/atsam_i2c_init.c
+++ b/bsps/arm/atsam/i2c/atsam_i2c_init.c
diff --git a/c/src/lib/libbsp/arm/beagle/i2c/bbb-i2c.c b/bsps/arm/beagle/i2c/bbb-i2c.c
index 3a8637d457..3a8637d457 100644
--- a/c/src/lib/libbsp/arm/beagle/i2c/bbb-i2c.c
+++ b/bsps/arm/beagle/i2c/bbb-i2c.c
diff --git a/c/src/lib/libbsp/arm/imx/i2c/imx-i2c.c b/bsps/arm/imx/i2c/imx-i2c.c
index 7633c7a487..7633c7a487 100644
--- a/c/src/lib/libbsp/arm/imx/i2c/imx-i2c.c
+++ b/bsps/arm/imx/i2c/imx-i2c.c
diff --git a/c/src/lib/libbsp/arm/lpc24xx/i2c/i2c-config.c b/bsps/arm/lpc24xx/i2c/i2c-config.c
index 5ba16ae874..5ba16ae874 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/i2c/i2c-config.c
+++ b/bsps/arm/lpc24xx/i2c/i2c-config.c
diff --git a/c/src/lib/libbsp/arm/lpc24xx/i2c/i2c.c b/bsps/arm/lpc24xx/i2c/i2c.c
index ef638e69b9..ef638e69b9 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/i2c/i2c.c
+++ b/bsps/arm/lpc24xx/i2c/i2c.c
diff --git a/c/src/lib/libbsp/arm/lpc32xx/misc/i2c.c b/bsps/arm/lpc32xx/i2c/i2c.c
index 508cd6458a..508cd6458a 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/misc/i2c.c
+++ b/bsps/arm/lpc32xx/i2c/i2c.c
diff --git a/c/src/lib/libbsp/arm/raspberrypi/i2c/i2c.c b/bsps/arm/raspberrypi/i2c/i2c.c
index d3912671cd..d3912671cd 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/i2c/i2c.c
+++ b/bsps/arm/raspberrypi/i2c/i2c.c
diff --git a/c/src/lib/libbsp/arm/stm32f4/i2c/i2c-config.c b/bsps/arm/stm32f4/i2c/i2c-config.c
index eac16bafc0..eac16bafc0 100644
--- a/c/src/lib/libbsp/arm/stm32f4/i2c/i2c-config.c
+++ b/bsps/arm/stm32f4/i2c/i2c-config.c
diff --git a/c/src/lib/libbsp/arm/stm32f4/i2c/i2c.c b/bsps/arm/stm32f4/i2c/i2c.c
index 1d0a409455..1d0a409455 100644
--- a/c/src/lib/libbsp/arm/stm32f4/i2c/i2c.c
+++ b/bsps/arm/stm32f4/i2c/i2c.c
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/i2c/cadence-i2c.c b/bsps/arm/xilinx-zynq/i2c/cadence-i2c.c
index 76211da496..76211da496 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/i2c/cadence-i2c.c
+++ b/bsps/arm/xilinx-zynq/i2c/cadence-i2c.c
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2c.c b/bsps/m68k/mcf5206elite/i2c/i2c.c
index f77fe1ebcc..f77fe1ebcc 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2c.c
+++ b/bsps/m68k/mcf5206elite/i2c/i2c.c
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2cdrv.c b/bsps/m68k/mcf5206elite/i2c/i2cdrv.c
index 838b0b26b1..838b0b26b1 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2cdrv.c
+++ b/bsps/m68k/mcf5206elite/i2c/i2cdrv.c
diff --git a/c/src/lib/libbsp/powerpc/gen5200/i2c/i2c.c b/bsps/powerpc/gen5200/i2c/i2c.c
index 0b5adeb2a9..0b5adeb2a9 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/i2c/i2c.c
+++ b/bsps/powerpc/gen5200/i2c/i2c.c
diff --git a/c/src/lib/libbsp/powerpc/gen5200/i2c/i2cdrv.c b/bsps/powerpc/gen5200/i2c/i2cdrv.c
index 2c20b3dbdc..2c20b3dbdc 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/i2c/i2cdrv.c
+++ b/bsps/powerpc/gen5200/i2c/i2cdrv.c
diff --git a/c/src/lib/libbsp/powerpc/gen5200/i2c/mpc5200mbus.c b/bsps/powerpc/gen5200/i2c/mpc5200mbus.c
index aa926bc8d9..aa926bc8d9 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/i2c/mpc5200mbus.c
+++ b/bsps/powerpc/gen5200/i2c/mpc5200mbus.c
diff --git a/c/src/lib/libbsp/powerpc/gen5200/i2c/mpc5200mbus.h b/bsps/powerpc/gen5200/i2c/mpc5200mbus.h
index e68b564e2f..e68b564e2f 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/i2c/mpc5200mbus.h
+++ b/bsps/powerpc/gen5200/i2c/mpc5200mbus.h
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/i2c/i2c_init.c b/bsps/powerpc/gen83xx/i2c/i2c_init.c
index 7fdd6bbd4c..7fdd6bbd4c 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/i2c/i2c_init.c
+++ b/bsps/powerpc/gen83xx/i2c/i2c_init.c
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/i2c/i2c_init.c b/bsps/powerpc/mpc55xxevb/i2c/i2c_init.c
index 49fd8cad9e..49fd8cad9e 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/i2c/i2c_init.c
+++ b/bsps/powerpc/mpc55xxevb/i2c/i2c_init.c
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/i2c/i2c_init.c b/bsps/powerpc/mvme3100/i2c/i2c_init.c
index 9e242baf20..9e242baf20 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/i2c/i2c_init.c
+++ b/bsps/powerpc/mvme3100/i2c/i2c_init.c
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/i2c/mpc8540_i2c.c b/bsps/powerpc/mvme3100/i2c/mpc8540_i2c.c
index b32b69255e..b32b69255e 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/i2c/mpc8540_i2c.c
+++ b/bsps/powerpc/mvme3100/i2c/mpc8540_i2c.c
diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
index d915f33e76..d3a48806ea 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
@@ -77,8 +77,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/altera-cyclone-v/console/con
 librtemsbsp_a_SOURCES += ../shared/arm-a9mpcore-clock-config.c
 
 # I2C
-librtemsbsp_a_SOURCES += i2c/i2cdrv.c
-librtemsbsp_a_SOURCES += i2c/i2cdrv-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/altera-cyclone-v/i2c/i2cdrv.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/altera-cyclone-v/i2c/i2cdrv-config.c
 # RTC
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
 librtemsbsp_a_SOURCES += rtc/rtc.c
diff --git a/c/src/lib/libbsp/arm/atsam/Makefile.am b/c/src/lib/libbsp/arm/atsam/Makefile.am
index 056a076b4d..3c3a88e0ec 100644
--- a/c/src/lib/libbsp/arm/atsam/Makefile.am
+++ b/c/src/lib/libbsp/arm/atsam/Makefile.am
@@ -131,8 +131,8 @@ librtemsbsp_a_SOURCES += network/if_atsam.c
 endif
 
 # I2C
-librtemsbsp_a_SOURCES += i2c/atsam_i2c_bus.c
-librtemsbsp_a_SOURCES += i2c/atsam_i2c_init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/i2c/atsam_i2c_bus.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/i2c/atsam_i2c_init.c
 
 # SPI
 librtemsbsp_a_SOURCES += spi/atsam_spi_bus.c
diff --git a/c/src/lib/libbsp/arm/beagle/Makefile.am b/c/src/lib/libbsp/arm/beagle/Makefile.am
index 9da9278220..72a80b0b35 100644
--- a/c/src/lib/libbsp/arm/beagle/Makefile.am
+++ b/c/src/lib/libbsp/arm/beagle/Makefile.am
@@ -68,7 +68,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/legacy-console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/beagle/console/console-config.c
 
 # I2C
-librtemsbsp_a_SOURCES += i2c/bbb-i2c.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/beagle/i2c/bbb-i2c.c
 
 # GPIO
 librtemsbsp_a_SOURCES += gpio/bbb-gpio.c
diff --git a/c/src/lib/libbsp/arm/imx/Makefile.am b/c/src/lib/libbsp/arm/imx/Makefile.am
index b1dd9067ef..3426433800 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 += ../shared/arm-generic-timer-clock-config.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-cp15.c
 
 # I2C
-librtemsbsp_a_SOURCES += i2c/imx-i2c.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/imx/i2c/imx-i2c.c
 
 # SPI
 librtemsbsp_a_SOURCES += spi/imx-ecspi.c
diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
index 1e23b284cb..c1f33ae67f 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
@@ -100,8 +100,8 @@ librtemsbsp_a_SOURCES += misc/timer.c
 librtemsbsp_a_SOURCES += ssp/ssp.c
 
 # I2C
-librtemsbsp_a_SOURCES += i2c/i2c.c
-librtemsbsp_a_SOURCES += i2c/i2c-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc24xx/i2c/i2c.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc24xx/i2c/i2c-config.c
 
 # Framebuffer
 librtemsbsp_a_SOURCES += ../shared/arm-pl111-fb.c
diff --git a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
index 3ac8205474..f11cd6ac48 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
@@ -74,7 +74,7 @@ librtemsbsp_a_SOURCES += rtc/rtc-config.c
 # Misc
 librtemsbsp_a_SOURCES += misc/boot.c
 librtemsbsp_a_SOURCES += misc/emc.c
-librtemsbsp_a_SOURCES += misc/i2c.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc32xx/i2c/i2c.c
 librtemsbsp_a_SOURCES += misc/nand-mlc.c
 librtemsbsp_a_SOURCES += misc/nand-mlc-erase-block-safe.c
 librtemsbsp_a_SOURCES += misc/nand-mlc-read-blocks.c
diff --git a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
index 41e50b1aae..b0b4058746 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
+++ b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
@@ -96,7 +96,7 @@ librtemsbsp_a_SOURCES += gpio/rpi-gpio.c
 # SSP
 
 # I2C
-librtemsbsp_a_SOURCES += i2c/i2c.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/raspberrypi/i2c/i2c.c
 
 # SPI
 librtemsbsp_a_SOURCES += spi/spi.c
diff --git a/c/src/lib/libbsp/arm/stm32f4/Makefile.am b/c/src/lib/libbsp/arm/stm32f4/Makefile.am
index fd159fd6c1..4671386696 100644
--- a/c/src/lib/libbsp/arm/stm32f4/Makefile.am
+++ b/c/src/lib/libbsp/arm/stm32f4/Makefile.am
@@ -60,8 +60,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/stm32f4/console/console-conf
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/stm32f4/console/usart.c
 
 # I2C
-librtemsbsp_a_SOURCES += i2c/i2c.c
-librtemsbsp_a_SOURCES += i2c/i2c-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/stm32f4/i2c/i2c.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/stm32f4/i2c/i2c-config.c
 
 # Clock
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-armv7m.c
diff --git a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
index 0b8a86358d..411819841f 100644
--- a/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
+++ b/c/src/lib/libbsp/arm/xilinx-zynq/Makefile.am
@@ -68,7 +68,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/xilinx-zynq/console/zynq-uar
 librtemsbsp_a_SOURCES += ../shared/arm-a9mpcore-clock-config.c
 
 # I2C
-librtemsbsp_a_SOURCES += i2c/cadence-i2c.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/xilinx-zynq/i2c/cadence-i2c.c
 
 # Cache
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-l2c-310.c
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
index 0b7af1ad0a..c6ff8685c0 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
@@ -35,8 +35,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5206elite/console/console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/printk-dummy.c
 # i2c
-librtemsbsp_a_SOURCES += i2c/i2c.c
-librtemsbsp_a_SOURCES += i2c/i2cdrv.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5206elite/i2c/i2c.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5206elite/i2c/i2cdrv.c
 # tod
 librtemsbsp_a_SOURCES += tod/ds1307.c
 librtemsbsp_a_SOURCES += tod/todcfg.c
diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index 17d49bb96a..afa2c53b00 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -58,9 +58,9 @@ librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/clock.c
 # console
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen5200/console/console.c
 # i2c
-librtemsbsp_a_SOURCES += i2c/i2c.c
-librtemsbsp_a_SOURCES += i2c/i2cdrv.c
-librtemsbsp_a_SOURCES += i2c/mpc5200mbus.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen5200/i2c/i2c.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen5200/i2c/i2cdrv.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen5200/i2c/mpc5200mbus.c
 # ide
 librtemsbsp_a_SOURCES += ide/idecfg.c
 librtemsbsp_a_SOURCES += ide/pcmcia_ide.c
diff --git a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
index 1f99f2c30c..716a0061c2 100644
--- a/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen83xx/Makefile.am
@@ -56,7 +56,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/console-termio
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/console/console-config.c
 
 # bsp_i2c
-librtemsbsp_a_SOURCES += i2c/i2c_init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen83xx/i2c/i2c_init.c
 # bsp_spi
 librtemsbsp_a_SOURCES += spi/spi_init.c
 
diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
index 74ec50343f..3838063aef 100644
--- a/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am
@@ -84,7 +84,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/irq/irq-default-handler.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/start/sd-card-init.c
 
 # I2C
-librtemsbsp_a_SOURCES += i2c/i2c_init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mpc55xxevb/i2c/i2c_init.c
 
 # Network
 if HAS_NETWORKING
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
index f0fdf86cf8..bd453ee559 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
@@ -74,8 +74,8 @@ librtemsbsp_a_SOURCES += ../shared/flash/spansionFlash.c
 librtemsbsp_a_SOURCES += flash/flashcfg.c
 
 # i2c
-librtemsbsp_a_SOURCES += i2c/mpc8540_i2c.c
-librtemsbsp_a_SOURCES += i2c/i2c_init.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme3100/i2c/mpc8540_i2c.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme3100/i2c/i2c_init.c
 
 # vpd
 librtemsbsp_a_SOURCES += ../shared/motorola/vpd.c