From af3d95cbb211e1b60baf2d8ddcc666cc9d886b50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Cab=C3=A9?= Date: Thu, 24 Apr 2025 12:39:22 +0200 Subject: [PATCH 1/3] dts: vendor-prefixes: change description for zephyr entry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use a better "vendor" name for "zephyr" Signed-off-by: Benjamin Cabé --- dts/bindings/vendor-prefixes.txt | 2 +- tests/lib/devicetree/api/src/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dts/bindings/vendor-prefixes.txt b/dts/bindings/vendor-prefixes.txt index 1d07470e1b0b..fa30ebda36f0 100644 --- a/dts/bindings/vendor-prefixes.txt +++ b/dts/bindings/vendor-prefixes.txt @@ -780,7 +780,7 @@ ysoft Y Soft Corporation a.s. zarlink Zarlink Semiconductor zealz Zealz zeitec ZEITEC Semiconductor Co., LTD. -zephyr Zephyr-specific binding +zephyr The Zephyr Project zidoo Shenzhen Zidoo Technology Co., Ltd. zii Zodiac Inflight Innovations zinitix Zinitix Co., Ltd diff --git a/tests/lib/devicetree/api/src/main.c b/tests/lib/devicetree/api/src/main.c index 5b671a70fc29..339d6dfd4ef9 100644 --- a/tests/lib/devicetree/api/src/main.c +++ b/tests/lib/devicetree/api/src/main.c @@ -554,7 +554,7 @@ ZTEST(devicetree_api, test_bus) #define DT_DRV_COMPAT vnd_vendor #define VND_VENDOR "A stand-in for a real vendor which can be used in examples and tests" -#define ZEP_VENDOR "Zephyr-specific binding" +#define ZEP_VENDOR "The Zephyr Project" ZTEST(devicetree_api, test_vendor) { From 6dc27a45b1c1a1a61b8c8a7d6322e5ac5736633d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Cab=C3=A9?= Date: Thu, 24 Apr 2025 12:40:48 +0200 Subject: [PATCH 2/3] boards: align vendor entry in board.yml files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added missing "vendor" entries and fixed incorrect ones for multiple boards. Signed-off-by: Benjamin Cabé --- boards/96boards/stm32_sensor_mez/board.yml | 2 +- boards/acrn/acrn/board.yml | 3 +++ boards/ct/ctcc/board.yml | 1 + boards/enjoydigital/litex_vexriscv/board.yml | 2 +- boards/franzininho/esp32s2_franzininho/board.yml | 2 +- boards/intel/niosv_g/board.yml | 1 + boards/intel/niosv_m/board.yml | 1 + boards/intel/socfpga/agilex5_socdk/board.yml | 1 + boards/intel/socfpga/agilex_socdk/board.yml | 1 + boards/intel/socfpga_std/cyclonev_socdk/board.yml | 1 + boards/others/serpente/board.yml | 2 +- boards/others/stm32f103_mini/board.yml | 2 +- boards/qemu/x86/board.yml | 4 ++++ boards/sc/scobc_module1/board.yml | 2 +- boards/up-bridge-the-gap/up_squared/board.yml | 1 + boards/up-bridge-the-gap/up_squared_pro_7000/board.yml | 1 + 16 files changed, 21 insertions(+), 6 deletions(-) diff --git a/boards/96boards/stm32_sensor_mez/board.yml b/boards/96boards/stm32_sensor_mez/board.yml index 19d96543563a..4011ccbd2209 100644 --- a/boards/96boards/stm32_sensor_mez/board.yml +++ b/boards/96boards/stm32_sensor_mez/board.yml @@ -1,6 +1,6 @@ board: name: 96b_stm32_sensor_mez full_name: STM32 Sensor Mezzanine - vendor: st + vendor: 96boards socs: - name: stm32f446xx diff --git a/boards/acrn/acrn/board.yml b/boards/acrn/acrn/board.yml index 6efec2b876e8..bb41da4f8288 100644 --- a/boards/acrn/acrn/board.yml +++ b/boards/acrn/acrn/board.yml @@ -2,15 +2,18 @@ boards: - name: acrn full_name: ACRN hypervisor + vendor: acrn socs: - name: atom - name: acrn_ehl_crb full_name: ACRN on EHL hypervisor + vendor: acrn socs: - name: atom - name: acrn_adl_crb full_name: ACRN Hypervisor on ADL + vendor: acrn socs: - name: atom diff --git a/boards/ct/ctcc/board.yml b/boards/ct/ctcc/board.yml index 826b1846af5d..e36afe64d4cc 100644 --- a/boards/ct/ctcc/board.yml +++ b/boards/ct/ctcc/board.yml @@ -1,6 +1,7 @@ board: name: ctcc full_name: CTHINGS.CO Connectivity Card + vendor: ct socs: - name: nrf52840 - name: nrf9161 diff --git a/boards/enjoydigital/litex_vexriscv/board.yml b/boards/enjoydigital/litex_vexriscv/board.yml index c5cd6829183c..c74d1ff23216 100644 --- a/boards/enjoydigital/litex_vexriscv/board.yml +++ b/boards/enjoydigital/litex_vexriscv/board.yml @@ -1,6 +1,6 @@ board: name: litex_vexriscv full_name: LiteX VexRiscv - vendor: litex + vendor: enjoydigital socs: - name: litex_vexriscv diff --git a/boards/franzininho/esp32s2_franzininho/board.yml b/boards/franzininho/esp32s2_franzininho/board.yml index 530d5dcec4e5..25b481d709d0 100644 --- a/boards/franzininho/esp32s2_franzininho/board.yml +++ b/boards/franzininho/esp32s2_franzininho/board.yml @@ -1,6 +1,6 @@ board: name: esp32s2_franzininho full_name: ESP32-S2 Franzininho - vendor: espressif + vendor: franzininho socs: - name: esp32s2 diff --git a/boards/intel/niosv_g/board.yml b/boards/intel/niosv_g/board.yml index 811aee73f34a..3ab04d5103f1 100644 --- a/boards/intel/niosv_g/board.yml +++ b/boards/intel/niosv_g/board.yml @@ -1,5 +1,6 @@ board: name: niosv_g full_name: INTEL FPGA niosv_g + vendor: intel socs: - name: niosv_g diff --git a/boards/intel/niosv_m/board.yml b/boards/intel/niosv_m/board.yml index cc7b9bb3bf53..aeb8d988667e 100644 --- a/boards/intel/niosv_m/board.yml +++ b/boards/intel/niosv_m/board.yml @@ -1,5 +1,6 @@ board: name: niosv_m full_name: INTEL FPGA niosv_m + vendor: intel socs: - name: niosv_m diff --git a/boards/intel/socfpga/agilex5_socdk/board.yml b/boards/intel/socfpga/agilex5_socdk/board.yml index f8ccbf5d8c5a..13726af50a62 100644 --- a/boards/intel/socfpga/agilex5_socdk/board.yml +++ b/boards/intel/socfpga/agilex5_socdk/board.yml @@ -1,5 +1,6 @@ board: name: intel_socfpga_agilex5_socdk full_name: Agilex™ 5 SoC FPGA Development Kit + vendor: intel socs: - name: agilex5 diff --git a/boards/intel/socfpga/agilex_socdk/board.yml b/boards/intel/socfpga/agilex_socdk/board.yml index 80763baa41b9..fe7d24f4b395 100644 --- a/boards/intel/socfpga/agilex_socdk/board.yml +++ b/boards/intel/socfpga/agilex_socdk/board.yml @@ -1,5 +1,6 @@ board: name: intel_socfpga_agilex_socdk full_name: Agilex SoC Development Kit + vendor: intel socs: - name: agilex diff --git a/boards/intel/socfpga_std/cyclonev_socdk/board.yml b/boards/intel/socfpga_std/cyclonev_socdk/board.yml index 222de69429ac..4c47d3f9a5bb 100644 --- a/boards/intel/socfpga_std/cyclonev_socdk/board.yml +++ b/boards/intel/socfpga_std/cyclonev_socdk/board.yml @@ -1,5 +1,6 @@ board: name: cyclonev_socdk full_name: Cyclone® V SoC Development Kit + vendor: intel socs: - name: cyclonev diff --git a/boards/others/serpente/board.yml b/boards/others/serpente/board.yml index 0be3e94ffe6b..5de65f6e2cea 100644 --- a/boards/others/serpente/board.yml +++ b/boards/others/serpente/board.yml @@ -1,6 +1,6 @@ board: name: serpente full_name: Arturo182 Serpente - vendor: solderparty + vendor: others socs: - name: samd21e18a diff --git a/boards/others/stm32f103_mini/board.yml b/boards/others/stm32f103_mini/board.yml index f88d33224ddf..8f59073e36cc 100644 --- a/boards/others/stm32f103_mini/board.yml +++ b/boards/others/stm32f103_mini/board.yml @@ -1,6 +1,6 @@ board: name: stm32f103_mini full_name: STM32F103 Mini - vendor: st + vendor: others socs: - name: stm32f103xe diff --git a/boards/qemu/x86/board.yml b/boards/qemu/x86/board.yml index 7e0fa76a0438..cfd84976dae2 100644 --- a/boards/qemu/x86/board.yml +++ b/boards/qemu/x86/board.yml @@ -2,6 +2,7 @@ boards: - name: qemu_x86 full_name: QEMU Emulation for X86 + vendor: intel socs: - name: atom variants: @@ -13,11 +14,13 @@ boards: - name: qemu_x86_lakemont full_name: QEMU Emulation for X86 / Lakemont CPU + vendor: intel socs: - name: lakemont - name: qemu_x86_64 full_name: QEMU Emulation for X86 64bit + vendor: intel socs: - name: atom variants: @@ -25,5 +28,6 @@ boards: - name: qemu_x86_tiny full_name: QEMU Emulation for X86 Minimal Configuration + vendor: intel socs: - name: atom diff --git a/boards/sc/scobc_module1/board.yml b/boards/sc/scobc_module1/board.yml index 2ffbcc51e541..02c931595cb6 100644 --- a/boards/sc/scobc_module1/board.yml +++ b/boards/sc/scobc_module1/board.yml @@ -1,6 +1,6 @@ board: name: scobc_module1 full_name: OBC module 1 - vendor: spacecubics + vendor: sc socs: - name: designstart_fpga_cortex_m3 diff --git a/boards/up-bridge-the-gap/up_squared/board.yml b/boards/up-bridge-the-gap/up_squared/board.yml index 1525911058fd..fb66e14cc514 100644 --- a/boards/up-bridge-the-gap/up_squared/board.yml +++ b/boards/up-bridge-the-gap/up_squared/board.yml @@ -1,5 +1,6 @@ board: name: up_squared full_name: UP Squared + vendor: up-bridge-the-gap socs: - name: apollo_lake diff --git a/boards/up-bridge-the-gap/up_squared_pro_7000/board.yml b/boards/up-bridge-the-gap/up_squared_pro_7000/board.yml index c3546042deae..983b1825fa6b 100644 --- a/boards/up-bridge-the-gap/up_squared_pro_7000/board.yml +++ b/boards/up-bridge-the-gap/up_squared_pro_7000/board.yml @@ -1,5 +1,6 @@ board: name: up_squared_pro_7000 full_name: UP Squared Pro 7000 + vendor: up-bridge-the-gap socs: - name: alder_lake From 839d2d4aee0fab3625df1e092d76017a381293c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Cab=C3=A9?= Date: Thu, 24 Apr 2025 13:01:00 +0200 Subject: [PATCH 3/3] doc: _scripts: simplify vendor determination in board catalog generation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the board's vendor from board.yml as the source of truth. Signed-off-by: Benjamin Cabé --- doc/_scripts/gen_boards_catalog.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/doc/_scripts/gen_boards_catalog.py b/doc/_scripts/gen_boards_catalog.py index a22ad111176c..3771973a485b 100755 --- a/doc/_scripts/gen_boards_catalog.py +++ b/doc/_scripts/gen_boards_catalog.py @@ -262,17 +262,7 @@ def get_catalog(generate_hw_features=False): logger.info("Skipping generation of supported hardware features.") for board in boards.values(): - # We could use board.vendor but it is often incorrect. Instead, deduce vendor from - # containing folder. There are a few exceptions, like the "native" and "others" folders - # which we know are not actual vendors so treat them as such. - for folder in board.dir.parents: - if folder.name in ["native", "others"]: - vendor = "others" - break - elif vnd_lookup.vnd2vendor.get(folder.name): - vendor = folder.name - break - + vendor = board.vendor or "others" socs = {soc.name for soc in board.socs} full_name = board.full_name or board.name doc_page = guess_doc_page(board)