Skip to content

Commit

Permalink
Merge branch 'remove/remove_c5_beta3_support' into 'master'
Browse files Browse the repository at this point in the history
remove(c5beta3): remove esp32c5 beta3 support

Closes IDF-9197

See merge request espressif/esp-idf!31412
  • Loading branch information
L-KAYA committed Jun 17, 2024
2 parents 94bec78 + d753d01 commit 0479494
Show file tree
Hide file tree
Showing 566 changed files with 2,502 additions and 133,133 deletions.
2 changes: 1 addition & 1 deletion .codespellrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[codespell]
skip = build,*.yuv,components/fatfs/src/*,alice.txt,*.rgb,components/wpa_supplicant/*,components/esp_wifi/*
ignore-words-list = ser,dout,rsource,fram,inout,shs,ans,aci,unstall,unstalling,hart,wheight,wel,ot
ignore-words-list = ser,dout,rsource,fram,inout,shs,ans,aci,unstall,unstalling,hart,wheight,wel,ot,fane
write-changes = true
26 changes: 2 additions & 24 deletions Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -118,28 +118,7 @@ mainmenu "Espressif IoT Development Framework Configuration"
default "y" if IDF_TARGET="esp32c5"
select FREERTOS_UNICORE
select IDF_TARGET_ARCH_RISCV

# TODO: IDF-9197
choice IDF_TARGET_ESP32C5_VERSION
prompt "ESP32-C5 version"
depends on IDF_TARGET_ESP32C5
default IDF_TARGET_ESP32C5_MP_VERSION
help
ESP32-C5 will support two versions for a period.
This option is for internal use only.
Select the one that matches your chip model.

config IDF_TARGET_ESP32C5_BETA3_VERSION
bool
prompt "ESP32-C5 beta3"
select ESPTOOLPY_NO_STUB

config IDF_TARGET_ESP32C5_MP_VERSION
bool
prompt "ESP32-C5 MP"
select ESPTOOLPY_NO_STUB
select IDF_ENV_FPGA
endchoice
select IDF_ENV_FPGA

config IDF_TARGET_ESP32P4
bool
Expand Down Expand Up @@ -173,8 +152,7 @@ mainmenu "Espressif IoT Development Framework Configuration"
default 0x000D if IDF_TARGET_ESP32C6
default 0x0010 if IDF_TARGET_ESP32H2
default 0x0012 if IDF_TARGET_ESP32P4
default 0x0011 if IDF_TARGET_ESP32C5 && IDF_TARGET_ESP32C5_BETA3_VERSION # TODO: IDF-9197
default 0x0017 if IDF_TARGET_ESP32C5 && IDF_TARGET_ESP32C5_MP_VERSION # TODO: IDF-9197
default 0x0017 if IDF_TARGET_ESP32C5
default 0x0014 if IDF_TARGET_ESP32C61
default 0xFFFF

Expand Down
8 changes: 1 addition & 7 deletions components/bootloader/subproject/main/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
idf_component_register(SRCS "bootloader_start.c"
REQUIRES bootloader bootloader_support)

if(CONFIG_IDF_TARGET_ESP32C5_BETA3_VERSION)
set(target_folder "esp32c5/beta3")
elseif(CONFIG_IDF_TARGET_ESP32C5_MP_VERSION)
set(target_folder "esp32c5/mp")
else()
set(target_folder "${target}")
endif()
set(target_folder "${target}")

idf_build_get_property(target IDF_TARGET)
set(scripts "ld/${target_folder}/bootloader.ld")
Expand Down
310 changes: 0 additions & 310 deletions components/bootloader/subproject/main/ld/esp32c5/beta3/bootloader.ld

This file was deleted.

Loading

0 comments on commit 0479494

Please sign in to comment.