From 40448c5a9f27128c4a829d876e2b6d6a762e1396 Mon Sep 17 00:00:00 2001 From: Gerson Fernando Budke Date: Fri, 9 Feb 2024 22:54:12 +0100 Subject: [PATCH] boards: sam4s_xplained: Convert to HWMv2 Port the board to HWMv2. Signed-off-by: Gerson Fernando Budke --- .../sam/sam4s_xplained/Kconfig.sam4s_xplained | 5 +++ .../sam}/sam4s_xplained/board.cmake | 0 boards/atmel/sam/sam4s_xplained/board.yml | 5 +++ .../sam4s_xplained/doc/img/sam4s_xplained.jpg | Bin .../sam}/sam4s_xplained/doc/index.rst | 29 ++++++++++-------- .../sam4s_xplained-pinctrl.dtsi | 0 .../sam}/sam4s_xplained/sam4s_xplained.dts | 0 .../sam}/sam4s_xplained/sam4s_xplained.yaml | 5 ++- .../sam4s_xplained/sam4s_xplained_defconfig | 9 ++---- .../arm/sam4s_xplained/Kconfig.board | 8 ----- .../arm/sam4s_xplained/Kconfig.defconfig | 11 ------- 11 files changed, 32 insertions(+), 40 deletions(-) create mode 100644 boards/atmel/sam/sam4s_xplained/Kconfig.sam4s_xplained rename boards/{boards_legacy/arm => atmel/sam}/sam4s_xplained/board.cmake (100%) create mode 100644 boards/atmel/sam/sam4s_xplained/board.yml rename boards/{boards_legacy/arm => atmel/sam}/sam4s_xplained/doc/img/sam4s_xplained.jpg (100%) rename boards/{boards_legacy/arm => atmel/sam}/sam4s_xplained/doc/index.rst (94%) rename boards/{boards_legacy/arm => atmel/sam}/sam4s_xplained/sam4s_xplained-pinctrl.dtsi (100%) rename boards/{boards_legacy/arm => atmel/sam}/sam4s_xplained/sam4s_xplained.dts (100%) rename boards/{boards_legacy/arm => atmel/sam}/sam4s_xplained/sam4s_xplained.yaml (89%) rename boards/{boards_legacy/arm => atmel/sam}/sam4s_xplained/sam4s_xplained_defconfig (56%) delete mode 100644 boards/boards_legacy/arm/sam4s_xplained/Kconfig.board delete mode 100644 boards/boards_legacy/arm/sam4s_xplained/Kconfig.defconfig diff --git a/boards/atmel/sam/sam4s_xplained/Kconfig.sam4s_xplained b/boards/atmel/sam/sam4s_xplained/Kconfig.sam4s_xplained new file mode 100644 index 00000000000..08f005f16d0 --- /dev/null +++ b/boards/atmel/sam/sam4s_xplained/Kconfig.sam4s_xplained @@ -0,0 +1,5 @@ +# Copyright (c) 2024 Gerson Fernando Budke +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_SAM4S_XPLAINED + select SOC_SAM4S16C diff --git a/boards/boards_legacy/arm/sam4s_xplained/board.cmake b/boards/atmel/sam/sam4s_xplained/board.cmake similarity index 100% rename from boards/boards_legacy/arm/sam4s_xplained/board.cmake rename to boards/atmel/sam/sam4s_xplained/board.cmake diff --git a/boards/atmel/sam/sam4s_xplained/board.yml b/boards/atmel/sam/sam4s_xplained/board.yml new file mode 100644 index 00000000000..c406301245b --- /dev/null +++ b/boards/atmel/sam/sam4s_xplained/board.yml @@ -0,0 +1,5 @@ +board: + name: sam4s_xplained + vendor: atmel + socs: + - name: sam4s16c diff --git a/boards/boards_legacy/arm/sam4s_xplained/doc/img/sam4s_xplained.jpg b/boards/atmel/sam/sam4s_xplained/doc/img/sam4s_xplained.jpg similarity index 100% rename from boards/boards_legacy/arm/sam4s_xplained/doc/img/sam4s_xplained.jpg rename to boards/atmel/sam/sam4s_xplained/doc/img/sam4s_xplained.jpg diff --git a/boards/boards_legacy/arm/sam4s_xplained/doc/index.rst b/boards/atmel/sam/sam4s_xplained/doc/index.rst similarity index 94% rename from boards/boards_legacy/arm/sam4s_xplained/doc/index.rst rename to boards/atmel/sam/sam4s_xplained/doc/index.rst index 092079cb984..9c1b999eca9 100644 --- a/boards/boards_legacy/arm/sam4s_xplained/doc/index.rst +++ b/boards/atmel/sam/sam4s_xplained/doc/index.rst @@ -1,7 +1,7 @@ .. _sam4s_xplained: SAM4S Xplained -################ +############## Overview ******** @@ -40,31 +40,33 @@ features: +-----------+------------+-------------------------------------+ | SYSTICK | on-chip | systick | +-----------+------------+-------------------------------------+ -| UART | on-chip | serial port | +| ADC | on-chip | adc | +-----------+------------+-------------------------------------+ -| USART | on-chip | serial port | -+-----------+------------+-------------------------------------+ -| I2C | on-chip | i2c | -+-----------+------------+-------------------------------------+ -| SPI | on-chip | spi | -+-----------+------------+-------------------------------------+ -| WATCHDOG | on-chip | watchdog | +| COUNTER | on-chip | counter | +-----------+------------+-------------------------------------+ | GPIO | on-chip | gpio | +-----------+------------+-------------------------------------+ | HWINFO | on-chip | Unique device serial number | +-----------+------------+-------------------------------------+ -| SMC | on-chip | memc (PSRAM) | +| I2C | on-chip | i2c | +-----------+------------+-------------------------------------+ | PWM | on-chip | pwm | +-----------+------------+-------------------------------------+ -| ADC | on-chip | adc | +| SPI | on-chip | spi | ++-----------+------------+-------------------------------------+ +| SMC | on-chip | memc (PSRAM) | ++-----------+------------+-------------------------------------+ +| UART | on-chip | serial port | ++-----------+------------+-------------------------------------+ +| USART | on-chip | serial port | ++-----------+------------+-------------------------------------+ +| WATCHDOG | on-chip | watchdog | +-----------+------------+-------------------------------------+ Other hardware features are not currently supported by Zephyr. The default configuration can be found in the Kconfig -:zephyr_file:`boards/arm/sam4s_xplained/sam4s_xplained_defconfig`. +:zephyr_file:`boards/atmel/sam/sam4s_xplained/sam4s_xplained_defconfig`. Connections and IOs =================== @@ -89,7 +91,8 @@ The section flashing uses the UART from the Segger USB debug connection. Programming and Debugging ************************* -The SAM4S Xplained board comes with Segger `J-Link OB `_. This provides a debug +The SAM4S Xplained board comes with Segger +`J-Link OB `_. This provides a debug interface to the SAM4S16C chip. You can use Ozone or JLink to communicate with the SAM4S16C. diff --git a/boards/boards_legacy/arm/sam4s_xplained/sam4s_xplained-pinctrl.dtsi b/boards/atmel/sam/sam4s_xplained/sam4s_xplained-pinctrl.dtsi similarity index 100% rename from boards/boards_legacy/arm/sam4s_xplained/sam4s_xplained-pinctrl.dtsi rename to boards/atmel/sam/sam4s_xplained/sam4s_xplained-pinctrl.dtsi diff --git a/boards/boards_legacy/arm/sam4s_xplained/sam4s_xplained.dts b/boards/atmel/sam/sam4s_xplained/sam4s_xplained.dts similarity index 100% rename from boards/boards_legacy/arm/sam4s_xplained/sam4s_xplained.dts rename to boards/atmel/sam/sam4s_xplained/sam4s_xplained.dts diff --git a/boards/boards_legacy/arm/sam4s_xplained/sam4s_xplained.yaml b/boards/atmel/sam/sam4s_xplained/sam4s_xplained.yaml similarity index 89% rename from boards/boards_legacy/arm/sam4s_xplained/sam4s_xplained.yaml rename to boards/atmel/sam/sam4s_xplained/sam4s_xplained.yaml index 20e5949b0fe..0cc1a4f9deb 100644 --- a/boards/boards_legacy/arm/sam4s_xplained/sam4s_xplained.yaml +++ b/boards/atmel/sam/sam4s_xplained/sam4s_xplained.yaml @@ -6,9 +6,13 @@ toolchain: - zephyr - gnuarmemb - xtools +flash: 1024 +ram: 128 supported: - adc + - counter - gpio + - hwinfo - memc - pwm - spi @@ -17,5 +21,4 @@ supported: - xplained_i2c - xplained_serial - xplained_spi - - hwinfo vendor: atmel diff --git a/boards/boards_legacy/arm/sam4s_xplained/sam4s_xplained_defconfig b/boards/atmel/sam/sam4s_xplained/sam4s_xplained_defconfig similarity index 56% rename from boards/boards_legacy/arm/sam4s_xplained/sam4s_xplained_defconfig rename to boards/atmel/sam/sam4s_xplained/sam4s_xplained_defconfig index 09f69d3220b..91293d9a641 100644 --- a/boards/boards_legacy/arm/sam4s_xplained/sam4s_xplained_defconfig +++ b/boards/atmel/sam/sam4s_xplained/sam4s_xplained_defconfig @@ -1,16 +1,11 @@ # SPDX-License-Identifier: Apache-2.0 -CONFIG_SOC_SERIES_SAM4S=y -CONFIG_SOC_PART_NUMBER_SAM4S16C=y -CONFIG_SOC_ATMEL_SAM4S_EXT_MAINCK=y -CONFIG_BOARD_SAM4S_XPLAINED=y - CONFIG_ARM_MPU=y CONFIG_HW_STACK_PROTECTION=y CONFIG_WDT_DISABLE_AT_BOOT=y CONFIG_CONSOLE=y -CONFIG_GPIO=y -CONFIG_MEMC=y CONFIG_SERIAL=y CONFIG_UART_CONSOLE=y + +CONFIG_MEMC=y diff --git a/boards/boards_legacy/arm/sam4s_xplained/Kconfig.board b/boards/boards_legacy/arm/sam4s_xplained/Kconfig.board deleted file mode 100644 index 65ec186370b..00000000000 --- a/boards/boards_legacy/arm/sam4s_xplained/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Atmel SAM4S Xplained Board selection - -# Copyright (c) 2017 Justin Watson -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_SAM4S_XPLAINED - bool "Atmel SAM4S Xplained" - depends on SOC_PART_NUMBER_SAM4S16C diff --git a/boards/boards_legacy/arm/sam4s_xplained/Kconfig.defconfig b/boards/boards_legacy/arm/sam4s_xplained/Kconfig.defconfig deleted file mode 100644 index d201fa44209..00000000000 --- a/boards/boards_legacy/arm/sam4s_xplained/Kconfig.defconfig +++ /dev/null @@ -1,11 +0,0 @@ -# Atmel SAM4S Xplained Board configuration - -# Copyright (c) 2017 Justin Watson -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_SAM4S_XPLAINED - -config BOARD - default "sam4s_xplained" - -endif # BOARD_SAM4S_XPLAINED