[rtems commit] bsps: Move RTC drivers to bsps

Sebastian Huber sebh at rtems.org
Mon Apr 23 13:20:52 UTC 2018 

Module:    rtems
Branch:    master
Commit:    4fb1b79a804ca8de866be0ef718e54e1f62fa3ec
Changeset: http://git.rtems.org/rtems/commit/?id=4fb1b79a804ca8de866be0ef718e54e1f62fa3ec

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Mon Apr 23 09:55:15 2018 +0200

bsps: Move RTC drivers to bsps

This patch is a part of the BSP source reorganization.

Update #3285.

---

 {c/src/lib/libbsp => bsps}/arm/altera-cyclone-v/rtc/rtc.c             | 0
 {c/src/lib/libbsp => bsps}/arm/atsam/rtc/rtc-config.c                 | 0
 {c/src/lib/libbsp => bsps}/arm/lpc176x/rtc/rtc-config.c               | 0
 {c/src/lib/libbsp => bsps}/arm/lpc24xx/rtc/rtc-config.c               | 0
 {c/src/lib/libbsp => bsps}/arm/lpc32xx/rtc/rtc-config.c               | 0
 .../m68k/mcf5206elite/tod => bsps/m68k/mcf5206elite/rtc}/ds1307.c     | 0
 .../m68k/mcf5206elite/tod => bsps/m68k/mcf5206elite/rtc}/todcfg.c     | 0
 {c/src/lib/libbsp/m68k/mvme162/tod => bsps/m68k/mvme162/rtc}/tod.c    | 0
 .../libbsp/powerpc/beatnik/tod => bsps/powerpc/beatnik/rtc}/todcfg.c  | 0
 .../libbsp/powerpc/gen5200/tod => bsps/powerpc/gen5200/rtc}/pcf8563.c | 2 +-
 .../libbsp/powerpc/gen5200/tod => bsps/powerpc/gen5200/rtc}/pcf8563.h | 0
 .../libbsp/powerpc/gen5200/tod => bsps/powerpc/gen5200/rtc}/todcfg.c  | 2 +-
 .../powerpc/mvme3100/tod => bsps/powerpc/mvme3100/rtc}/todcfg.c       | 0
 .../powerpc/mvme5500/tod => bsps/powerpc/mvme5500/rtc}/todcfg.c       | 0
 {c/src/lib/libbsp => bsps}/powerpc/qoriq/rtc/rtc-config.c             | 0
 .../libbsp/powerpc/shared/tod => bsps/powerpc/shared/rtc}/todcfg.c    | 0
 c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am                     | 2 +-
 c/src/lib/libbsp/arm/atsam/Makefile.am                                | 2 +-
 c/src/lib/libbsp/arm/lpc176x/Makefile.am                              | 2 +-
 c/src/lib/libbsp/arm/lpc24xx/Makefile.am                              | 2 +-
 c/src/lib/libbsp/arm/lpc32xx/Makefile.am                              | 2 +-
 c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am                        | 4 ++--
 c/src/lib/libbsp/m68k/mvme162/Makefile.am                             | 2 +-
 c/src/lib/libbsp/powerpc/beatnik/Makefile.am                          | 2 +-
 c/src/lib/libbsp/powerpc/gen5200/Makefile.am                          | 4 ++--
 c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am                 | 2 +-
 c/src/lib/libbsp/powerpc/mvme3100/Makefile.am                         | 2 +-
 c/src/lib/libbsp/powerpc/mvme5500/Makefile.am                         | 2 +-
 c/src/lib/libbsp/powerpc/qoriq/Makefile.am                            | 2 +-
 29 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/c/src/lib/libbsp/arm/altera-cyclone-v/rtc/rtc.c b/bsps/arm/altera-cyclone-v/rtc/rtc.c
