RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #20914 from AnnsAnns/cpu/esp32

Browse Source 
cpu/esp32: Improve error descriptions
This commit is contained in:
benpicco 2024-10-16 16:47:31 +00:00 committed by GitHub
commit 31036ebfc5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/cortexm_common/Makefile.features
View File

@ -47,7 +47,7 @@ else ifeq ($(CPU_CORE),cortex-m4f)
else ifeq ($(CPU_CORE),cortex-m7) else ifeq ($(CPU_CORE),cortex-m7)
CPU_ARCH := armv7m CPU_ARCH := armv7m
else else
$(error Unkwnown cortexm core: $(CPU_CORE)) $(error Unknown cortexm core: $(CPU_CORE))
endif endif
ifneq (,$(RUST_TARGET)) ifneq (,$(RUST_TARGET))

2
cpu/esp32/Makefile.features
View File

@ -8,7 +8,7 @@ else ifneq (,$(filter esp32s2 esp32s3,$(CPU_FAM)))
CPU_ARCH = xtensa CPU_ARCH = xtensa
CPU_CORE = xtensa-lx7 CPU_CORE = xtensa-lx7
else else
$(error Unkwnown ESP32x SoC variant (family)) $(error Unknown ESP32x SoC variant (family): $(CPU_FAM))
endif endif
# MCU defined features that are provided independent on board definitions # MCU defined features that are provided independent on board definitions

8
cpu/esp32/Makefile.include
View File

@ -25,7 +25,7 @@ else ifneq (,$(filter esp32s2,$(CPU_FAM)))
export FLASH_SIZE ?= 4 export FLASH_SIZE ?= 4
BOOTLOADER_POS = 0x1000 BOOTLOADER_POS = 0x1000
else else
$(error Unkwnown ESP32x SoC variant (family)) $(error No known flash config for ESP32x SoC variant (family): $(CPU_FAM))
endif endif
# RAM configuration # RAM configuration
@ -56,7 +56,7 @@ else ifeq (esp32c3,$(CPU_FAM))
RAM_LEN = 320K RAM_LEN = 320K
RAM_START_ADDR = 0x3FC80000 RAM_START_ADDR = 0x3FC80000
else else
$(error Unkwnown ESP32x SoC variant (family)) $(error Missing ram configuration for ESP32x SoC variant (family): $(CPU_FAM))
endif endif
ifneq (,$(filter periph_flashpage,$(USEMODULE))) ifneq (,$(filter periph_flashpage,$(USEMODULE)))
@ -103,7 +103,7 @@ ifeq (xtensa,$(CPU_ARCH))
else ifeq (rv32,$(CPU_ARCH)) else ifeq (rv32,$(CPU_ARCH))
TARGET_ARCH ?= riscv32-esp-elf TARGET_ARCH ?= riscv32-esp-elf
else else
$(error Unkwnown ESP32x SoC architecture) $(error Unknown ESP32x SoC architecture: $(CPU_ARCH))
endif endif
PSEUDOMODULES += esp_ble PSEUDOMODULES += esp_ble
@ -286,7 +286,7 @@ else ifeq (esp32s3,$(CPU_FAM))
LINKFLAGS += -T$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)/ld/$(CPU_FAM).rom.newlib.ld LINKFLAGS += -T$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)/ld/$(CPU_FAM).rom.newlib.ld
LINKFLAGS += -T$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)/ld/$(CPU_FAM).rom.version.ld LINKFLAGS += -T$(ESP32_SDK_DIR)/components/esp_rom/$(CPU_FAM)/ld/$(CPU_FAM).rom.version.ld
else else
$(error Unkwnown ESP32x SoC variant (family)) $(error Unknown link flags for ESP32x SoC variant (family): $(CPU_FAM))
endif endif
LINKFLAGS += -nostdlib -lgcc -Wl,-gc-sections LINKFLAGS += -nostdlib -lgcc -Wl,-gc-sections