Skip to content

Commit 91ba00b

Browse files
committed
stm32/boards: Update board definition for WeAct_H723VG.
Fix review comment on micropython#17766. Signed-off-by: Yuuki NAGAO <wf.yn386@gmail.com>
1 parent 45cfd60 commit 91ba00b

10 files changed

Lines changed: 15 additions & 21 deletions

File tree

ports/stm32/boards/WEACT_STM32H723/bdev.c renamed to ports/stm32/boards/WEACTSTUDIO_MINI_STM32H723/bdev.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
/* This file is part of the MicroPython project, http://micropython.org/
2+
* The MIT License (MIT)
3+
* Copyright (c) 2019 Damien P. George
4+
*/
5+
16
#include "storage.h"
27
#include "spi.h"
38
#include "octospi.h"
49
#include "py/mpconfig.h"
510

6-
#if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
7-
811
static const spi_proto_cfg_t spi_bus = {
912
.spi = &spi_obj[0], // SPI1
1013
.baudrate = 25000000,
@@ -42,5 +45,3 @@ const mp_spiflash_config_t spiflash2_config = {
4245
};
4346

4447
spi_bdev_t spi_bdev2;
45-
46-
#endif

ports/stm32/boards/WEACT_STM32H723/board.json renamed to ports/stm32/boards/WEACTSTUDIO_MINI_STM32H723/board.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"weact_stm32h723.jpg"
88
],
99
"mcu": "STM32H723VGT6",
10-
"product": "WeAct Studio STM32H723",
10+
"product": "Mini STM32H723",
1111
"url": "https://github.com/WeActStudio/MiniSTM32H7xx",
1212
"vendor": "WeAct Studio"
1313
}

ports/stm32/boards/WEACT_STM32H723/board_init.c renamed to ports/stm32/boards/WEACTSTUDIO_MINI_STM32H723/board_init.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/* This file is part of the MicroPython project, http://micropython.org/
2+
* The MIT License (MIT)
3+
* Copyright (c) 2019 Damien P. George
4+
*/
5+
16
#include "py/mphal.h"
27
#include "storage.h"
38

File renamed without changes.
File renamed without changes.

ports/stm32/boards/WEACT_STM32H723/mpconfigboard.h renamed to ports/stm32/boards/WEACTSTUDIO_MINI_STM32H723/mpconfigboard.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#define MICROPY_HW_BOARD_NAME "WEACT_STM32H723"
1+
#define MICROPY_HW_BOARD_NAME "WEACTSTUDIO_MINI_STM32H723"
22
#define MICROPY_HW_MCU_NAME "STM32H723VGT6"
3-
#define MICROPY_HW_FLASH_FS_LABEL "WEACT_STM32H723"
43

54
#define MICROPY_FATFS_EXFAT (1)
65
#define MICROPY_HW_ENABLE_RTC (1)
@@ -27,7 +26,6 @@
2726
// Disable internal filesystem to use spiflash.
2827
#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
2928

30-
#if (MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE == 0)
3129
// W25Q64 for storage
3230
#define MICROPY_HW_SPIFLASH_SIZE_BYTES (8 * 1024 * 1024)
3331

@@ -63,7 +61,6 @@ extern struct _spi_bdev_t spi_bdev;
6361
// SPI flash #2, block device config
6462
extern const struct _mp_spiflash_config_t spiflash2_config;
6563
extern struct _spi_bdev_t spi_bdev2;
66-
#endif
6764

6865
#define MICROPY_BOARD_EARLY_INIT WeAct_Core_early_init
6966

ports/stm32/boards/WEACT_STM32H723/mpconfigboard.mk renamed to ports/stm32/boards/WEACTSTUDIO_MINI_STM32H723/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ LD_FILES = boards/stm32h723.ld boards/common_bl.ld
1212
TEXT0_ADDR = 0x08020000
1313
else
1414
# When not using Mboot everything goes at the start of flash
15-
LD_FILES = boards/WEACT_STM32H723/weact_stm32h723.ld boards/common_basic.ld
15+
LD_FILES = boards/WEACTSTUDIO_MINI_STM32H723/weact_stm32h723.ld boards/common_basic.ld
1616
#LD_FILES = boards/stm32h723.ld boards/common_basic.ld
1717
TEXT0_ADDR = 0x08000000
1818
endif
File renamed without changes.

ports/stm32/boards/WEACT_STM32H723/stm32h7xx_hal_conf.h renamed to ports/stm32/boards/WEACTSTUDIO_MINI_STM32H723/stm32h7xx_hal_conf.h

File renamed without changes.

ports/stm32/boards/WEACT_STM32H723/weact_stm32h723.ld renamed to ports/stm32/boards/WEACTSTUDIO_MINI_STM32H723/weact_stm32h723.ld

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
/* Specify the memory areas */
66
MEMORY
77
{
8-
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 768K /* sectors 0-5 */
9-
FLASH_APP (rx) : ORIGIN = 0x08020000, LENGTH = 640K /* sectors 1-5 */
10-
FLASH_FS (r) : ORIGIN = 0x080c0000, LENGTH = 256K /* sectors 6-7 */
8+
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 1024K /* sectors 0-7 */
9+
FLASH_APP (rx) : ORIGIN = 0x08020000, LENGTH = 896K /* sectors 1-7 */
1110
FLASH_ROMFS (rx): ORIGIN = 0x90000000, LENGTH = 8192K /* external QSPI */
1211
DTCM (xrw) : ORIGIN = 0x20000000, LENGTH = 128K /* Used for FS storage cache */
1312
RAM (xrw) : ORIGIN = 0x24000000, LENGTH = 320K /* AXI SRAM (could extend +192K from ITCM) */
@@ -29,14 +28,6 @@ _ram_end = ORIGIN(RAM) + LENGTH(RAM);
2928
_heap_start = _ebss; /* heap starts just after statically allocated memory */
3029
_heap_end = _sstack;
3130

32-
/* Location of filesystem RAM cache */
33-
_micropy_hw_internal_flash_storage_ram_cache_start = ORIGIN(DTCM);
34-
_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(DTCM) + LENGTH(DTCM);
35-
36-
/* Location of filesystem flash storage */
37-
_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
38-
_micropy_hw_internal_flash_storage_end = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
39-
4031
/* ROMFS location */
4132
_micropy_hw_romfs_part0_start = ORIGIN(FLASH_ROMFS);
4233
_micropy_hw_romfs_part0_size = LENGTH(FLASH_ROMFS);

0 commit comments

Comments
 (0)