Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor ESP32xx folder structure #58454

Merged
merged 7 commits into from
Jul 25, 2023
Merged

Refactor ESP32xx folder structure #58454

merged 7 commits into from
Jul 25, 2023

Conversation

marekmatej
Copy link

This PR aims to refactor Espressif soc folders for all architectures, in order to match current Zephyrs standards and to better reflect ESP32 product line SoC and SiP.

@marekmatej marekmatej force-pushed the feature/espressif_soc_rework branch from 89aaf93 to 3834535 Compare June 6, 2023 22:52
@zephyrbot
Copy link
Collaborator

zephyrbot commented Jun 6, 2023 •
edited
Loading

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
hal_espressif zephyrproject-rtos/hal_espressif@322f638 zephyrproject-rtos/hal_espressif@ae1bd64 (zephyr) zephyrproject-rtos/hal_espressif@322f6389..ae1bd648

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@marekmatej marekmatej force-pushed the feature/espressif_soc_rework branch 5 times, most recently from 6fe0819 to ab1d07c Compare June 11, 2023 21:57
@marekmatej marekmatej mentioned this pull request Jun 11, 2023
Merged
@marekmatej marekmatej force-pushed the feature/espressif_soc_rework branch 4 times, most recently from e7f8903 to 0b91b0b Compare June 12, 2023 12:36
@zephyrbot zephyrbot added the DNM This PR should not be merged (Do Not Merge) label Jun 12, 2023
@marekmatej marekmatej force-pushed the feature/espressif_soc_rework branch 7 times, most recently from ba8dd91 to f968d6d Compare June 13, 2023 16:02
@marekmatej marekmatej mentioned this pull request Jun 14, 2023
Merged
@marekmatej marekmatej force-pushed the feature/espressif_soc_rework branch 7 times, most recently from 511a03e to 227a1b6 Compare June 21, 2023 12:00
@marekmatej marekmatej force-pushed the feature/espressif_soc_rework branch from 7c8ad41 to 10617f2 Compare July 25, 2023 13:47
@MaureenHelm
Copy link
Member

Ok, so those CONFIG_SOC_PART_NUMBER strings were added for downstream users so they can be used to identify the underlying hw. There is no other meaningful usage, except maybe creating the sample to code to use those strings as @carlescufi noted, but that would be very artificial justification. So I'll remove those strings from the PR. Thank you all for your clarification.

I introduced CONFIG_SOC_PART_NUMBER many years ago to help integrate the Kinetis SDK, now called MCUXpresso SDK, into Zephyr. See commit 2815687. The pattern has since been copy-pasted to other SoC families.

@marekmatej
Copy link
Author

@mniestroj, at the end I think we were mixing two different things - SOC_PART_NUMBER strings and bool flags. I was advocating for both! From your messages, I got the impression you wanted to remove both strings and flags. However, I must admit that having those strings for future use is not vindicated enough, so I apologize for the misunderstanding from my side.

Marek Matej added 7 commits July 25, 2023 16:14
dts: xtensa: esp32xx rework soc/sip list
95060ea 
Introduce dtsi files representing the
current portfolio of chips and modules
based on the followint criteria:

- flash size
- psram size
- gpio count
- certification status

Update the boards dts files according
to which SOC/SIP they are using.

Signed-off-by: Marek Matej <marek.matej@espressif.com>
dts: riscv: esp32c3 rework soc/sip list
ee0c229 
Introduce dtsi files representing the
current portfolio of chips and modules
based on the:

- flash size
- psram size
- gpio count
- certification status

Update the boards dts files according
to which SOC/SIP they are using.

Signed-off-by: Marek Matej <marek.matej@espressif.com>
boards: xtensa: esp32 board split
e368864 
Remove virtual esp32 board and replace it with the
real word boards:

- esp32_devkitc_wroom
- esp32_devkitc_wrover (with PSRAM option)

Signed-off-by: Marek Matej <marek.matej@espressif.com>
boards: mark esp32 board as deprecated
f747b8d 
Mark the 'esp32' board as deprecated after removing
it and replaced by the two real boards.

Signed-off-by: Marek Matej <marek.matej@espressif.com>
soc: xtensa,riscv: esp32xx: refactor folder structure
0342c2d 
Refactor the ESP32 target SOCs together with
all related boards. Most braking changes includes:

