summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <[email protected]>2019-08-23 23:35:55 +0700
committerhathach <[email protected]>2019-08-23 23:35:55 +0700
commite5e73ed76c71a2ae89437e0df3398a8955f653a6 (patch)
tree3147d4723c68f422a8f133952698e9aaf2bf0355
parent48c7b80c576a921eb84bc5e9548b791b8ca7c24b (diff)
drop board_* in bsp c file
move hw/cmsis to hw/mcu/nordic since only nrf uses it.
-rw-r--r--hw/bsp/ea4088qs/ea4088qs.c (renamed from hw/bsp/ea4088qs/board_ea4088qs.c)0
-rw-r--r--hw/bsp/ea4357/ea4357.c (renamed from hw/bsp/ea4357/board_ea4357.c)0
-rw-r--r--hw/bsp/feather_m4_express/feather_m4_express.c (renamed from hw/bsp/feather_m4_express/board_feather_m4_express.c)0
-rw-r--r--hw/bsp/feather_nrf52840_express/board.mk2
-rw-r--r--hw/bsp/feather_nrf52840_express/feather_nrf52840_express.c (renamed from hw/bsp/feather_nrf52840_express/board_feather_nrf52840_express.c)0
-rw-r--r--hw/bsp/lpcxpresso11u68/lpcxpresso11u68.c (renamed from hw/bsp/lpcxpresso11u68/board_lpcxpresso11u68.c)0
-rw-r--r--hw/bsp/lpcxpresso1347/lpcxpresso1347.c (renamed from hw/bsp/lpcxpresso1347/board_lpcxpresso1347.c)0
-rw-r--r--hw/bsp/lpcxpresso1769/lpcxpresso1769.c (renamed from hw/bsp/lpcxpresso1769/board_lpcxpresso1769.c)0
-rw-r--r--hw/bsp/mcb1800/mcb1800.c (renamed from hw/bsp/mcb1800/board_mcb1800.c)0
-rw-r--r--hw/bsp/metro_m0_express/metro_m0_express.c (renamed from hw/bsp/metro_m0_express/board_metro_m0_express.c)0
-rw-r--r--hw/bsp/metro_m4_express/metro_m4_express.c (renamed from hw/bsp/metro_m4_express/board_metro_m4_express.c)0
-rw-r--r--hw/bsp/pca10056/board.mk2
-rw-r--r--hw/bsp/pca10056/pca10056.c (renamed from hw/bsp/pca10056/board_pca10056.c)0
-rw-r--r--hw/bsp/stm32f303disco/stm32f303disco.c (renamed from hw/bsp/stm32f303disco/board_stm32f303disco.c)0
-rw-r--r--hw/bsp/stm32f407disco/stm32f407disco.c (renamed from hw/bsp/stm32f407disco/board_stm32f407disco.c)0
-rw-r--r--hw/bsp/stm32f411disco/stm32f411disco.c (renamed from hw/bsp/stm32f411disco/board_stm32f411disco.c)0
-rw-r--r--hw/mcu/nordic/cmsis/Include/arm_common_tables.h (renamed from hw/cmsis/Include/arm_common_tables.h)0
-rw-r--r--hw/mcu/nordic/cmsis/Include/arm_const_structs.h (renamed from hw/cmsis/Include/arm_const_structs.h)0
-rw-r--r--hw/mcu/nordic/cmsis/Include/arm_math.h (renamed from hw/cmsis/Include/arm_math.h)0
-rw-r--r--hw/mcu/nordic/cmsis/Include/cmsis_armcc.h (renamed from hw/cmsis/Include/cmsis_armcc.h)0
-rw-r--r--hw/mcu/nordic/cmsis/Include/cmsis_armcc_V6.h (renamed from hw/cmsis/Include/cmsis_armcc_V6.h)0
-rw-r--r--hw/mcu/nordic/cmsis/Include/cmsis_gcc.h (renamed from hw/cmsis/Include/cmsis_gcc.h)0
-rw-r--r--hw/mcu/nordic/cmsis/Include/core_cm0.h (renamed from hw/cmsis/Include/core_cm0.h)0
-rw-r--r--hw/mcu/nordic/cmsis/Include/core_cm0plus.h (renamed from hw/cmsis/Include/core_cm0plus.h)0
-rw-r--r--hw/mcu/nordic/cmsis/Include/core_cm3.h (renamed from hw/cmsis/Include/core_cm3.h)0
-rw-r--r--hw/mcu/nordic/cmsis/Include/core_cm4.h (renamed from hw/cmsis/Include/core_cm4.h)0
-rw-r--r--hw/mcu/nordic/cmsis/Include/core_cm7.h (renamed from hw/cmsis/Include/core_cm7.h)0
-rw-r--r--hw/mcu/nordic/cmsis/Include/core_cmFunc.h (renamed from hw/cmsis/Include/core_cmFunc.h)0
-rw-r--r--hw/mcu/nordic/cmsis/Include/core_cmInstr.h (renamed from hw/cmsis/Include/core_cmInstr.h)0
-rw-r--r--hw/mcu/nordic/cmsis/Include/core_cmSimd.h (renamed from hw/cmsis/Include/core_cmSimd.h)0
-rw-r--r--hw/mcu/nordic/cmsis/Include/core_sc000.h (renamed from hw/cmsis/Include/core_sc000.h)0
-rw-r--r--hw/mcu/nordic/cmsis/Include/core_sc300.h (renamed from hw/cmsis/Include/core_sc300.h)0
-rw-r--r--tools/build_all.py2
33 files changed, 3 insertions, 3 deletions
diff --git a/hw/bsp/ea4088qs/board_ea4088qs.c b/hw/bsp/ea4088qs/ea4088qs.c
index 4e9f930d2..4e9f930d2 100644
--- a/hw/bsp/ea4088qs/board_ea4088qs.c
+++ b/hw/bsp/ea4088qs/ea4088qs.c
diff --git a/hw/bsp/ea4357/board_ea4357.c b/hw/bsp/ea4357/ea4357.c
index 2164d3e09..2164d3e09 100644
--- a/hw/bsp/ea4357/board_ea4357.c
+++ b/hw/bsp/ea4357/ea4357.c
diff --git a/hw/bsp/feather_m4_express/board_feather_m4_express.c b/hw/bsp/feather_m4_express/feather_m4_express.c
index 2261e57b4..2261e57b4 100644
--- a/hw/bsp/feather_m4_express/board_feather_m4_express.c
+++ b/hw/bsp/feather_m4_express/feather_m4_express.c
diff --git a/hw/bsp/feather_nrf52840_express/board.mk b/hw/bsp/feather_nrf52840_express/board.mk
index f89baaaaa..11b5e7bdc 100644
--- a/hw/bsp/feather_nrf52840_express/board.mk
+++ b/hw/bsp/feather_nrf52840_express/board.mk
@@ -21,7 +21,7 @@ SRC_C += \
hw/mcu/nordic/nrfx/mdk/system_nrf52840.c \
INC += \
- $(TOP)/hw/cmsis/Include \
+ $(TOP)/hw/mcu/nordic/cmsis/Include \
$(TOP)/hw/mcu/nordic \
$(TOP)/hw/mcu/nordic/nrfx \
$(TOP)/hw/mcu/nordic/nrfx/mdk \
diff --git a/hw/bsp/feather_nrf52840_express/board_feather_nrf52840_express.c b/hw/bsp/feather_nrf52840_express/feather_nrf52840_express.c
index 27f939e05..27f939e05 100644
--- a/hw/bsp/feather_nrf52840_express/board_feather_nrf52840_express.c
+++ b/hw/bsp/feather_nrf52840_express/feather_nrf52840_express.c
diff --git a/hw/bsp/lpcxpresso11u68/board_lpcxpresso11u68.c b/hw/bsp/lpcxpresso11u68/lpcxpresso11u68.c
index 7f226620e..7f226620e 100644
--- a/hw/bsp/lpcxpresso11u68/board_lpcxpresso11u68.c
+++ b/hw/bsp/lpcxpresso11u68/lpcxpresso11u68.c
diff --git a/hw/bsp/lpcxpresso1347/board_lpcxpresso1347.c b/hw/bsp/lpcxpresso1347/lpcxpresso1347.c
index d389eb798..d389eb798 100644
--- a/hw/bsp/lpcxpresso1347/board_lpcxpresso1347.c
+++ b/hw/bsp/lpcxpresso1347/lpcxpresso1347.c
diff --git a/hw/bsp/lpcxpresso1769/board_lpcxpresso1769.c b/hw/bsp/lpcxpresso1769/lpcxpresso1769.c
index d0a87c0de..d0a87c0de 100644
--- a/hw/bsp/lpcxpresso1769/board_lpcxpresso1769.c
+++ b/hw/bsp/lpcxpresso1769/lpcxpresso1769.c
diff --git a/hw/bsp/mcb1800/board_mcb1800.c b/hw/bsp/mcb1800/mcb1800.c
index 6f1ef4244..6f1ef4244 100644
--- a/hw/bsp/mcb1800/board_mcb1800.c
+++ b/hw/bsp/mcb1800/mcb1800.c
diff --git a/hw/bsp/metro_m0_express/board_metro_m0_express.c b/hw/bsp/metro_m0_express/metro_m0_express.c
index 8c7bd443d..8c7bd443d 100644
--- a/hw/bsp/metro_m0_express/board_metro_m0_express.c
+++ b/hw/bsp/metro_m0_express/metro_m0_express.c
diff --git a/hw/bsp/metro_m4_express/board_metro_m4_express.c b/hw/bsp/metro_m4_express/metro_m4_express.c
index 2abb44b40..2abb44b40 100644
--- a/hw/bsp/metro_m4_express/board_metro_m4_express.c
+++ b/hw/bsp/metro_m4_express/metro_m4_express.c
diff --git a/hw/bsp/pca10056/board.mk b/hw/bsp/pca10056/board.mk
index d8f63690f..9dbaea426 100644
--- a/hw/bsp/pca10056/board.mk
+++ b/hw/bsp/pca10056/board.mk
@@ -21,7 +21,7 @@ SRC_C += \
hw/mcu/nordic/nrfx/mdk/system_nrf52840.c \
INC += \
- $(TOP)/hw/cmsis/Include \
+ $(TOP)/hw/mcu/nordic/cmsis/Include \
$(TOP)/hw/mcu/nordic \
$(TOP)/hw/mcu/nordic/nrfx \
$(TOP)/hw/mcu/nordic/nrfx/mdk \
diff --git a/hw/bsp/pca10056/board_pca10056.c b/hw/bsp/pca10056/pca10056.c
index 3c67d9426..3c67d9426 100644
--- a/hw/bsp/pca10056/board_pca10056.c
+++ b/hw/bsp/pca10056/pca10056.c
diff --git a/hw/bsp/stm32f303disco/board_stm32f303disco.c b/hw/bsp/stm32f303disco/stm32f303disco.c
index c5e1108eb..c5e1108eb 100644
--- a/hw/bsp/stm32f303disco/board_stm32f303disco.c
+++ b/hw/bsp/stm32f303disco/stm32f303disco.c
diff --git a/hw/bsp/stm32f407disco/board_stm32f407disco.c b/hw/bsp/stm32f407disco/stm32f407disco.c
index 6936f2b12..6936f2b12 100644
--- a/hw/bsp/stm32f407disco/board_stm32f407disco.c
+++ b/hw/bsp/stm32f407disco/stm32f407disco.c
diff --git a/hw/bsp/stm32f411disco/board_stm32f411disco.c b/hw/bsp/stm32f411disco/stm32f411disco.c
index cb5983760..cb5983760 100644
--- a/hw/bsp/stm32f411disco/board_stm32f411disco.c
+++ b/hw/bsp/stm32f411disco/stm32f411disco.c
diff --git a/hw/cmsis/Include/arm_common_tables.h b/hw/mcu/nordic/cmsis/Include/arm_common_tables.h
index 8742a5699..8742a5699 100644
--- a/hw/cmsis/Include/arm_common_tables.h
+++ b/hw/mcu/nordic/cmsis/Include/arm_common_tables.h
diff --git a/hw/cmsis/Include/arm_const_structs.h b/hw/mcu/nordic/cmsis/Include/arm_const_structs.h
index 726d06eb6..726d06eb6 100644
--- a/hw/cmsis/Include/arm_const_structs.h
+++ b/hw/mcu/nordic/cmsis/Include/arm_const_structs.h
diff --git a/hw/cmsis/Include/arm_math.h b/hw/mcu/nordic/cmsis/Include/arm_math.h
index d33f8a9b3..d33f8a9b3 100644
--- a/hw/cmsis/Include/arm_math.h
+++ b/hw/mcu/nordic/cmsis/Include/arm_math.h
diff --git a/hw/cmsis/Include/cmsis_armcc.h b/hw/mcu/nordic/cmsis/Include/cmsis_armcc.h
index 74c49c67d..74c49c67d 100644
--- a/hw/cmsis/Include/cmsis_armcc.h
+++ b/hw/mcu/nordic/cmsis/Include/cmsis_armcc.h
diff --git a/hw/cmsis/Include/cmsis_armcc_V6.h b/hw/mcu/nordic/cmsis/Include/cmsis_armcc_V6.h
index cd13240ce..cd13240ce 100644
--- a/hw/cmsis/Include/cmsis_armcc_V6.h
+++ b/hw/mcu/nordic/cmsis/Include/cmsis_armcc_V6.h
diff --git a/hw/cmsis/Include/cmsis_gcc.h b/hw/mcu/nordic/cmsis/Include/cmsis_gcc.h
index bb89fbba9..bb89fbba9 100644
--- a/hw/cmsis/Include/cmsis_gcc.h
+++ b/hw/mcu/nordic/cmsis/Include/cmsis_gcc.h
diff --git a/hw/cmsis/Include/core_cm0.h b/hw/mcu/nordic/cmsis/Include/core_cm0.h
index 711dad551..711dad551 100644
--- a/hw/cmsis/Include/core_cm0.h
+++ b/hw/mcu/nordic/cmsis/Include/core_cm0.h
diff --git a/hw/cmsis/Include/core_cm0plus.h b/hw/mcu/nordic/cmsis/Include/core_cm0plus.h
index b04aa3905..b04aa3905 100644
--- a/hw/cmsis/Include/core_cm0plus.h
+++ b/hw/mcu/nordic/cmsis/Include/core_cm0plus.h
diff --git a/hw/cmsis/Include/core_cm3.h b/hw/mcu/nordic/cmsis/Include/core_cm3.h
index b4ac4c7b0..b4ac4c7b0 100644
--- a/hw/cmsis/Include/core_cm3.h
+++ b/hw/mcu/nordic/cmsis/Include/core_cm3.h
diff --git a/hw/cmsis/Include/core_cm4.h b/hw/mcu/nordic/cmsis/Include/core_cm4.h
index dc840ebf2..dc840ebf2 100644
--- a/hw/cmsis/Include/core_cm4.h
+++ b/hw/mcu/nordic/cmsis/Include/core_cm4.h
diff --git a/hw/cmsis/Include/core_cm7.h b/hw/mcu/nordic/cmsis/Include/core_cm7.h
index 3b7530ad5..3b7530ad5 100644
--- a/hw/cmsis/Include/core_cm7.h
+++ b/hw/mcu/nordic/cmsis/Include/core_cm7.h
diff --git a/hw/cmsis/Include/core_cmFunc.h b/hw/mcu/nordic/cmsis/Include/core_cmFunc.h
index 652a48af0..652a48af0 100644
--- a/hw/cmsis/Include/core_cmFunc.h
+++ b/hw/mcu/nordic/cmsis/Include/core_cmFunc.h
diff --git a/hw/cmsis/Include/core_cmInstr.h b/hw/mcu/nordic/cmsis/Include/core_cmInstr.h
index f474b0e6f..f474b0e6f 100644
--- a/hw/cmsis/Include/core_cmInstr.h
+++ b/hw/mcu/nordic/cmsis/Include/core_cmInstr.h
diff --git a/hw/cmsis/Include/core_cmSimd.h b/hw/mcu/nordic/cmsis/Include/core_cmSimd.h
index 66bf5c2a7..66bf5c2a7 100644
--- a/hw/cmsis/Include/core_cmSimd.h
+++ b/hw/mcu/nordic/cmsis/Include/core_cmSimd.h
diff --git a/hw/cmsis/Include/core_sc000.h b/hw/mcu/nordic/cmsis/Include/core_sc000.h
index 514dbd81b..514dbd81b 100644
--- a/hw/cmsis/Include/core_sc000.h
+++ b/hw/mcu/nordic/cmsis/Include/core_sc000.h
diff --git a/hw/cmsis/Include/core_sc300.h b/hw/mcu/nordic/cmsis/Include/core_sc300.h
index 8bd18aa31..8bd18aa31 100644
--- a/hw/cmsis/Include/core_sc300.h
+++ b/hw/mcu/nordic/cmsis/Include/core_sc300.h
diff --git a/tools/build_all.py b/tools/build_all.py
index 9efd79fe2..9c379d0dc 100644
--- a/tools/build_all.py
+++ b/tools/build_all.py
@@ -51,7 +51,7 @@ for example in all_examples:
if build_result.returncode != 0:
exit_status = build_result.returncode
- success = "\033[31mfailed\033[0m"
+ success = "\033[31mfailed\033[0m "
fail_count += 1
else:
success = "\033[32msucceeded\033[0m"