diff options
Diffstat (limited to 'nuttx/arch/arm/src')
| -rw-r--r-- | nuttx/arch/arm/src/armv6-m/Toolchain.defs | 14 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_i2c.c | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/nuttx/arch/arm/src/armv6-m/Toolchain.defs b/nuttx/arch/arm/src/armv6-m/Toolchain.defs index a85a97a3b..7fc4bf9cd 100644 --- a/nuttx/arch/arm/src/armv6-m/Toolchain.defs +++ b/nuttx/arch/arm/src/armv6-m/Toolchain.defs @@ -93,7 +93,7 @@ ifeq ($(CONFIG_ARMV6M_TOOLCHAIN),ATOLLIC) ifneq ($(CONFIG_WINDOWS_NATIVE),y) WINTOOL = y endif - ARCHCPUFLAGS = -mcpu=cortex_m0 -mthumb -march=armv6e-m -mfloat-abi=soft + ARCHCPUFLAGS = -mcpu=cortex-m0 -mthumb -march=armv6-m -mfloat-abi=soft endif # NuttX buildroot under Linux or Cygwin @@ -110,7 +110,7 @@ endif ifeq ($(CONFIG_ARMV6M_TOOLCHAIN),CODEREDL) CROSSDEV ?= arm-none-eabi- ARCROSSDEV ?= arm-none-eabi- - ARCHCPUFLAGS = -mcpu=cortex_m0 -mthumb -march=armv6-m -mfloat-abi=soft + ARCHCPUFLAGS = -mcpu=cortex-m0 -mthumb -march=armv6-m -mfloat-abi=soft endif # Code Red RedSuite under Windows @@ -121,7 +121,7 @@ ifeq ($(CONFIG_ARMV6M_TOOLCHAIN),CODEREDW) ifneq ($(CONFIG_WINDOWS_NATIVE),y) WINTOOL = y endif - ARCHCPUFLAGS = -mcpu=cortex_m0 -mthumb -march=armv6e-m -mfloat-abi=soft + ARCHCPUFLAGS = -mcpu=cortex-m0 -mthumb -march=armv6-m -mfloat-abi=soft endif # CodeSourcery under Linux @@ -129,7 +129,7 @@ endif ifeq ($(CONFIG_ARMV6M_TOOLCHAIN),CODESOURCERYL) CROSSDEV ?= arm-none-eabi- ARCROSSDEV ?= arm-none-eabi- - ARCHCPUFLAGS = -mcpu=cortex-m0 -mthumb -mfloat-abi=soft + ARCHCPUFLAGS = -mcpu=cortex-m0 -mthumb -march=armv6-m -mfloat-abi=soft MAXOPTIMIZATION = -O2 endif @@ -141,7 +141,7 @@ ifeq ($(CONFIG_ARMV6M_TOOLCHAIN),CODESOURCERYW) ifneq ($(CONFIG_WINDOWS_NATIVE),y) WINTOOL = y endif - ARCHCPUFLAGS = -mcpu=cortex-m0 -mthumb -mfloat-abi=soft + ARCHCPUFLAGS = -mcpu=cortex-m0 -mthumb -march=armv6-m -mfloat-abi=soft endif # devkitARM under Windows @@ -152,7 +152,7 @@ ifeq ($(CONFIG_ARMV6M_TOOLCHAIN),DEVKITARM) ifneq ($(CONFIG_WINDOWS_NATIVE),y) WINTOOL = y endif - ARCHCPUFLAGS = -mcpu=cortex-m0 -mthumb -mfloat-abi=soft + ARCHCPUFLAGS = -mcpu=cortex-m0 -mthumb -march=armv6-m -mfloat-abi=soft endif # Generic GNU EABI toolchain on OS X, Linux or any typical Posix system @@ -161,5 +161,5 @@ ifeq ($(CONFIG_ARMV6M_TOOLCHAIN),GNU_EABI) CROSSDEV ?= arm-none-eabi- ARCROSSDEV ?= arm-none-eabi- MAXOPTIMIZATION = -O3 - ARCHCPUFLAGS = -mcpu=cortex_m0 -mthumb -march=armv6e-m -mfloat-abi=soft + ARCHCPUFLAGS = -mcpu=cortex-m0 -mthumb -march=armv6-m -mfloat-abi=soft endif diff --git a/nuttx/arch/arm/src/stm32/stm32_i2c.c b/nuttx/arch/arm/src/stm32/stm32_i2c.c index ee1033635..c56870ee8 100644 --- a/nuttx/arch/arm/src/stm32/stm32_i2c.c +++ b/nuttx/arch/arm/src/stm32/stm32_i2c.c @@ -1989,8 +1989,8 @@ int up_i2creset(FAR struct i2c_dev_s * dev) struct stm32_i2c_priv_s * priv; unsigned int clock_count; unsigned int stretch_count; - unit32_ scl_gpio; - unit32_ sda_gpio; + uint32_t scl_gpio; + uint32_t sda_gpio; int ret = ERROR; ASSERT(dev); |