- changing the CONFIG_SOC_ESP32* to refer to
  the actual soc line (esp32,esp32s2,esp32s3,esp32c3)
- replacing CONFIG_SOC with the CONFIG_SOC_SERIES
- creating CONFIG_SOC_FAMILY_ESP32 to embrace all
  the ESP32 across all used architectures
- introducing CONFIG_SOC_PART_NUMBER_* to
  provide a SOC model config
- introducing the 'common' folder to hide all
  commonly used configs and files.
- updating west.yml to reflect previous changes in hal

Signed-off-by: Marek Matej <marek.matej@espressif.com>
include: dt-bingings: Fix typo
fc75765 
Fix minor typo in esp32s3-gpio-sigmap

Signed-off-by: Marek Matej <marek.matej@espressif.com>
drivers: can: fix long lines
8571418 
Change the line length to comply with the rules.

Signed-off-by: Marek Matej <marek.matej@espressif.com>
@marekmatej marekmatej force-pushed the feature/espressif_soc_rework branch from 10617f2 to 8571418 Compare July 25, 2023 14:15
@mniestroj
Copy link
Member

@mniestroj, at the end I think we were mixing two different things - SOC_PART_NUMBER strings and bool flags. I was advocating for both! From your messages, I got the impression you wanted to remove both strings and flags. However, I must admit that having those strings for future use is not vindicated enough, so I apologize for the misunderstanding from my side.

No need for apologies! Actually it is true that I wanted both to be removed. I wanted to prevent blind copy-pasting of what @MaureenHelm mentioned in #58454 (comment), so I didn't take "this is already used in other platforms" as a good reason why it should be introduced for Espressif platform. This platform was fine without using those symbols up to now. If it will be useful, then fine. But the commit introducing it (and the discussions that we were having above @marekmatej) didn't provide a good reason for it.

This PR looks fine to me. I just have issues with SOC_PART_NUMBER (not critical though). Since others are good with it (based on the comments above) and overall this PR is bringing lots of net profit (thanks @marekmatej), then I will not stay in the way.

@mniestroj mniestroj dismissed their stale review July 25, 2023 15:10

Don't block

@carlescufi
Copy link
Member

This PR looks fine to me. I just have issues with SOC_PART_NUMBER (not critical though). Since others are good with it (based on the comments above) and overall this PR is bringing lots of net profit (thanks @marekmatej), then I will not stay in the way.

Just to be clear @mniestroj, SOC_PART_NUMBER has now been removed from this PR.

@mniestroj
Copy link
Member

This PR looks fine to me. I just have issues with SOC_PART_NUMBER (not critical though). Since others are good with it (based on the comments above) and overall this PR is bringing lots of net profit (thanks @marekmatej), then I will not stay in the way.

Just to be clear @mniestroj, SOC_PART_NUMBER has now been removed from this PR.

Now we got confused... in this context I meant choice SOC_PART_NUMBER with bool SOC_PART_NUMBER_*.

string SOC_PART_NUMBER was removed, indeed. @carlescufi

@carlescufi
Copy link
Member

This PR looks fine to me. I just have issues with SOC_PART_NUMBER (not critical though). Since others are good with it (based on the comments above) and overall this PR is bringing lots of net profit (thanks @marekmatej), then I will not stay in the way.

Just to be clear @mniestroj, SOC_PART_NUMBER has now been removed from this PR.

Now we got confused... in this context I meant choice SOC_PART_NUMBER with bool SOC_PART_NUMBER_*.

string SOC_PART_NUMBER was removed, indeed. @carlescufi

Aah, of course. The choice vs the string Kconfig :) But as you say others chimed in in favor of keeping the choice, so thanks for unblocking. Merging this now.

@carlescufi carlescufi merged commit 938732c into zephyrproject-rtos:main Jul 25, 2023
38 checks passed
mniestroj added a commit to mniestroj/mcuboot that referenced this pull request Jul 27, 2023
@mniestroj
boot: zephyr: split esp32 to esp32_devkitc_{wroom,wrover}
f8bd1f5 
This is a follow-up on upstream Zephyr split from `esp32` to distinct
esp32_devkitc_wroom and esp32_devkitc_wrover (see [1] and [2]).