similarity index 100%
rename from c/src/lib/libbsp/arm/altera-cyclone-v/rtc/rtc.c
rename to bsps/arm/altera-cyclone-v/rtc/rtc.c
diff --git a/c/src/lib/libbsp/arm/atsam/rtc/rtc-config.c b/bsps/arm/atsam/rtc/rtc-config.c
similarity index 100%
rename from c/src/lib/libbsp/arm/atsam/rtc/rtc-config.c
rename to bsps/arm/atsam/rtc/rtc-config.c
diff --git a/c/src/lib/libbsp/arm/lpc176x/rtc/rtc-config.c b/bsps/arm/lpc176x/rtc/rtc-config.c
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc176x/rtc/rtc-config.c
rename to bsps/arm/lpc176x/rtc/rtc-config.c
diff --git a/c/src/lib/libbsp/arm/lpc24xx/rtc/rtc-config.c b/bsps/arm/lpc24xx/rtc/rtc-config.c
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc24xx/rtc/rtc-config.c
rename to bsps/arm/lpc24xx/rtc/rtc-config.c
diff --git a/c/src/lib/libbsp/arm/lpc32xx/rtc/rtc-config.c b/bsps/arm/lpc32xx/rtc/rtc-config.c
similarity index 100%
rename from c/src/lib/libbsp/arm/lpc32xx/rtc/rtc-config.c
rename to bsps/arm/lpc32xx/rtc/rtc-config.c
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/tod/ds1307.c b/bsps/m68k/mcf5206elite/rtc/ds1307.c
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf5206elite/tod/ds1307.c
rename to bsps/m68k/mcf5206elite/rtc/ds1307.c
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/tod/todcfg.c b/bsps/m68k/mcf5206elite/rtc/todcfg.c
similarity index 100%
rename from c/src/lib/libbsp/m68k/mcf5206elite/tod/todcfg.c
rename to bsps/m68k/mcf5206elite/rtc/todcfg.c
diff --git a/c/src/lib/libbsp/m68k/mvme162/tod/tod.c b/bsps/m68k/mvme162/rtc/tod.c
similarity index 100%
rename from c/src/lib/libbsp/m68k/mvme162/tod/tod.c
rename to bsps/m68k/mvme162/rtc/tod.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/tod/todcfg.c b/bsps/powerpc/beatnik/rtc/todcfg.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/beatnik/tod/todcfg.c
rename to bsps/powerpc/beatnik/rtc/todcfg.c
diff --git a/c/src/lib/libbsp/powerpc/gen5200/tod/pcf8563.c b/bsps/powerpc/gen5200/rtc/pcf8563.c
similarity index 99%
rename from c/src/lib/libbsp/powerpc/gen5200/tod/pcf8563.c
rename to bsps/powerpc/gen5200/rtc/pcf8563.c
index eb3d758..e41e3b4 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/tod/pcf8563.c
+++ b/bsps/powerpc/gen5200/rtc/pcf8563.c
@@ -45,7 +45,7 @@
 #include <bsp/i2c.h>
 #include <libchip/rtc.h>
 #include <string.h>
-#include "../tod/pcf8563.h"
+#include "pcf8563.h"
 
 /* Convert from/to Binary-Coded Decimal representation */
 #define From_BCD( _x ) ((((_x) >> 4) * 10) + ((_x) & 0x0F))
diff --git a/c/src/lib/libbsp/powerpc/gen5200/tod/pcf8563.h b/bsps/powerpc/gen5200/rtc/pcf8563.h
similarity index 100%
rename from c/src/lib/libbsp/powerpc/gen5200/tod/pcf8563.h
rename to bsps/powerpc/gen5200/rtc/pcf8563.h
diff --git a/c/src/lib/libbsp/powerpc/gen5200/tod/todcfg.c b/bsps/powerpc/gen5200/rtc/todcfg.c
similarity index 99%
rename from c/src/lib/libbsp/powerpc/gen5200/tod/todcfg.c
rename to bsps/powerpc/gen5200/rtc/todcfg.c
index 6db222b..076de70 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/tod/todcfg.c
+++ b/bsps/powerpc/gen5200/rtc/todcfg.c
@@ -35,7 +35,7 @@
 #include <bsp.h>
 #include <bsp/i2c.h>
 #include <libchip/rtc.h>
-#include "../tod/pcf8563.h"
+#include "pcf8563.h"
 
 /* Forward function declaration */
 bool mpc5200_pcf8563_probe(int minor);
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/tod/todcfg.c b/bsps/powerpc/mvme3100/rtc/todcfg.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme3100/tod/todcfg.c
rename to bsps/powerpc/mvme3100/rtc/todcfg.c
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/tod/todcfg.c b/bsps/powerpc/mvme5500/rtc/todcfg.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/mvme5500/tod/todcfg.c
rename to bsps/powerpc/mvme5500/rtc/todcfg.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/rtc/rtc-config.c b/bsps/powerpc/qoriq/rtc/rtc-config.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/qoriq/rtc/rtc-config.c
rename to bsps/powerpc/qoriq/rtc/rtc-config.c
diff --git a/c/src/lib/libbsp/powerpc/shared/tod/todcfg.c b/bsps/powerpc/shared/rtc/todcfg.c
similarity index 100%
rename from c/src/lib/libbsp/powerpc/shared/tod/todcfg.c
rename to bsps/powerpc/shared/rtc/todcfg.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 1b9f584..520d762 100644
--- a/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
+++ b/c/src/lib/libbsp/arm/altera-cyclone-v/Makefile.am
@@ -81,7 +81,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/altera-cyclone-v/i2c/i2cdrv.
 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
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/altera-cyclone-v/rtc/rtc.c
 
 # Cache
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-l2c-310.c
diff --git a/c/src/lib/libbsp/arm/atsam/Makefile.am b/c/src/lib/libbsp/arm/atsam/Makefile.am
index 3a30308..dd14795 100644
--- a/c/src/lib/libbsp/arm/atsam/Makefile.am
+++ b/c/src/lib/libbsp/arm/atsam/Makefile.am
@@ -141,7 +141,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/spi/sc16is752.c
 
 # RTC
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
-librtemsbsp_a_SOURCES += rtc/rtc-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/rtc/rtc-config.c
 
 # Helper functions
 librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/atsam/start/iocopy.c
