From 5ebf57e2afd2c590c33595d2711ec7fd650d075b Mon Sep 17 00:00:00 2001 From: Michal Lenc Date: Sat, 27 Jun 2026 15:30:14 +0200 Subject: [PATCH] can: move drivers from cpukit to bsps/shared Move CAN controllers from cputik to bsps/shared directory. This will allow to use BSP level interface which may be needed for some controllers. Generic CAN stack implementation is still kept in the original directory as this shoudl be independent from the low level driver interface. Signed-off-by: Michal Lenc --- {cpukit => bsps}/include/dev/can/can-virtual.h | 0 {cpukit => bsps}/include/dev/can/ctucanfd.h | 0 {cpukit => bsps}/include/dev/can/sja1000.h | 0 {cpukit => bsps/shared}/dev/can/can-virtual.c | 0 {cpukit => bsps/shared}/dev/can/ctucanfd/ctucanfd.c | 0 .../shared}/dev/can/ctucanfd/ctucanfd_internal.h | 0 .../shared}/dev/can/ctucanfd/ctucanfd_kframe.h | 0 {cpukit => bsps/shared}/dev/can/ctucanfd/ctucanfd_kregs.h | 0 {cpukit => bsps/shared}/dev/can/ctucanfd/ctucanfd_txb.h | 0 {cpukit => bsps/shared}/dev/can/sja1000/sja1000.c | 0 {cpukit => bsps/shared}/dev/can/sja1000/sja1000_regs.h | 0 spec/build/bsps/obj.yml | 8 ++++++++ spec/build/cpukit/librtemscpu.yml | 6 ------ 13 files changed, 8 insertions(+), 6 deletions(-) rename {cpukit => bsps}/include/dev/can/can-virtual.h (100%) rename {cpukit => bsps}/include/dev/can/ctucanfd.h (100%) rename {cpukit => bsps}/include/dev/can/sja1000.h (100%) rename {cpukit => bsps/shared}/dev/can/can-virtual.c (100%) rename {cpukit => bsps/shared}/dev/can/ctucanfd/ctucanfd.c (100%) rename {cpukit => bsps/shared}/dev/can/ctucanfd/ctucanfd_internal.h (100%) rename {cpukit => bsps/shared}/dev/can/ctucanfd/ctucanfd_kframe.h (100%) rename {cpukit => bsps/shared}/dev/can/ctucanfd/ctucanfd_kregs.h (100%) rename {cpukit => bsps/shared}/dev/can/ctucanfd/ctucanfd_txb.h (100%) rename {cpukit => bsps/shared}/dev/can/sja1000/sja1000.c (100%) rename {cpukit => bsps/shared}/dev/can/sja1000/sja1000_regs.h (100%) diff --git a/cpukit/include/dev/can/can-virtual.h b/bsps/include/dev/can/can-virtual.h similarity index 100% rename from cpukit/include/dev/can/can-virtual.h rename to bsps/include/dev/can/can-virtual.h diff --git a/cpukit/include/dev/can/ctucanfd.h b/bsps/include/dev/can/ctucanfd.h similarity index 100% rename from cpukit/include/dev/can/ctucanfd.h rename to bsps/include/dev/can/ctucanfd.h diff --git a/cpukit/include/dev/can/sja1000.h b/bsps/include/dev/can/sja1000.h similarity index 100% rename from cpukit/include/dev/can/sja1000.h rename to bsps/include/dev/can/sja1000.h diff --git a/cpukit/dev/can/can-virtual.c b/bsps/shared/dev/can/can-virtual.c similarity index 100% rename from cpukit/dev/can/can-virtual.c rename to bsps/shared/dev/can/can-virtual.c diff --git a/cpukit/dev/can/ctucanfd/ctucanfd.c b/bsps/shared/dev/can/ctucanfd/ctucanfd.c similarity index 100% rename from cpukit/dev/can/ctucanfd/ctucanfd.c rename to bsps/shared/dev/can/ctucanfd/ctucanfd.c diff --git a/cpukit/dev/can/ctucanfd/ctucanfd_internal.h b/bsps/shared/dev/can/ctucanfd/ctucanfd_internal.h similarity index 100% rename from cpukit/dev/can/ctucanfd/ctucanfd_internal.h rename to bsps/shared/dev/can/ctucanfd/ctucanfd_internal.h diff --git a/cpukit/dev/can/ctucanfd/ctucanfd_kframe.h b/bsps/shared/dev/can/ctucanfd/ctucanfd_kframe.h similarity index 100% rename from cpukit/dev/can/ctucanfd/ctucanfd_kframe.h rename to bsps/shared/dev/can/ctucanfd/ctucanfd_kframe.h diff --git a/cpukit/dev/can/ctucanfd/ctucanfd_kregs.h b/bsps/shared/dev/can/ctucanfd/ctucanfd_kregs.h similarity index 100% rename from cpukit/dev/can/ctucanfd/ctucanfd_kregs.h rename to bsps/shared/dev/can/ctucanfd/ctucanfd_kregs.h diff --git a/cpukit/dev/can/ctucanfd/ctucanfd_txb.h b/bsps/shared/dev/can/ctucanfd/ctucanfd_txb.h similarity index 100% rename from cpukit/dev/can/ctucanfd/ctucanfd_txb.h rename to bsps/shared/dev/can/ctucanfd/ctucanfd_txb.h diff --git a/cpukit/dev/can/sja1000/sja1000.c b/bsps/shared/dev/can/sja1000/sja1000.c similarity index 100% rename from cpukit/dev/can/sja1000/sja1000.c rename to bsps/shared/dev/can/sja1000/sja1000.c diff --git a/cpukit/dev/can/sja1000/sja1000_regs.h b/bsps/shared/dev/can/sja1000/sja1000_regs.h similarity index 100% rename from cpukit/dev/can/sja1000/sja1000_regs.h rename to bsps/shared/dev/can/sja1000/sja1000_regs.h diff --git a/spec/build/bsps/obj.yml b/spec/build/bsps/obj.yml index 923fcd7849..2b36aa2292 100644 --- a/spec/build/bsps/obj.yml +++ b/spec/build/bsps/obj.yml @@ -70,6 +70,11 @@ install: source: - bsps/include/arm/ti/ti_pinmux.h - bsps/include/arm/ti/ti_cpuid.h +- destination: ${BSP_INCLUDEDIR}/dev/can + source: + - bsps/include/dev/can/can-virtual.h + - bsps/include/dev/can/ctucanfd.h + - bsps/include/dev/can/sja1000.h links: - role: build-dependency uid: objmpci @@ -80,6 +85,9 @@ links: - role: build-dependency uid: optclkfastidle source: +- bsps/shared/dev/can/can-virtual.c +- bsps/shared/dev/can/ctucanfd/ctucanfd.c +- bsps/shared/dev/can/sja1000/sja1000.c - bsps/shared/dev/display/disp_hcms29xx.c - bsps/shared/dev/display/font_hcms29xx.c - bsps/shared/dev/flash/flash_sim_flashdev.c diff --git a/spec/build/cpukit/librtemscpu.yml b/spec/build/cpukit/librtemscpu.yml index 68d9aa1640..9b15917d59 100644 --- a/spec/build/cpukit/librtemscpu.yml +++ b/spec/build/cpukit/librtemscpu.yml @@ -46,10 +46,7 @@ install: - cpukit/include/dev/can/can-impl.h - cpukit/include/dev/can/can-queue.h - cpukit/include/dev/can/can-stats.h - - cpukit/include/dev/can/can-virtual.h - cpukit/include/dev/can/can.h - - cpukit/include/dev/can/ctucanfd.h - - cpukit/include/dev/can/sja1000.h - destination: ${BSP_INCLUDEDIR}/dev/i2c source: - cpukit/include/dev/i2c/eeprom.h @@ -556,9 +553,6 @@ source: - cpukit/dev/can/can-devcommon.c - cpukit/dev/can/can-quekern.c - cpukit/dev/can/can-queue.c -- cpukit/dev/can/can-virtual.c -- cpukit/dev/can/ctucanfd/ctucanfd.c -- cpukit/dev/can/sja1000/sja1000.c - cpukit/dev/contrib/iovprintf.c - cpukit/dev/flash/flashdev.c - cpukit/dev/i2c/eeprom.c