[1] zephyrproject-rtos/zephyr#58454
[2] zephyrproject-rtos/zephyr@3776402

Signed-off-by: Marcin Niestroj <m.niestroj@emb.dev>
@mniestroj mniestroj mentioned this pull request Jul 27, 2023
Merged
almir-okato pushed a commit to mcu-tools/mcuboot that referenced this pull request Jul 29, 2023
@mniestroj @almir-okato
boot: zephyr: split esp32 to esp32_devkitc_{wroom,wrover}
36ae4fd 
This is a follow-up on upstream Zephyr split from `esp32` to distinct
esp32_devkitc_wroom and esp32_devkitc_wrover (see [1] and [2]).

[1] zephyrproject-rtos/zephyr#58454
[2] zephyrproject-rtos/zephyr@3776402

Signed-off-by: Marcin Niestroj <m.niestroj@emb.dev>
kartben added a commit to kartben/zephyr that referenced this pull request Sep 7, 2023
@kartben
esp32: samples: Use esp32_devkitc_wroom board instead of esp32
d6eb224 
Following zephyrproject-rtos#58454, fixed a few remaining references to old "virtual"
esp32 board.

Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
@kartben kartben mentioned this pull request Sep 7, 2023
Merged
carlescufi pushed a commit that referenced this pull request Sep 7, 2023
@kartben @carlescufi
esp32: samples: Use esp32_devkitc_wroom board instead of esp32
2c8dbc4 
Following #58454, fixed a few remaining references to old "virtual"
esp32 board.

Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
Thalley pushed a commit to Thalley/zephyr that referenced this pull request Sep 8, 2023
@kartben @Thalley
esp32: samples: Use esp32_devkitc_wroom board instead of esp32
6b3536c 
Following zephyrproject-rtos#58454, fixed a few remaining references to old "virtual"
esp32 board.

Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
kartben added a commit to kartben/zephyr that referenced this pull request Sep 11, 2023
@kartben
esp32: samples: Use esp32_devkitc_wroom board instead of esp32
16a3eb6 
Following zephyrproject-rtos#58454, fixed a few remaining references to old "virtual"
esp32 board.

Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
coran21 pushed a commit to coran21/zephyr that referenced this pull request Sep 21, 2023
@kartben @coran21
esp32: samples: Use esp32_devkitc_wroom board instead of esp32
e4bec41 
Following zephyrproject-rtos#58454, fixed a few remaining references to old "virtual"
esp32 board.

Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sylvioalves sylvioalves sylvioalves approved these changes

@carlescufi carlescufi carlescufi approved these changes

@nashif nashif Awaiting requested review from nashif

@anangl anangl Awaiting requested review from anangl

@tbursztyka tbursztyka Awaiting requested review from tbursztyka

@mnkp mnkp Awaiting requested review from mnkp

@nordic-krch nordic-krch Awaiting requested review from nordic-krch

@MaureenHelm MaureenHelm Awaiting requested review from MaureenHelm

@rlubos rlubos Awaiting requested review from rlubos

@jhedberg jhedberg Awaiting requested review from jhedberg

@Vudentz Vudentz Awaiting requested review from Vudentz

@alwa-nordic alwa-nordic Awaiting requested review from alwa-nordic

@sjanc sjanc Awaiting requested review from sjanc

@kgugala kgugala Awaiting requested review from kgugala

@pgielda pgielda Awaiting requested review from pgielda

@uLipe uLipe Awaiting requested review from uLipe

@alexanderwachter alexanderwachter Awaiting requested review from alexanderwachter

@dcpleung dcpleung Awaiting requested review from dcpleung

@andyross andyross Awaiting requested review from andyross

@henrikbrixandersen henrikbrixandersen Awaiting requested review from henrikbrixandersen

@LucasTambor LucasTambor Awaiting requested review from LucasTambor

@tejlmand tejlmand Awaiting requested review from tejlmand

@mniestroj mniestroj Awaiting requested review from mniestroj

Assignees

@sylvioalves sylvioalves

Labels
manifest manifest-hal_espressif platform: ESP32 Espressif ESP32
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

wifi: esp32: build error due to WIFI_SCAN_TYPE_{ACTIVE,PASSIVE} redeclaration