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

mimxrt: Remove SDCARD Makefile config option. 

This is option is no longer needed as a Makefile option as the USDHC driver
is enabled for all supported series.

Signed-off-by: iabdalkader <i.abdalkader@gmail.com>
This commit is contained in:
iabdalkader 2023-09-05 15:19:46 +02:00 committed by Damien George
parent 9d1a1ed42d
commit 552b0bbe12
20 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/mimxrt/Makefile
View File

@ -331,7 +331,6 @@ endif
# Set default values for optional variables # Set default values for optional variables
MICROPY_HW_SDRAM_AVAIL ?= 0 MICROPY_HW_SDRAM_AVAIL ?= 0
MICROPY_HW_SDRAM_SIZE ?= 0 MICROPY_HW_SDRAM_SIZE ?= 0
MICROPY_PY_MACHINE_SDCARD ?= 0
# Configure default compiler flags # Configure default compiler flags
CFLAGS += \ CFLAGS += \
@ -351,7 +350,6 @@ CFLAGS += \
-DMICROPY_HW_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE) \ -DMICROPY_HW_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE) \
-DMICROPY_HW_SDRAM_AVAIL=$(MICROPY_HW_SDRAM_AVAIL) \ -DMICROPY_HW_SDRAM_AVAIL=$(MICROPY_HW_SDRAM_AVAIL) \
-DMICROPY_HW_SDRAM_SIZE=$(MICROPY_HW_SDRAM_SIZE) \ -DMICROPY_HW_SDRAM_SIZE=$(MICROPY_HW_SDRAM_SIZE) \
-DMICROPY_PY_MACHINE_SDCARD=$(MICROPY_PY_MACHINE_SDCARD) \
-DSPI_RETRY_TIMES=1000000 \ -DSPI_RETRY_TIMES=1000000 \
-DUART_RETRY_TIMES=1000000 \ -DUART_RETRY_TIMES=1000000 \
-DXIP_BOOT_HEADER_ENABLE=1 \ -DXIP_BOOT_HEADER_ENABLE=1 \

1
ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.h
View File

@ -7,6 +7,7 @@
#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin)) #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
#define MICROPY_HW_NUM_PIN_IRQS (2 * 32) #define MICROPY_HW_NUM_PIN_IRQS (2 * 32)
#define MICROPY_HW_ENABLE_SDCARD (0)
// Define mapping logical UART # to hardware UART # // Define mapping logical UART # to hardware UART #
// LPUART1 on USB_DBG -> 0 // LPUART1 on USB_DBG -> 0

1
ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ MCU_SERIES = MIMXRT1011
MCU_VARIANT = MIMXRT1011DAE5A MCU_VARIANT = MIMXRT1011DAE5A
MICROPY_FLOAT_IMPL = single MICROPY_FLOAT_IMPL = single
MICROPY_PY_MACHINE_SDCARD = 0
MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
MICROPY_HW_FLASH_SIZE ?= 0x800000 # 8MB MICROPY_HW_FLASH_SIZE ?= 0x800000 # 8MB

1
ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
View File

@ -7,6 +7,7 @@
#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin)) #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
#define MICROPY_HW_NUM_PIN_IRQS (2 * 32) #define MICROPY_HW_NUM_PIN_IRQS (2 * 32)
#define MICROPY_HW_ENABLE_SDCARD (0)
// Define mapping logical UART # to hardware UART # // Define mapping logical UART # to hardware UART #
// LPUART1 on USB_DBG -> 0 // LPUART1 on USB_DBG -> 0

1
ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ MCU_SERIES = MIMXRT1011
MCU_VARIANT = MIMXRT1011DAE5A MCU_VARIANT = MIMXRT1011DAE5A
MICROPY_FLOAT_IMPL = single MICROPY_FLOAT_IMPL = single
MICROPY_PY_MACHINE_SDCARD = 0
MICROPY_HW_FLASH_TYPE = qspi_nor_flash MICROPY_HW_FLASH_TYPE = qspi_nor_flash
MICROPY_HW_FLASH_SIZE = 0x1000000 # 16MB MICROPY_HW_FLASH_SIZE = 0x1000000 # 16MB

1
ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.h
View File

@ -10,6 +10,7 @@
#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin)) #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
#define MICROPY_HW_NUM_PIN_IRQS (3 * 32) #define MICROPY_HW_NUM_PIN_IRQS (3 * 32)
#define MICROPY_PY_MACHINE_SDCARD (0)
// Define mapping logical UART # to hardware UART # // Define mapping logical UART # to hardware UART #
// RX/TX HW-UART Logical UART // RX/TX HW-UART Logical UART

