djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing items

Browse Source
This commit is contained in:
Hierophect 2019-09-23 12:14:27 -04:00
parent 60bb6acf38
commit 19cf716461
7 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/stm32f4/Makefile
View File

@ -88,7 +88,7 @@ else
### CFLAGS += -flto ### CFLAGS += -flto
endif endif
C_DEFS += -DMCU_PACKAGE=$(MCU_PACKAGE) -DUSE_HAL_DRIVER -DUSE_FULL_LL_DRIVER -D$(MCU_SUB_VARIANT) C_DEFS += -DMCU_PACKAGE=$(MCU_PACKAGE) -DUSE_HAL_DRIVER -DUSE_FULL_LL_DRIVER -D$(CMSIS_MCU)
CFLAGS += $(INC) -Werror -Wall -std=gnu11 -nostdlib $(BASE_CFLAGS) $(C_DEFS) $(CFLAGS_MOD) $(COPT) CFLAGS += $(INC) -Werror -Wall -std=gnu11 -nostdlib $(BASE_CFLAGS) $(C_DEFS) $(CFLAGS_MOD) $(COPT)

2
ports/stm32f4/boards/startup_stm32f405xx.s
View File

@ -108,7 +108,7 @@ LoopFillZerobss:
/* Call the clock system intitialization function.*/ /* Call the clock system intitialization function.*/
bl SystemInit bl SystemInit
/* Call static constructors */ /* Call static constructors */
bl __libc_init_array /* bl __libc_init_array */
/* Call the application's entry point.*/ /* Call the application's entry point.*/
bl main bl main
bx lr bx lr

2
ports/stm32f4/boards/stm32f412zg_discovery/mpconfigboard.mk
View File

@ -10,7 +10,7 @@ MCU_SERIES = m4
MCU_VARIANT = stm32f4 MCU_VARIANT = stm32f4
MCU_SUB_VARIANT = stm32f412zx MCU_SUB_VARIANT = stm32f412zx
MCU_PACKAGE = 144 MCU_PACKAGE = 144
CMSIS_MCU = STM32F412xG CMSIS_MCU = STM32F412Zx
LD_FILE = boards/STM32F412ZGTx_FLASH.ld LD_FILE = boards/STM32F412ZGTx_FLASH.ld
TEXT0_ADDR = 0x08000000 TEXT0_ADDR = 0x08000000
TEXT1_ADDR = 0x08020000 TEXT1_ADDR = 0x08020000

6
ports/stm32f4/peripherals/stm32f4/periph.h
View File

@ -65,13 +65,13 @@ typedef struct {
// TODO: SPI, UART, etc // TODO: SPI, UART, etc
// Choose based on chip // Choose based on chip
#ifdef stm32f412zx #ifdef STM32F412Zx
#include "stm32f412zx/periph.h" #include "stm32f412zx/periph.h"
#endif #endif
#ifdef stm32f411xe #ifdef STM32F411xE
#include "stm32f411xe/periph.h" #include "stm32f411xe/periph.h"
#endif #endif
#ifdef stm32f405xx #ifdef STM32F405xx
#include "stm32f405xx/periph.h" #include "stm32f405xx/periph.h"
#endif #endif
#endif // __MICROPY_INCLUDED_STM32F4_PERIPHERALS_PERIPH_H__ #endif // __MICROPY_INCLUDED_STM32F4_PERIPHERALS_PERIPH_H__

6
ports/stm32f4/peripherals/stm32f4/pins.h
View File

@ -77,13 +77,13 @@ extern const mp_obj_type_t mcu_pin_type;
#define NO_PIN 0xff #define NO_PIN 0xff
// Choose based on chip // Choose based on chip
#ifdef stm32f412zx #ifdef STM32F412Zx
#include "stm32f412zx/pins.h" #include "stm32f412zx/pins.h"
#endif #endif
#ifdef stm32f411xe #ifdef STM32F411xE
#include "stm32f411xe/pins.h" #include "stm32f411xe/pins.h"
#endif #endif
#ifdef stm32f405xx #ifdef STM32F405xx
#include "stm32f405xx/pins.h" #include "stm32f405xx/pins.h"
#endif #endif
#endif // __MICROPY_INCLUDED_STM32F4_PERIPHERALS_PINS_H__ #endif // __MICROPY_INCLUDED_STM32F4_PERIPHERALS_PINS_H__

1
ports/stm32f4/peripherals/stm32f4/stm32f405xx/gpio.c
View File

@ -30,7 +30,6 @@
void stm32f4_peripherals_gpio_init(void) { void stm32f4_peripherals_gpio_init(void) {
//Enable all GPIO for now //Enable all GPIO for now
GPIO_InitTypeDef GPIO_InitStruct = {0};
__HAL_RCC_GPIOE_CLK_ENABLE(); __HAL_RCC_GPIOE_CLK_ENABLE();
__HAL_RCC_GPIOC_CLK_ENABLE(); __HAL_RCC_GPIOC_CLK_ENABLE();
__HAL_RCC_GPIOF_CLK_ENABLE(); __HAL_RCC_GPIOF_CLK_ENABLE();

5
ports/stm32f4/supervisor/internal_flash.h
View File

@ -42,6 +42,11 @@
#define INTERNAL_FLASH_FILESYSTEM_SIZE 0xC000 //48KiB #define INTERNAL_FLASH_FILESYSTEM_SIZE 0xC000 //48KiB
#endif #endif
#ifdef STM32F405xx
#define STM32_FLASH_SIZE 0x100000 //1MB
#define INTERNAL_FLASH_FILESYSTEM_SIZE 0xC000 //48KiB
#endif
#define STM32_FLASH_OFFSET 0x8000000 //All STM32 chips map to this flash location #define STM32_FLASH_OFFSET 0x8000000 //All STM32 chips map to this flash location
#define INTERNAL_FLASH_FILESYSTEM_START_ADDR 0x08004000 #define INTERNAL_FLASH_FILESYSTEM_START_ADDR 0x08004000