diff --git a/c/src/lib/libbsp/arm/lpc176x/Makefile.am b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
index 383bbfd..98ba911 100644
--- a/c/src/lib/libbsp/arm/lpc176x/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc176x/Makefile.am
@@ -69,7 +69,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-armv7m.c
 
 # RTC
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
-librtemsbsp_a_SOURCES += rtc/rtc-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc176x/rtc/rtc-config.c
 
 # GPIO
 librtemsbsp_a_SOURCES += gpio/lpc-gpio.c
diff --git a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
index 3610584..e6d78e8 100644
--- a/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc24xx/Makefile.am
@@ -84,7 +84,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-armv7m.c
 
 # RTC
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
-librtemsbsp_a_SOURCES += rtc/rtc-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc24xx/rtc/rtc-config.c
 
 # Misc
 librtemsbsp_a_SOURCES += misc/system-clocks.c
diff --git a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
index 9353f67..4a37075 100644
--- a/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/lpc32xx/Makefile.am
@@ -69,7 +69,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-nxp-lpc.c
 
 # RTC
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
-librtemsbsp_a_SOURCES += rtc/rtc-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/lpc32xx/rtc/rtc-config.c
 
 # Misc
 librtemsbsp_a_SOURCES += misc/boot.c
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
index c6ff868..b05c381 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/Makefile.am
@@ -38,8 +38,8 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/serial/printk-dummy.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
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5206elite/rtc/ds1307.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mcf5206elite/rtc/todcfg.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
 # nvram
 librtemsbsp_a_SOURCES += nvram/nvram.c
diff --git a/c/src/lib/libbsp/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
index cfc1466..de63e7a 100644
--- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
@@ -36,7 +36,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme162/console/console.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme162/btimer/btimer.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme162/btimer/timerisr.S
 # tod
-librtemsbsp_a_SOURCES += tod/tod.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme162/rtc/tod.c
 
 if HAS_NETWORKING
 librtemsbsp_a_SOURCES += ../../../../../../bsps/m68k/mvme167/net/network.c
diff --git a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
index 4de5536..e49d991 100644
--- a/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/beatnik/Makefile.am
@@ -96,7 +96,7 @@ endif
 
 # tod
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
-librtemsbsp_a_SOURCES += tod/todcfg.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/beatnik/rtc/todcfg.c
 
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/altivec/vec_sup_asm.S
diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index f72583a..d4801ec 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -82,8 +82,8 @@ librtemsbsp_a_SOURCES += nvram/nvram.c
 librtemsbsp_a_SOURCES += slicetimer/slicetimer.c
 
 # tod
-librtemsbsp_a_SOURCES += tod/todcfg.c
-librtemsbsp_a_SOURCES += tod/pcf8563.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen5200/rtc/todcfg.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/gen5200/rtc/pcf8563.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
 
 # startup
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index 43bb7a7..0ebc88d 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -49,7 +49,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/motorola_powerpc/start/b
 
 # tod
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
-librtemsbsp_a_SOURCES += ../shared/tod/todcfg.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/rtc/todcfg.c
 # pclock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/p_clock.c
 
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
index 88b1f81..1c3a18e 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme3100/Makefile.am
@@ -47,7 +47,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspfatal-default.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bspreset-empty.c
 # tod
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
-librtemsbsp_a_SOURCES += tod/todcfg.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme3100/rtc/todcfg.c
 # pclock
 librtemsbsp_a_SOURCES +=../../../../../../bsps/powerpc/shared/clock/p_clock.c
 
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
index 6344139..a3cfcfb 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mvme5500/Makefile.am
@@ -44,7 +44,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme5500/irq/BSP_irq.c
 
 # tod
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
-librtemsbsp_a_SOURCES += tod/todcfg.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/mvme5500/rtc/todcfg.c
 
 # vectors
 librtemsbsp_a_SOURCES += vectors/exceptionhandler.c
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
index abc6e01..a257693 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
@@ -73,7 +73,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/console/console-co
 
 # RTC
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/rtc/rtc-support.c
-librtemsbsp_a_SOURCES += rtc/rtc-config.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/rtc/rtc-config.c
 
 # MPCI
 librtemsbsp_a_SOURCES += ../../../../../../bsps/powerpc/qoriq/mpci/lock.S

More information about the vc mailing list