summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <[email protected]>2020-09-02 00:46:08 +0700
committerhathach <[email protected]>2020-09-02 00:46:08 +0700
commitc492aef4c7b4dd6ee7b24c30176a570ae6eae043 (patch)
tree9eac3ff95a3eef2c19d01a17d42a075b79c7f0e1
parentf17d6f15e0a63c74376e029822193cbac3e45d7e (diff)
revert to use float-abi
define __USE_CMSIS instead of __USE_LPCOPEN will have startup enable FPU on startup properly. Although it is only relevant to lpx43/40 series, change all to __USE_CMSIS for consistency
-rw-r--r--hw/bsp/ea4088qs/board.mk4
-rw-r--r--hw/bsp/ea4357/board.mk4
-rw-r--r--hw/bsp/lpcxpresso11u37/board.mk2
-rw-r--r--hw/bsp/lpcxpresso11u68/board.mk2
-rw-r--r--hw/bsp/lpcxpresso1347/board.mk2
-rw-r--r--hw/bsp/lpcxpresso1549/board.mk2
-rw-r--r--hw/bsp/lpcxpresso1769/board.mk2
-rw-r--r--hw/bsp/mbed1768/board.mk2
-rw-r--r--hw/bsp/mcb1800/board.mk2
-rw-r--r--hw/bsp/ngx4330/board.mk6
-rw-r--r--src/host/usbh.c2
11 files changed, 17 insertions, 13 deletions
diff --git a/hw/bsp/ea4088qs/board.mk b/hw/bsp/ea4088qs/board.mk
index 950aa484c..2a63d8af2 100644
--- a/hw/bsp/ea4088qs/board.mk
+++ b/hw/bsp/ea4088qs/board.mk
@@ -5,9 +5,9 @@ CFLAGS += \
-mcpu=cortex-m4 \
-nostdlib \
-DCORE_M4 \
- -DCFG_TUSB_MCU=OPT_MCU_LPC40XX \
+ -D__USE_CMSIS \
-DCFG_TUSB_MEM_SECTION='__attribute__((section(".data.$$RAM2")))' \
- -D__USE_LPCOPEN
+ -DCFG_TUSB_MCU=OPT_MCU_LPC40XX
# mcu driver cause following warnings
CFLAGS += -Wno-error=strict-prototypes -Wno-error=unused-parameter
diff --git a/hw/bsp/ea4357/board.mk b/hw/bsp/ea4357/board.mk
index c77ee4536..44481118d 100644
--- a/hw/bsp/ea4357/board.mk
+++ b/hw/bsp/ea4357/board.mk
@@ -3,9 +3,11 @@ CFLAGS += \
-mthumb \
-mabi=aapcs \
-mcpu=cortex-m4 \
+ -mfloat-abi=hard \
+ -mfpu=fpv4-sp-d16 \
-nostdlib \
- -D__USE_LPCOPEN \
-DCORE_M4 \
+ -D__USE_CMSIS \
-DCFG_TUSB_MCU=OPT_MCU_LPC43XX
# mcu driver cause following warnings
diff --git a/hw/bsp/lpcxpresso11u37/board.mk b/hw/bsp/lpcxpresso11u37/board.mk
index d1c48a2e5..27019ff8b 100644
--- a/hw/bsp/lpcxpresso11u37/board.mk
+++ b/hw/bsp/lpcxpresso11u37/board.mk
@@ -5,7 +5,7 @@ CFLAGS += \
-mcpu=cortex-m0 \
-nostdlib \
-DCORE_M0 \
- -D__USE_LPCOPEN \
+ -D__USE_CMSIS \
-DCFG_EXAMPLE_MSC_READONLY \
-DCFG_TUSB_MCU=OPT_MCU_LPC11UXX \
-DCFG_TUSB_MEM_SECTION='__attribute__((section(".data.$$RAM2")))' \
diff --git a/hw/bsp/lpcxpresso11u68/board.mk b/hw/bsp/lpcxpresso11u68/board.mk
index d9017ae1a..1c1660367 100644
--- a/hw/bsp/lpcxpresso11u68/board.mk
+++ b/hw/bsp/lpcxpresso11u68/board.mk
@@ -6,7 +6,7 @@ CFLAGS += \
-nostdlib \
-DCORE_M0PLUS \
-D__VTOR_PRESENT=0 \
- -D__USE_LPCOPEN \
+ -D__USE_CMSIS \
-DCFG_TUSB_MCU=OPT_MCU_LPC11UXX \
-DCFG_TUSB_MEM_SECTION='__attribute__((section(".data.$$RAM3")))' \
-DCFG_TUSB_MEM_ALIGN='__attribute__((aligned(64)))'
diff --git a/hw/bsp/lpcxpresso1347/board.mk b/hw/bsp/lpcxpresso1347/board.mk
index 6dc3937f6..5befc3aee 100644
--- a/hw/bsp/lpcxpresso1347/board.mk
+++ b/hw/bsp/lpcxpresso1347/board.mk
@@ -5,7 +5,7 @@ CFLAGS += \
-mcpu=cortex-m3 \
-nostdlib \
-DCORE_M3 \
- -D__USE_LPCOPEN \
+ -D__USE_CMSIS \
-DCFG_EXAMPLE_MSC_READONLY \
-DCFG_TUSB_MCU=OPT_MCU_LPC13XX \
-DCFG_TUSB_MEM_SECTION='__attribute__((section(".data.$$RAM2")))' \
diff --git a/hw/bsp/lpcxpresso1549/board.mk b/hw/bsp/lpcxpresso1549/board.mk
index 18325c5f7..c603e4b30 100644
--- a/hw/bsp/lpcxpresso1549/board.mk
+++ b/hw/bsp/lpcxpresso1549/board.mk
@@ -5,7 +5,7 @@ CFLAGS += \
-mcpu=cortex-m3 \
-nostdlib \
-DCORE_M3 \
- -D__USE_LPCOPEN \
+ -D__USE_CMSIS \
-DCFG_EXAMPLE_MSC_READONLY \
-DCFG_TUSB_MCU=OPT_MCU_LPC15XX \
-DCFG_TUSB_MEM_ALIGN='__attribute__((aligned(64)))'
diff --git a/hw/bsp/lpcxpresso1769/board.mk b/hw/bsp/lpcxpresso1769/board.mk
index a345e5a27..6886ef749 100644
--- a/hw/bsp/lpcxpresso1769/board.mk
+++ b/hw/bsp/lpcxpresso1769/board.mk
@@ -5,7 +5,7 @@ CFLAGS += \
-mcpu=cortex-m3 \
-nostdlib \
-DCORE_M3 \
- -D__USE_LPCOPEN \
+ -D__USE_CMSIS \
-DCFG_TUSB_MCU=OPT_MCU_LPC175X_6X \
-DRTC_EV_SUPPORT=0
diff --git a/hw/bsp/mbed1768/board.mk b/hw/bsp/mbed1768/board.mk
index 3bdc8a27a..5b23900ff 100644
--- a/hw/bsp/mbed1768/board.mk
+++ b/hw/bsp/mbed1768/board.mk
@@ -5,7 +5,7 @@ CFLAGS += \
-mcpu=cortex-m3 \
-nostdlib \
-DCORE_M3 \
- -D__USE_LPCOPEN \
+ -D__USE_CMSIS \
-DCFG_TUSB_MCU=OPT_MCU_LPC175X_6X \
-DRTC_EV_SUPPORT=0
diff --git a/hw/bsp/mcb1800/board.mk b/hw/bsp/mcb1800/board.mk
index e3f07d0d0..3d3bb2371 100644
--- a/hw/bsp/mcb1800/board.mk
+++ b/hw/bsp/mcb1800/board.mk
@@ -5,7 +5,7 @@ CFLAGS += \
-mcpu=cortex-m3 \
-nostdlib \
-DCORE_M3 \
- -D__USE_LPCOPEN \
+ -D__USE_CMSIS \
-DCFG_TUSB_MCU=OPT_MCU_LPC18XX
# mcu driver cause following warnings
diff --git a/hw/bsp/ngx4330/board.mk b/hw/bsp/ngx4330/board.mk
index df9df63a1..08a877229 100644
--- a/hw/bsp/ngx4330/board.mk
+++ b/hw/bsp/ngx4330/board.mk
@@ -3,10 +3,12 @@ CFLAGS += \
-mthumb \
-mabi=aapcs \
-mcpu=cortex-m4 \
+ -mfloat-abi=hard \
+ -mfpu=fpv4-sp-d16 \
-nostdlib \
-DCORE_M4 \
- -DCFG_TUSB_MCU=OPT_MCU_LPC43XX \
- -D__USE_LPCOPEN
+ -D__USE_CMSIS \
+ -DCFG_TUSB_MCU=OPT_MCU_LPC43XX
# mcu driver cause following warnings
CFLAGS += -Wno-error=strict-prototypes -Wno-error=unused-parameter
diff --git a/src/host/usbh.c b/src/host/usbh.c
index c5f28cf0e..352450588 100644
--- a/src/host/usbh.c
+++ b/src/host/usbh.c
@@ -596,7 +596,7 @@ bool enum_task(hcd_event_t* event)
//------------- parse configuration & install drivers -------------//
uint8_t const* p_desc = _usbh_ctrl_buf + sizeof(tusb_desc_configuration_t);
- TU_LOG2_MEM(_usbh_ctrl_buf, ((tusb_desc_configuration_t*)_usbh_ctrl_buf)->wTotalLength, 0);
+ // TU_LOG2_MEM(_usbh_ctrl_buf, ((tusb_desc_configuration_t*)_usbh_ctrl_buf)->wTotalLength, 0);
// parse each interfaces
while( p_desc < _usbh_ctrl_buf + ((tusb_desc_configuration_t*)_usbh_ctrl_buf)->wTotalLength )