1
ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ MCU_SERIES = MIMXRT1015
MCU_VARIANT = MIMXRT1015DAF5A MCU_VARIANT = MIMXRT1015DAF5A
MICROPY_FLOAT_IMPL = single MICROPY_FLOAT_IMPL = single
MICROPY_PY_MACHINE_SDCARD = 0
MICROPY_HW_FLASH_TYPE = qspi_nor_flash MICROPY_HW_FLASH_TYPE = qspi_nor_flash
MICROPY_HW_FLASH_SIZE = 0x1000000 # 16MB MICROPY_HW_FLASH_SIZE = 0x1000000 # 16MB

1
ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ MCU_SERIES = MIMXRT1021
MCU_VARIANT = MIMXRT1021DAG5A MCU_VARIANT = MIMXRT1021DAG5A
MICROPY_FLOAT_IMPL = double MICROPY_FLOAT_IMPL = double
MICROPY_PY_MACHINE_SDCARD = 1
MICROPY_HW_FLASH_TYPE = qspi_nor_flash MICROPY_HW_FLASH_TYPE = qspi_nor_flash
MICROPY_HW_FLASH_SIZE = 0x800000 # 8MB MICROPY_HW_FLASH_SIZE = 0x800000 # 8MB

1
ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ MCU_SERIES = MIMXRT1052
MCU_VARIANT = MIMXRT1052DVL6B MCU_VARIANT = MIMXRT1052DVL6B
MICROPY_FLOAT_IMPL = double MICROPY_FLOAT_IMPL = double
MICROPY_PY_MACHINE_SDCARD = 1
MICROPY_HW_FLASH_TYPE = qspi_hyper_flash MICROPY_HW_FLASH_TYPE = qspi_hyper_flash
MICROPY_HW_FLASH_SIZE = 0x4000000 # 64MB MICROPY_HW_FLASH_SIZE = 0x4000000 # 64MB

1
ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ MCU_SERIES = MIMXRT1062
MCU_VARIANT = MIMXRT1062DVJ6A MCU_VARIANT = MIMXRT1062DVJ6A
MICROPY_FLOAT_IMPL = double MICROPY_FLOAT_IMPL = double
MICROPY_PY_MACHINE_SDCARD = 1
MICROPY_HW_FLASH_TYPE = qspi_nor_flash MICROPY_HW_FLASH_TYPE = qspi_nor_flash
MICROPY_HW_FLASH_SIZE = 0x800000 # 8MB MICROPY_HW_FLASH_SIZE = 0x800000 # 8MB

1
ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ MCU_SERIES = MIMXRT1064
MCU_VARIANT = MIMXRT1064DVL6A MCU_VARIANT = MIMXRT1064DVL6A
MICROPY_FLOAT_IMPL = double MICROPY_FLOAT_IMPL = double
MICROPY_PY_MACHINE_SDCARD = 1
MICROPY_HW_FLASH_TYPE = internal MICROPY_HW_FLASH_TYPE = internal
MICROPY_HW_FLASH_SIZE = 0x400000 # 4MB MICROPY_HW_FLASH_SIZE = 0x400000 # 4MB

1
ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk
View File

@ -3,7 +3,6 @@ MCU_VARIANT = MIMXRT1176DVMAA
MCU_CORE = _cm7 MCU_CORE = _cm7
MICROPY_FLOAT_IMPL = double MICROPY_FLOAT_IMPL = double
MICROPY_PY_MACHINE_SDCARD = 1
MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
MICROPY_HW_FLASH_SIZE ?= 0x1000000 # 16MB MICROPY_HW_FLASH_SIZE ?= 0x1000000 # 16MB
MICROPY_HW_FLASH_RESERVED ?= 0x100000 # 1MB CM4 Code address space MICROPY_HW_FLASH_RESERVED ?= 0x100000 # 1MB CM4 Code address space

1
ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
View File

@ -11,6 +11,7 @@
#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin)) #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
#define MICROPY_HW_NUM_PIN_IRQS (2 * 32) #define MICROPY_HW_NUM_PIN_IRQS (2 * 32)
#define MICROPY_PY_MACHINE_SDCARD (0)
// Define mapping logical UART # to hardware UART # // Define mapping logical UART # to hardware UART #
// LPUART1 on RX/TX -> 1 // LPUART1 on RX/TX -> 1

