From 4719a82e5e5403c053f942f7f71186fd03e397c0 Mon Sep 17 00:00:00 2001 From: Jukka Laitinen Date: Tue, 7 Nov 2023 12:21:17 +0200 Subject: [PATCH] Move boards/ssrc/icicle to boards/mpfs/icicle Icicle boards is not really ssrc HW. In addition, we want to add all "ssrc" boards via a separate submodule. So, move icicle away from "ssrc" Signed-off-by: Jukka Laitinen --- boards/{ssrc => mpfs}/icicle/bootloader.px4board | 0 boards/{ssrc => mpfs}/icicle/bootloader_readme.txt | 6 +++--- boards/{ssrc => mpfs}/icicle/default.px4board | 0 boards/{ssrc => mpfs}/icicle/firmware.prototype | 0 .../fpga/icicle/MPFS_ICICLE_KIT_BASE_DESIGN.job | Bin .../icicle/MPFS_ICICLE_KIT_BASE_DESIGN_job.digest | 0 boards/{ssrc => mpfs}/icicle/fpga/icicle/README.md | 0 boards/{ssrc => mpfs}/icicle/include/board_type.h | 0 boards/{ssrc => mpfs}/icicle/init/rc.board_defaults | 0 boards/{ssrc => mpfs}/icicle/init/rc.board_mavlink | 0 boards/{ssrc => mpfs}/icicle/init/rc.board_paths | 0 boards/{ssrc => mpfs}/icicle/init/rc.board_sensors | 0 boards/{ssrc => mpfs}/icicle/nuttx-config/Kconfig | 0 .../icicle/nuttx-config/bootloader/defconfig | 2 +- .../icicle/nuttx-config/include/board.h | 0 .../icicle/nuttx-config/include/board_liberodefs.h | 0 .../icicle/nuttx-config/include/board_memorymap.h | 0 .../icicle/nuttx-config/nsh/defconfig | 2 +- .../nuttx-config/scripts/bootloader_script.ld | 0 .../icicle/nuttx-config/scripts/script.ld | 0 .../icicle/nuttx-config/scripts/toc.ld | 0 boards/{ssrc => mpfs}/icicle/src/CMakeLists.txt | 0 boards/{ssrc => mpfs}/icicle/src/board_config.h | 0 boards/{ssrc => mpfs}/icicle/src/bootloader_main.c | 0 boards/{ssrc => mpfs}/icicle/src/hw_config.h | 2 +- boards/{ssrc => mpfs}/icicle/src/i2c.cpp | 0 boards/{ssrc => mpfs}/icicle/src/init.c | 0 boards/{ssrc => mpfs}/icicle/src/init_entrypt.c | 0 boards/{ssrc => mpfs}/icicle/src/led.c | 0 boards/{ssrc => mpfs}/icicle/src/manifest.c | 0 boards/{ssrc => mpfs}/icicle/src/mpfs_composite.c | 0 boards/{ssrc => mpfs}/icicle/src/mpfs_domain.c | 0 boards/{ssrc => mpfs}/icicle/src/mpfs_emmcsd.c | 0 boards/{ssrc => mpfs}/icicle/src/mpfs_ihc.c | 0 boards/{ssrc => mpfs}/icicle/src/mpfs_pwm.c | 0 boards/{ssrc => mpfs}/icicle/src/mpfs_spinor.c | 0 boards/{ssrc => mpfs}/icicle/src/mpfs_userspace.c | 0 boards/{ssrc => mpfs}/icicle/src/mtd.cpp | 0 boards/{ssrc => mpfs}/icicle/src/spi.cpp | 0 boards/{ssrc => mpfs}/icicle/src/spi_drv.cpp | 0 boards/{ssrc => mpfs}/icicle/src/toc.c | 0 41 files changed, 6 insertions(+), 6 deletions(-) rename boards/{ssrc => mpfs}/icicle/bootloader.px4board (100%) rename boards/{ssrc => mpfs}/icicle/bootloader_readme.txt (77%) rename boards/{ssrc => mpfs}/icicle/default.px4board (100%) rename boards/{ssrc => mpfs}/icicle/firmware.prototype (100%) rename boards/{ssrc => mpfs}/icicle/fpga/icicle/MPFS_ICICLE_KIT_BASE_DESIGN.job (100%) rename boards/{ssrc => mpfs}/icicle/fpga/icicle/MPFS_ICICLE_KIT_BASE_DESIGN_job.digest (100%) rename boards/{ssrc => mpfs}/icicle/fpga/icicle/README.md (100%) rename boards/{ssrc => mpfs}/icicle/include/board_type.h (100%) rename boards/{ssrc => mpfs}/icicle/init/rc.board_defaults (100%) rename boards/{ssrc => mpfs}/icicle/init/rc.board_mavlink (100%) rename boards/{ssrc => mpfs}/icicle/init/rc.board_paths (100%) rename boards/{ssrc => mpfs}/icicle/init/rc.board_sensors (100%) rename boards/{ssrc => mpfs}/icicle/nuttx-config/Kconfig (100%) rename boards/{ssrc => mpfs}/icicle/nuttx-config/bootloader/defconfig (97%) rename boards/{ssrc => mpfs}/icicle/nuttx-config/include/board.h (100%) rename boards/{ssrc => mpfs}/icicle/nuttx-config/include/board_liberodefs.h (100%) rename boards/{ssrc => mpfs}/icicle/nuttx-config/include/board_memorymap.h (100%) rename boards/{ssrc => mpfs}/icicle/nuttx-config/nsh/defconfig (98%) rename boards/{ssrc => mpfs}/icicle/nuttx-config/scripts/bootloader_script.ld (100%) rename boards/{ssrc => mpfs}/icicle/nuttx-config/scripts/script.ld (100%) rename boards/{ssrc => mpfs}/icicle/nuttx-config/scripts/toc.ld (100%) rename boards/{ssrc => mpfs}/icicle/src/CMakeLists.txt (100%) rename boards/{ssrc => mpfs}/icicle/src/board_config.h (100%) rename boards/{ssrc => mpfs}/icicle/src/bootloader_main.c (100%) rename boards/{ssrc => mpfs}/icicle/src/hw_config.h (99%) rename boards/{ssrc => mpfs}/icicle/src/i2c.cpp (100%) rename boards/{ssrc => mpfs}/icicle/src/init.c (100%) rename boards/{ssrc => mpfs}/icicle/src/init_entrypt.c (100%) rename boards/{ssrc => mpfs}/icicle/src/led.c (100%) rename boards/{ssrc => mpfs}/icicle/src/manifest.c (100%) rename boards/{ssrc => mpfs}/icicle/src/mpfs_composite.c (100%) rename boards/{ssrc => mpfs}/icicle/src/mpfs_domain.c (100%) rename boards/{ssrc => mpfs}/icicle/src/mpfs_emmcsd.c (100%) rename boards/{ssrc => mpfs}/icicle/src/mpfs_ihc.c (100%) rename boards/{ssrc => mpfs}/icicle/src/mpfs_pwm.c (100%) rename boards/{ssrc => mpfs}/icicle/src/mpfs_spinor.c (100%) rename boards/{ssrc => mpfs}/icicle/src/mpfs_userspace.c (100%) rename boards/{ssrc => mpfs}/icicle/src/mtd.cpp (100%) rename boards/{ssrc => mpfs}/icicle/src/spi.cpp (100%) rename boards/{ssrc => mpfs}/icicle/src/spi_drv.cpp (100%) rename boards/{ssrc => mpfs}/icicle/src/toc.c (100%) diff --git a/boards/ssrc/icicle/bootloader.px4board b/boards/mpfs/icicle/bootloader.px4board similarity index 100% rename from boards/ssrc/icicle/bootloader.px4board rename to boards/mpfs/icicle/bootloader.px4board diff --git a/boards/ssrc/icicle/bootloader_readme.txt b/boards/mpfs/icicle/bootloader_readme.txt similarity index 77% rename from boards/ssrc/icicle/bootloader_readme.txt rename to boards/mpfs/icicle/bootloader_readme.txt index ebfd0d3dadb5..2da9d2c503a3 100644 --- a/boards/ssrc/icicle/bootloader_readme.txt +++ b/boards/mpfs/icicle/bootloader_readme.txt @@ -1,13 +1,13 @@ 1. build icicle bootloader: - Set PATH to point to a working riscv64-unknown-elf-gcc -- $ make ssrc_icicle_bootloader +- $ make mpfs_icicle_bootloader 2. flash the icicle bootloader to eNVM -$ cp /build/ssrc_icicle_bootloader/ssrc_icicle_bootloader.elf . -$ sudo SC_INSTALL_DIR= FPGENPROG=/Libero/bin64/fpgenprog java -jar $SC_INSTALL_DIR/extras/mpfs/mpfsBootmodeProgrammer.jar --bootmode 1 ssrc_icicle_bootloader.elf +$ cp /build/mpfs_icicle_bootloader/mpfs_icicle_bootloader.elf . +$ sudo SC_INSTALL_DIR= FPGENPROG=/Libero/bin64/fpgenprog java -jar $SC_INSTALL_DIR/extras/mpfs/mpfsBootmodeProgrammer.jar --bootmode 1 mpfs_icicle_bootloader.elf 3. use px_uploader.py to flash the px4 binary diff --git a/boards/ssrc/icicle/default.px4board b/boards/mpfs/icicle/default.px4board similarity index 100% rename from boards/ssrc/icicle/default.px4board rename to boards/mpfs/icicle/default.px4board diff --git a/boards/ssrc/icicle/firmware.prototype b/boards/mpfs/icicle/firmware.prototype similarity index 100% rename from boards/ssrc/icicle/firmware.prototype rename to boards/mpfs/icicle/firmware.prototype diff --git a/boards/ssrc/icicle/fpga/icicle/MPFS_ICICLE_KIT_BASE_DESIGN.job b/boards/mpfs/icicle/fpga/icicle/MPFS_ICICLE_KIT_BASE_DESIGN.job similarity index 100% rename from boards/ssrc/icicle/fpga/icicle/MPFS_ICICLE_KIT_BASE_DESIGN.job rename to boards/mpfs/icicle/fpga/icicle/MPFS_ICICLE_KIT_BASE_DESIGN.job diff --git a/boards/ssrc/icicle/fpga/icicle/MPFS_ICICLE_KIT_BASE_DESIGN_job.digest b/boards/mpfs/icicle/fpga/icicle/MPFS_ICICLE_KIT_BASE_DESIGN_job.digest similarity index 100% rename from boards/ssrc/icicle/fpga/icicle/MPFS_ICICLE_KIT_BASE_DESIGN_job.digest rename to boards/mpfs/icicle/fpga/icicle/MPFS_ICICLE_KIT_BASE_DESIGN_job.digest diff --git a/boards/ssrc/icicle/fpga/icicle/README.md b/boards/mpfs/icicle/fpga/icicle/README.md similarity index 100% rename from boards/ssrc/icicle/fpga/icicle/README.md rename to boards/mpfs/icicle/fpga/icicle/README.md diff --git a/boards/ssrc/icicle/include/board_type.h b/boards/mpfs/icicle/include/board_type.h similarity index 100% rename from boards/ssrc/icicle/include/board_type.h rename to boards/mpfs/icicle/include/board_type.h diff --git a/boards/ssrc/icicle/init/rc.board_defaults b/boards/mpfs/icicle/init/rc.board_defaults similarity index 100% rename from boards/ssrc/icicle/init/rc.board_defaults rename to boards/mpfs/icicle/init/rc.board_defaults diff --git a/boards/ssrc/icicle/init/rc.board_mavlink b/boards/mpfs/icicle/init/rc.board_mavlink similarity index 100% rename from boards/ssrc/icicle/init/rc.board_mavlink rename to boards/mpfs/icicle/init/rc.board_mavlink diff --git a/boards/ssrc/icicle/init/rc.board_paths b/boards/mpfs/icicle/init/rc.board_paths similarity index 100% rename from boards/ssrc/icicle/init/rc.board_paths rename to boards/mpfs/icicle/init/rc.board_paths diff --git a/boards/ssrc/icicle/init/rc.board_sensors b/boards/mpfs/icicle/init/rc.board_sensors similarity index 100% rename from boards/ssrc/icicle/init/rc.board_sensors rename to boards/mpfs/icicle/init/rc.board_sensors diff --git a/boards/ssrc/icicle/nuttx-config/Kconfig b/boards/mpfs/icicle/nuttx-config/Kconfig similarity index 100% rename from boards/ssrc/icicle/nuttx-config/Kconfig rename to boards/mpfs/icicle/nuttx-config/Kconfig diff --git a/boards/ssrc/icicle/nuttx-config/bootloader/defconfig b/boards/mpfs/icicle/nuttx-config/bootloader/defconfig similarity index 97% rename from boards/ssrc/icicle/nuttx-config/bootloader/defconfig rename to boards/mpfs/icicle/nuttx-config/bootloader/defconfig index 3c9715c77bb4..d54b11160402 100644 --- a/boards/ssrc/icicle/nuttx-config/bootloader/defconfig +++ b/boards/mpfs/icicle/nuttx-config/bootloader/defconfig @@ -9,7 +9,7 @@ CONFIG_ALLOW_BSD_COMPONENTS=y CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD_CUSTOM=y -CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/ssrc/icicle/nuttx-config" +CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/mpfs/icicle/nuttx-config" CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y CONFIG_ARCH_BOARD_CUSTOM_NAME="px4" CONFIG_ARCH_CHIP="mpfs" diff --git a/boards/ssrc/icicle/nuttx-config/include/board.h b/boards/mpfs/icicle/nuttx-config/include/board.h similarity index 100% rename from boards/ssrc/icicle/nuttx-config/include/board.h rename to boards/mpfs/icicle/nuttx-config/include/board.h diff --git a/boards/ssrc/icicle/nuttx-config/include/board_liberodefs.h b/boards/mpfs/icicle/nuttx-config/include/board_liberodefs.h similarity index 100% rename from boards/ssrc/icicle/nuttx-config/include/board_liberodefs.h rename to boards/mpfs/icicle/nuttx-config/include/board_liberodefs.h diff --git a/boards/ssrc/icicle/nuttx-config/include/board_memorymap.h b/boards/mpfs/icicle/nuttx-config/include/board_memorymap.h similarity index 100% rename from boards/ssrc/icicle/nuttx-config/include/board_memorymap.h rename to boards/mpfs/icicle/nuttx-config/include/board_memorymap.h diff --git a/boards/ssrc/icicle/nuttx-config/nsh/defconfig b/boards/mpfs/icicle/nuttx-config/nsh/defconfig similarity index 98% rename from boards/ssrc/icicle/nuttx-config/nsh/defconfig rename to boards/mpfs/icicle/nuttx-config/nsh/defconfig index 3df0964f5658..d2c7a035a157 100644 --- a/boards/ssrc/icicle/nuttx-config/nsh/defconfig +++ b/boards/mpfs/icicle/nuttx-config/nsh/defconfig @@ -9,7 +9,7 @@ # CONFIG_MPFS_MAC_AUTONEG is not set CONFIG_ARCH="risc-v" CONFIG_ARCH_BOARD_CUSTOM=y -CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/ssrc/icicle/nuttx-config" +CONFIG_ARCH_BOARD_CUSTOM_DIR="../../../../boards/mpfs/icicle/nuttx-config" CONFIG_ARCH_BOARD_CUSTOM_DIR_RELPATH=y CONFIG_ARCH_BOARD_CUSTOM_NAME="px4" CONFIG_ARCH_CHIP="mpfs" diff --git a/boards/ssrc/icicle/nuttx-config/scripts/bootloader_script.ld b/boards/mpfs/icicle/nuttx-config/scripts/bootloader_script.ld similarity index 100% rename from boards/ssrc/icicle/nuttx-config/scripts/bootloader_script.ld rename to boards/mpfs/icicle/nuttx-config/scripts/bootloader_script.ld diff --git a/boards/ssrc/icicle/nuttx-config/scripts/script.ld b/boards/mpfs/icicle/nuttx-config/scripts/script.ld similarity index 100% rename from boards/ssrc/icicle/nuttx-config/scripts/script.ld rename to boards/mpfs/icicle/nuttx-config/scripts/script.ld diff --git a/boards/ssrc/icicle/nuttx-config/scripts/toc.ld b/boards/mpfs/icicle/nuttx-config/scripts/toc.ld similarity index 100% rename from boards/ssrc/icicle/nuttx-config/scripts/toc.ld rename to boards/mpfs/icicle/nuttx-config/scripts/toc.ld diff --git a/boards/ssrc/icicle/src/CMakeLists.txt b/boards/mpfs/icicle/src/CMakeLists.txt similarity index 100% rename from boards/ssrc/icicle/src/CMakeLists.txt rename to boards/mpfs/icicle/src/CMakeLists.txt diff --git a/boards/ssrc/icicle/src/board_config.h b/boards/mpfs/icicle/src/board_config.h similarity index 100% rename from boards/ssrc/icicle/src/board_config.h rename to boards/mpfs/icicle/src/board_config.h diff --git a/boards/ssrc/icicle/src/bootloader_main.c b/boards/mpfs/icicle/src/bootloader_main.c similarity index 100% rename from boards/ssrc/icicle/src/bootloader_main.c rename to boards/mpfs/icicle/src/bootloader_main.c diff --git a/boards/ssrc/icicle/src/hw_config.h b/boards/mpfs/icicle/src/hw_config.h similarity index 99% rename from boards/ssrc/icicle/src/hw_config.h rename to boards/mpfs/icicle/src/hw_config.h index 2c17e14673fc..a8d238c236f3 100644 --- a/boards/ssrc/icicle/src/hw_config.h +++ b/boards/mpfs/icicle/src/hw_config.h @@ -106,7 +106,7 @@ #define BOOTLOADER_SIGNING_ALGORITHM CRYPTO_ED25519 #define BOOTLOADER_VERIFY_UBOOT 0 -#define IMAGE_FN "ssrc_icicle.bin" +#define IMAGE_FN "icicle.bin" #if !defined(ARCH_SN_MAX_LENGTH) # define ARCH_SN_MAX_LENGTH 16 diff --git a/boards/ssrc/icicle/src/i2c.cpp b/boards/mpfs/icicle/src/i2c.cpp similarity index 100% rename from boards/ssrc/icicle/src/i2c.cpp rename to boards/mpfs/icicle/src/i2c.cpp diff --git a/boards/ssrc/icicle/src/init.c b/boards/mpfs/icicle/src/init.c similarity index 100% rename from boards/ssrc/icicle/src/init.c rename to boards/mpfs/icicle/src/init.c diff --git a/boards/ssrc/icicle/src/init_entrypt.c b/boards/mpfs/icicle/src/init_entrypt.c similarity index 100% rename from boards/ssrc/icicle/src/init_entrypt.c rename to boards/mpfs/icicle/src/init_entrypt.c diff --git a/boards/ssrc/icicle/src/led.c b/boards/mpfs/icicle/src/led.c similarity index 100% rename from boards/ssrc/icicle/src/led.c rename to boards/mpfs/icicle/src/led.c diff --git a/boards/ssrc/icicle/src/manifest.c b/boards/mpfs/icicle/src/manifest.c similarity index 100% rename from boards/ssrc/icicle/src/manifest.c rename to boards/mpfs/icicle/src/manifest.c diff --git a/boards/ssrc/icicle/src/mpfs_composite.c b/boards/mpfs/icicle/src/mpfs_composite.c similarity index 100% rename from boards/ssrc/icicle/src/mpfs_composite.c rename to boards/mpfs/icicle/src/mpfs_composite.c diff --git a/boards/ssrc/icicle/src/mpfs_domain.c b/boards/mpfs/icicle/src/mpfs_domain.c similarity index 100% rename from boards/ssrc/icicle/src/mpfs_domain.c rename to boards/mpfs/icicle/src/mpfs_domain.c diff --git a/boards/ssrc/icicle/src/mpfs_emmcsd.c b/boards/mpfs/icicle/src/mpfs_emmcsd.c similarity index 100% rename from boards/ssrc/icicle/src/mpfs_emmcsd.c rename to boards/mpfs/icicle/src/mpfs_emmcsd.c diff --git a/boards/ssrc/icicle/src/mpfs_ihc.c b/boards/mpfs/icicle/src/mpfs_ihc.c similarity index 100% rename from boards/ssrc/icicle/src/mpfs_ihc.c rename to boards/mpfs/icicle/src/mpfs_ihc.c diff --git a/boards/ssrc/icicle/src/mpfs_pwm.c b/boards/mpfs/icicle/src/mpfs_pwm.c similarity index 100% rename from boards/ssrc/icicle/src/mpfs_pwm.c rename to boards/mpfs/icicle/src/mpfs_pwm.c diff --git a/boards/ssrc/icicle/src/mpfs_spinor.c b/boards/mpfs/icicle/src/mpfs_spinor.c similarity index 100% rename from boards/ssrc/icicle/src/mpfs_spinor.c rename to boards/mpfs/icicle/src/mpfs_spinor.c diff --git a/boards/ssrc/icicle/src/mpfs_userspace.c b/boards/mpfs/icicle/src/mpfs_userspace.c similarity index 100% rename from boards/ssrc/icicle/src/mpfs_userspace.c rename to boards/mpfs/icicle/src/mpfs_userspace.c diff --git a/boards/ssrc/icicle/src/mtd.cpp b/boards/mpfs/icicle/src/mtd.cpp similarity index 100% rename from boards/ssrc/icicle/src/mtd.cpp rename to boards/mpfs/icicle/src/mtd.cpp diff --git a/boards/ssrc/icicle/src/spi.cpp b/boards/mpfs/icicle/src/spi.cpp similarity index 100% rename from boards/ssrc/icicle/src/spi.cpp rename to boards/mpfs/icicle/src/spi.cpp diff --git a/boards/ssrc/icicle/src/spi_drv.cpp b/boards/mpfs/icicle/src/spi_drv.cpp similarity index 100% rename from boards/ssrc/icicle/src/spi_drv.cpp rename to boards/mpfs/icicle/src/spi_drv.cpp diff --git a/boards/ssrc/icicle/src/toc.c b/boards/mpfs/icicle/src/toc.c similarity index 100% rename from boards/ssrc/icicle/src/toc.c rename to boards/mpfs/icicle/src/toc.c