tiiuae · jlaitine · Nov 7, 2023 · Nov 7, 2023
diff --git a/boards/ssrc/icicle/bootloader.px4board → boards/mpfs/icicle/bootloader.px4board b/boards/ssrc/icicle/bootloader.px4board → boards/mpfs/icicle/bootloader.px4board
diff --git a/boards/ssrc/icicle/bootloader_readme.txt → boards/mpfs/icicle/bootloader_readme.txt b/boards/ssrc/icicle/bootloader_readme.txt → 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
 
 <TODO. add instructions to run fpgenprog as root>
 
-$ cp /build/ssrc_icicle_bootloader/ssrc_icicle_bootloader.elf .
-$ sudo SC_INSTALL_DIR=<path to SoftConsole-v2021.1> FPGENPROG=<path to Libero_SoC_v2021.1>/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=<path to SoftConsole-v2021.1> FPGENPROG=<path to Libero_SoC_v2021.1>/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 → boards/mpfs/icicle/default.px4board b/boards/ssrc/icicle/default.px4board → boards/mpfs/icicle/default.px4board
diff --git a/boards/ssrc/icicle/firmware.prototype → boards/mpfs/icicle/firmware.prototype b/boards/ssrc/icicle/firmware.prototype → boards/mpfs/icicle/firmware.prototype
diff --git a/...ga/icicle/MPFS_ICICLE_KIT_BASE_DESIGN.job → ...ga/icicle/MPFS_ICICLE_KIT_BASE_DESIGN.job b/...ga/icicle/MPFS_ICICLE_KIT_BASE_DESIGN.job → ...ga/icicle/MPFS_ICICLE_KIT_BASE_DESIGN.job
diff --git a/...le/MPFS_ICICLE_KIT_BASE_DESIGN_job.digest → ...le/MPFS_ICICLE_KIT_BASE_DESIGN_job.digest b/...le/MPFS_ICICLE_KIT_BASE_DESIGN_job.digest → ...le/MPFS_ICICLE_KIT_BASE_DESIGN_job.digest
diff --git a/boards/ssrc/icicle/fpga/icicle/README.md → boards/mpfs/icicle/fpga/icicle/README.md b/boards/ssrc/icicle/fpga/icicle/README.md → boards/mpfs/icicle/fpga/icicle/README.md
diff --git a/boards/ssrc/icicle/include/board_type.h → boards/mpfs/icicle/include/board_type.h b/boards/ssrc/icicle/include/board_type.h → boards/mpfs/icicle/include/board_type.h
diff --git a/boards/ssrc/icicle/init/rc.board_defaults → boards/mpfs/icicle/init/rc.board_defaults b/boards/ssrc/icicle/init/rc.board_defaults → boards/mpfs/icicle/init/rc.board_defaults
diff --git a/boards/ssrc/icicle/init/rc.board_mavlink → boards/mpfs/icicle/init/rc.board_mavlink b/boards/ssrc/icicle/init/rc.board_mavlink → boards/mpfs/icicle/init/rc.board_mavlink
diff --git a/boards/ssrc/icicle/init/rc.board_paths → boards/mpfs/icicle/init/rc.board_paths b/boards/ssrc/icicle/init/rc.board_paths → boards/mpfs/icicle/init/rc.board_paths
diff --git a/boards/ssrc/icicle/init/rc.board_sensors → boards/mpfs/icicle/init/rc.board_sensors b/boards/ssrc/icicle/init/rc.board_sensors → boards/mpfs/icicle/init/rc.board_sensors
diff --git a/boards/ssrc/icicle/nuttx-config/Kconfig → boards/mpfs/icicle/nuttx-config/Kconfig b/boards/ssrc/icicle/nuttx-config/Kconfig → boards/mpfs/icicle/nuttx-config/Kconfig
diff --git a/.../icicle/nuttx-config/bootloader/defconfig → .../icicle/nuttx-config/bootloader/defconfig b/.../icicle/nuttx-config/bootloader/defconfig → .../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/.../ssrc/icicle/nuttx-config/include/board.h → .../mpfs/icicle/nuttx-config/include/board.h b/.../ssrc/icicle/nuttx-config/include/board.h → .../mpfs/icicle/nuttx-config/include/board.h
diff --git a/...e/nuttx-config/include/board_liberodefs.h → ...e/nuttx-config/include/board_liberodefs.h b/...e/nuttx-config/include/board_liberodefs.h → ...e/nuttx-config/include/board_liberodefs.h
diff --git a/...le/nuttx-config/include/board_memorymap.h → ...le/nuttx-config/include/board_memorymap.h b/...le/nuttx-config/include/board_memorymap.h → ...le/nuttx-config/include/board_memorymap.h
diff --git a/...ds/ssrc/icicle/nuttx-config/nsh/defconfig → ...ds/mpfs/icicle/nuttx-config/nsh/defconfig b/...ds/ssrc/icicle/nuttx-config/nsh/defconfig → ...ds/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/...nuttx-config/scripts/bootloader_script.ld → ...nuttx-config/scripts/bootloader_script.ld b/...nuttx-config/scripts/bootloader_script.ld → ...nuttx-config/scripts/bootloader_script.ld
diff --git a/...src/icicle/nuttx-config/scripts/script.ld → ...pfs/icicle/nuttx-config/scripts/script.ld b/...src/icicle/nuttx-config/scripts/script.ld → ...pfs/icicle/nuttx-config/scripts/script.ld
diff --git a/...s/ssrc/icicle/nuttx-config/scripts/toc.ld → ...s/mpfs/icicle/nuttx-config/scripts/toc.ld b/...s/ssrc/icicle/nuttx-config/scripts/toc.ld → ...s/mpfs/icicle/nuttx-config/scripts/toc.ld
diff --git a/boards/ssrc/icicle/src/CMakeLists.txt → boards/mpfs/icicle/src/CMakeLists.txt b/boards/ssrc/icicle/src/CMakeLists.txt → boards/mpfs/icicle/src/CMakeLists.txt
diff --git a/boards/ssrc/icicle/src/board_config.h → boards/mpfs/icicle/src/board_config.h b/boards/ssrc/icicle/src/board_config.h → boards/mpfs/icicle/src/board_config.h
diff --git a/boards/ssrc/icicle/src/bootloader_main.c → boards/mpfs/icicle/src/bootloader_main.c b/boards/ssrc/icicle/src/bootloader_main.c → boards/mpfs/icicle/src/bootloader_main.c
diff --git a/boards/ssrc/icicle/src/hw_config.h → boards/mpfs/icicle/src/hw_config.h b/boards/ssrc/icicle/src/hw_config.h → 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 → boards/mpfs/icicle/src/i2c.cpp b/boards/ssrc/icicle/src/i2c.cpp → boards/mpfs/icicle/src/i2c.cpp
diff --git a/boards/ssrc/icicle/src/init.c → boards/mpfs/icicle/src/init.c b/boards/ssrc/icicle/src/init.c → boards/mpfs/icicle/src/init.c
diff --git a/boards/ssrc/icicle/src/init_entrypt.c → boards/mpfs/icicle/src/init_entrypt.c b/boards/ssrc/icicle/src/init_entrypt.c → boards/mpfs/icicle/src/init_entrypt.c
diff --git a/boards/ssrc/icicle/src/led.c → boards/mpfs/icicle/src/led.c b/boards/ssrc/icicle/src/led.c → boards/mpfs/icicle/src/led.c
diff --git a/boards/ssrc/icicle/src/manifest.c → boards/mpfs/icicle/src/manifest.c b/boards/ssrc/icicle/src/manifest.c → boards/mpfs/icicle/src/manifest.c
diff --git a/boards/ssrc/icicle/src/mpfs_composite.c → boards/mpfs/icicle/src/mpfs_composite.c b/boards/ssrc/icicle/src/mpfs_composite.c → boards/mpfs/icicle/src/mpfs_composite.c
diff --git a/boards/ssrc/icicle/src/mpfs_domain.c → boards/mpfs/icicle/src/mpfs_domain.c b/boards/ssrc/icicle/src/mpfs_domain.c → boards/mpfs/icicle/src/mpfs_domain.c
diff --git a/boards/ssrc/icicle/src/mpfs_emmcsd.c → boards/mpfs/icicle/src/mpfs_emmcsd.c b/boards/ssrc/icicle/src/mpfs_emmcsd.c → boards/mpfs/icicle/src/mpfs_emmcsd.c
diff --git a/boards/ssrc/icicle/src/mpfs_ihc.c → boards/mpfs/icicle/src/mpfs_ihc.c b/boards/ssrc/icicle/src/mpfs_ihc.c → boards/mpfs/icicle/src/mpfs_ihc.c
diff --git a/boards/ssrc/icicle/src/mpfs_pwm.c → boards/mpfs/icicle/src/mpfs_pwm.c b/boards/ssrc/icicle/src/mpfs_pwm.c → boards/mpfs/icicle/src/mpfs_pwm.c
diff --git a/boards/ssrc/icicle/src/mpfs_spinor.c → boards/mpfs/icicle/src/mpfs_spinor.c b/boards/ssrc/icicle/src/mpfs_spinor.c → boards/mpfs/icicle/src/mpfs_spinor.c
diff --git a/boards/ssrc/icicle/src/mpfs_userspace.c → boards/mpfs/icicle/src/mpfs_userspace.c b/boards/ssrc/icicle/src/mpfs_userspace.c → boards/mpfs/icicle/src/mpfs_userspace.c
diff --git a/boards/ssrc/icicle/src/mtd.cpp → boards/mpfs/icicle/src/mtd.cpp b/boards/ssrc/icicle/src/mtd.cpp → boards/mpfs/icicle/src/mtd.cpp
diff --git a/boards/ssrc/icicle/src/spi.cpp → boards/mpfs/icicle/src/spi.cpp b/boards/ssrc/icicle/src/spi.cpp → boards/mpfs/icicle/src/spi.cpp
diff --git a/boards/ssrc/icicle/src/spi_drv.cpp → boards/mpfs/icicle/src/spi_drv.cpp b/boards/ssrc/icicle/src/spi_drv.cpp → boards/mpfs/icicle/src/spi_drv.cpp
diff --git a/boards/ssrc/icicle/src/toc.c → boards/mpfs/icicle/src/toc.c b/boards/ssrc/icicle/src/toc.c → boards/mpfs/icicle/src/toc.c