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

boards: riscv: model USB variant of esp32c3_luatos_core as board revision #67014

Closed
wants to merge 1 commit into from
+23 −20
Closed

boards: riscv: model USB variant of esp32c3_luatos_core as board revision #67014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions boards/riscv/esp32c3_luatos_core/doc/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,17 @@ There are two version hardware of this board. The difference between them is the
:align: center
:alt: esp32c3_luatos_core

2. USB-C connect to esp32 chip directly(esp32c3_luatos_core_usb)
2. USB-C connect to esp32 chip directly(esp32c3_luatos_core\@usb)

.. image:: img/esp32c3_luatos_core_usb.jpg
:align: center
:alt: esp32c3_luatos_core_usb
:alt: esp32c3_luatos_core\@usb

.. note::

If you have the board without the CH343 chip,
you need to change ``board`` from ``esp32c3_luatos_core`` to ``esp32c3_luatos_core@usb``
for all of the :file:`west` commands given below.

Supported Features
==================
Expand Down
4 changes: 4 additions & 0 deletions boards/riscv/esp32c3_luatos_core/esp32c3_luatos_core_usb.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# SPDX-License-Identifier: Apache-2.0

CONFIG_BOARD_ESP32C3_LUATOS_CORE=n
CONFIG_BOARD_ESP32C3_LUATOS_CORE_USB=y
6 changes: 0 additions & 6 deletions ...3_luatos_core/esp32c3_luatos_core_usb.dts → ...atos_core/esp32c3_luatos_core_usb.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,10 @@
* SPDX-License-Identifier: Apache-2.0
*/

/dts-v1/;

#include "esp32c3_luatos_core.dtsi"

/ {
chosen {
zephyr,sram = &sram0;
zephyr,console = &usb_serial;
zephyr,shell-uart = &usb_serial;
zephyr,flash = &flash0;
};
};

Expand Down
2 changes: 1 addition & 1 deletion boards/riscv/esp32c3_luatos_core/esp32c3_luatos_core_usb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
identifier: esp32c3_luatos_core_usb
identifier: esp32c3_luatos_core@usb
name: ESP32C3 LuatOS Core USB
type: mcu
arch: riscv32
Expand Down
11 changes: 0 additions & 11 deletions boards/riscv/esp32c3_luatos_core/esp32c3_luatos_core_usb_defconfig
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions boards/riscv/esp32c3_luatos_core/revision.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# SPDX-License-Identifier: Apache-2.0

if(NOT DEFINED BOARD_REVISION)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sylvioalves

I believe it's more suitable to use the board_check_revision macro for this revision check.

However, currently, the board_check_revision macro does not support strings like 'usb'.

I am considering adding STRING format to the board_check_revision macro to support revisions with any text.
Here is the draft pull request:
#67078

with this, we can simply do this in a single command like other revision.cmake

board_check_revision(FORMAT STRING OPTIONAL)

I'd like to hear your thoughts on this matter.

one more thing here:

Please add this line at the top of the file.

# SPDX-License-Identifier: Apache-2.0

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! I added the license identifier, but I'll keep this open in case @sylvioalves weighs in and says we should switch to using board_check_revision() instead of the custom logic.

return()
elseif(${BOARD_REVISION} STREQUAL "usb")
return()
else()
message(FATAL_ERROR "Board revision `${BOARD_REVISION}` for board \
`${BOARD}` not found. Please specify a valid board revision.")
endif()
Loading