1
ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ MCU_SERIES = MIMXRT1011
MCU_VARIANT = MIMXRT1011DAE5A MCU_VARIANT = MIMXRT1011DAE5A
MICROPY_FLOAT_IMPL = single MICROPY_FLOAT_IMPL = single
MICROPY_PY_MACHINE_SDCARD ?= 0
MICROPY_HW_FLASH_TYPE = qspi_nor_flash MICROPY_HW_FLASH_TYPE = qspi_nor_flash
MICROPY_HW_FLASH_SIZE = 0x200000 # 2MB MICROPY_HW_FLASH_SIZE = 0x200000 # 2MB
MICROPY_HW_FLASH_RESERVED ?= 0x1000 # 4KB MICROPY_HW_FLASH_RESERVED ?= 0x1000 # 4KB

1
ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ MCU_SERIES = MIMXRT1052
MCU_VARIANT = MIMXRT1052DVL6B MCU_VARIANT = MIMXRT1052DVL6B
MICROPY_FLOAT_IMPL = double MICROPY_FLOAT_IMPL = double
MICROPY_PY_MACHINE_SDCARD = 1
MICROPY_HW_FLASH_TYPE = qspi_nor_flash MICROPY_HW_FLASH_TYPE = qspi_nor_flash
MICROPY_HW_FLASH_SIZE = 0x800000 # 8MB MICROPY_HW_FLASH_SIZE = 0x800000 # 8MB

1
ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ MCU_SERIES = MIMXRT1062
MCU_VARIANT = MIMXRT1062DVJ6A MCU_VARIANT = MIMXRT1062DVJ6A
MICROPY_FLOAT_IMPL = double MICROPY_FLOAT_IMPL = double
MICROPY_PY_MACHINE_SDCARD = 1
MICROPY_HW_FLASH_TYPE = qspi_nor_flash MICROPY_HW_FLASH_TYPE = qspi_nor_flash
MICROPY_HW_FLASH_SIZE = 0x200000 # 2MB MICROPY_HW_FLASH_SIZE = 0x200000 # 2MB
MICROPY_HW_FLASH_RESERVED ?= 0x1000 # 4KB MICROPY_HW_FLASH_RESERVED ?= 0x1000 # 4KB

1
ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ MCU_SERIES = MIMXRT1062
MCU_VARIANT = MIMXRT1062DVJ6A MCU_VARIANT = MIMXRT1062DVJ6A
MICROPY_FLOAT_IMPL = double MICROPY_FLOAT_IMPL = double
MICROPY_PY_MACHINE_SDCARD = 1
MICROPY_HW_FLASH_TYPE = qspi_nor_flash MICROPY_HW_FLASH_TYPE = qspi_nor_flash
MICROPY_HW_FLASH_SIZE = 0x800000 # 8MB MICROPY_HW_FLASH_SIZE = 0x800000 # 8MB
MICROPY_HW_FLASH_RESERVED ?= 0x1000 # 4KB MICROPY_HW_FLASH_RESERVED ?= 0x1000 # 4KB

5
ports/mimxrt/machine_sdcard.c
View File

@ -24,11 +24,12 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#if MICROPY_PY_MACHINE_SDCARD
#include "py/runtime.h" #include "py/runtime.h"
#include "py/mperrno.h" #include "py/mperrno.h"
#include "extmod/vfs.h" #include "extmod/vfs.h"
#if MICROPY_PY_MACHINE_SDCARD
#include "ticks.h" #include "ticks.h"
#if defined(MIMXRT1170x_SERIES) #if defined(MIMXRT1170x_SERIES)

3
ports/mimxrt/mpconfigport.h
View File

@ -87,6 +87,9 @@ uint32_t trng_random_u32(void);
#ifndef MICROPY_PY_MACHINE_I2S #ifndef MICROPY_PY_MACHINE_I2S
#define MICROPY_PY_MACHINE_I2S (0) #define MICROPY_PY_MACHINE_I2S (0)
#endif #endif
#ifndef MICROPY_PY_MACHINE_SDCARD
#define MICROPY_PY_MACHINE_SDCARD (1)
#endif
#define MICROPY_PY_MACHINE_SOFTI2C (1) #define MICROPY_PY_MACHINE_SOFTI2C (1)
#define MICROPY_PY_MACHINE_SPI (1) #define MICROPY_PY_MACHINE_SPI (1)
#define MICROPY_PY_MACHINE_SOFTSPI (1) #define MICROPY_PY_MACHINE_SOFTSPI (1)

2
ports/mimxrt/sdcard.c
View File

@ -24,6 +24,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "py/mphal.h"
#if MICROPY_PY_MACHINE_SDCARD #if MICROPY_PY_MACHINE_SDCARD
#include "sdcard.h" #include "sdcard.h"