Skip to content

Commit

Permalink
Merge pull request #20914 from AnnsAnns/cpu/esp32
Browse files Browse the repository at this point in the history
cpu/esp32: Improve error descriptions
  • Loading branch information
benpicco authored Oct 16, 2024
2 parents 3706589 + db2a20c commit 31036eb
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion cpu/cortexm_common/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ else ifeq ($(CPU_CORE),cortex-m4f)
else ifeq ($(CPU_CORE),cortex-m7)
CPU_ARCH := armv7m
else
$(error Unkwnown cortexm core: $(CPU_CORE))
$(error Unknown cortexm core: $(CPU_CORE))
endif

ifneq (,$(RUST_TARGET))
Expand Down
2 changes: 1 addition & 1 deletion cpu/esp32/Makefile.features
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ else ifneq (,$(filter esp32s2 esp32s3,$(CPU_FAM)))
CPU_ARCH = xtensa
CPU_CORE = xtensa-lx7
else
$(error Unkwnown ESP32x SoC variant (family))
$(error Unknown ESP32x SoC variant (family): $(CPU_FAM))
endif

# MCU defined features that are provided independent on board definitions
Expand Down
8 changes: 4 additions & 4 deletions cpu/esp32/Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ else ifneq (,$(filter esp32s2,$(CPU_FAM)))
export FLASH_SIZE ?= 4
BOOTLOADER_POS = 0x1000
else
$(error Unkwnown ESP32x SoC variant (family))
$(error No known flash config for ESP32x SoC variant (family): $(CPU_FAM))
endif

# RAM configuration
Expand Down Expand Up @@ -56,7 +56,7 @@ else ifeq (esp32c3,$(CPU_FAM))
RAM_LEN = 320K
RAM_START_ADDR = 0x3FC80000
else
$(error Unkwnown ESP32x SoC variant (family))
$(error Missing ram configuration for ESP32x SoC variant (family): $(CPU_FAM))
endif

ifneq (,$(filter periph_flashpage,$(USEMODULE)))
Expand Down Expand Up @@ -103,7 +103,7 @@ ifeq (xtensa,$(CPU_ARCH))
else ifeq (rv32,$(CPU_ARCH))
TARGET_ARCH ?= riscv32-esp-elf
else
$(error Unkwnown ESP32x SoC architecture)
$(error Unknown ESP32x SoC architecture: $(CPU_ARCH))
endif

PSEUDOMODULES += esp_ble
Expand Down Expand Up @@ -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.version.ld
else
$(error Unkwnown ESP32x SoC variant (family))
$(error Unknown link flags for ESP32x SoC variant (family): $(CPU_FAM))
endif

LINKFLAGS += -nostdlib -lgcc -Wl,-gc-sections
Expand Down

0 comments on commit 31036eb

Please sign in to comment.