aboutsummaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2018-10-03 13:19:22 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2018-10-03 13:19:22 +0000
commit2dd28213f179c0a6e0a1f889ee19f803df53c42f (patch)
tree537a494ac0c4281fe672aca0055ef5844263f8dd /os
parentf31a721399d17465a96ab32767ffb351540165ce (diff)
downloadChibiOS-2dd28213f179c0a6e0a1f889ee19f803df53c42f.tar.gz
ChibiOS-2dd28213f179c0a6e0a1f889ee19f803df53c42f.tar.bz2
ChibiOS-2dd28213f179c0a6e0a1f889ee19f803df53c42f.zip
Some renaming for consistence.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12319 110e8d01-0319-4d1e-a829-52ad28d1bb01
Diffstat (limited to 'os')
-rw-r--r--os/hal/lib/complex/serial_nor/devices/micron_n25q/micron_n25q.c (renamed from os/hal/lib/complex/serial_nor/devices/micron_n25q/m25q_flash.c)0
-rw-r--r--os/hal/lib/complex/serial_nor/devices/micron_n25q/micron_n25q.h (renamed from os/hal/lib/complex/serial_nor/devices/micron_n25q/m25q_flash.h)0
-rw-r--r--os/hal/lib/complex/serial_nor/devices/micron_n25q/micron_n25q.mk4
-rw-r--r--os/hal/lib/complex/serial_nor/serial_nor.c (renamed from os/hal/lib/complex/serial_nor/m25q.c)0
-rw-r--r--os/hal/lib/complex/serial_nor/serial_nor.h (renamed from os/hal/lib/complex/serial_nor/m25q.h)0
5 files changed, 2 insertions, 2 deletions
diff --git a/os/hal/lib/complex/serial_nor/devices/micron_n25q/m25q_flash.c b/os/hal/lib/complex/serial_nor/devices/micron_n25q/micron_n25q.c
index 4240192fb..4240192fb 100644
--- a/os/hal/lib/complex/serial_nor/devices/micron_n25q/m25q_flash.c
+++ b/os/hal/lib/complex/serial_nor/devices/micron_n25q/micron_n25q.c
diff --git a/os/hal/lib/complex/serial_nor/devices/micron_n25q/m25q_flash.h b/os/hal/lib/complex/serial_nor/devices/micron_n25q/micron_n25q.h
index d29f9439c..d29f9439c 100644
--- a/os/hal/lib/complex/serial_nor/devices/micron_n25q/m25q_flash.h
+++ b/os/hal/lib/complex/serial_nor/devices/micron_n25q/micron_n25q.h
diff --git a/os/hal/lib/complex/serial_nor/devices/micron_n25q/micron_n25q.mk b/os/hal/lib/complex/serial_nor/devices/micron_n25q/micron_n25q.mk
index 5a5e0ea49..143fec675 100644
--- a/os/hal/lib/complex/serial_nor/devices/micron_n25q/micron_n25q.mk
+++ b/os/hal/lib/complex/serial_nor/devices/micron_n25q/micron_n25q.mk
@@ -1,8 +1,8 @@
# List of all the Micron N25Q device files.
M25QSRC := $(CHIBIOS)/os/hal/lib/peripherals/flash/hal_flash.c \
$(CHIBIOS)/os/hal/lib/peripherals/flash/hal_jesd216_flash.c \
- $(CHIBIOS)/os/hal/lib/complex/m25q/m25q.c \
- $(CHIBIOS)/os/hal/lib/complex/m25q/devices/micron_n25q/m25q_flash.c
+ $(CHIBIOS)/os/hal/lib/complex/m25q/serial_nor.c \
+ $(CHIBIOS)/os/hal/lib/complex/m25q/devices/micron_n25q/micron_n25q.c
# Required include directories
M25QINC := $(CHIBIOS)/os/hal/lib/peripherals/flash \
diff --git a/os/hal/lib/complex/serial_nor/m25q.c b/os/hal/lib/complex/serial_nor/serial_nor.c
index b4c0970b7..b4c0970b7 100644
--- a/os/hal/lib/complex/serial_nor/m25q.c
+++ b/os/hal/lib/complex/serial_nor/serial_nor.c
diff --git a/os/hal/lib/complex/serial_nor/m25q.h b/os/hal/lib/complex/serial_nor/serial_nor.h
index d33dd9f48..d33dd9f48 100644
--- a/os/hal/lib/complex/serial_nor/m25q.h
+++ b/os/hal/lib/complex/serial_nor/serial_nor.h