From 1374a60810aedfbcaaaca11205b5a008f1363e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Prei=C3=9Fner?= Date: Tue, 26 Jun 2018 17:12:49 +0200 Subject: [PATCH 1/3] fix: DEVCFG: SPI auto-enable & SPI freq. fix * Configure automatic enable of SPI if Flash is selected * Corrected SPI Flash frequency option by removing the `CONFIG_` prefix Relates to #25 --- boards/arm/akita_gen2_devboard/Kconfig.defconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/boards/arm/akita_gen2_devboard/Kconfig.defconfig b/boards/arm/akita_gen2_devboard/Kconfig.defconfig index cb8ea17bd73284..d23750957461e3 100644 --- a/boards/arm/akita_gen2_devboard/Kconfig.defconfig +++ b/boards/arm/akita_gen2_devboard/Kconfig.defconfig @@ -84,6 +84,8 @@ endif # ADC if FLASH + config SPI + def_bool y config SPI_1 def_bool y config SPI_MCUX_DSPI @@ -95,7 +97,7 @@ if FLASH choice SPI_FLASH_W25QXXXX_DEVICE default SPI_FLASH_W25QXXXX_DEVICE_W25QXXFW endchoice - config CONFIG_SPI_FLASH_W25QXXXX_SPI_FREQ_0 + config SPI_FLASH_W25QXXXX_SPI_FREQ_0 default 500000 config SPI_FLASH_W25QXXXX_SPI_SLAVE default 0 From 2d86793c723255745dfaf3479ae44cc5bf7b19f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Prei=C3=9Fner?= Date: Mon, 9 Jul 2018 18:51:27 +0200 Subject: [PATCH 2/3] fix: BSP: Port AG2 dev Flash support to AG2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Ports the board support of the Akita Gen2 development board to the Akita Gen2 production board. Signed-Off-By: Alexander Preißner Closes #25 --- boards/arm/akita_gen2/CMakeLists.txt | 5 +++ boards/arm/akita_gen2/Kconfig.defconfig | 53 ++++++++++++++++++++++++- 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/boards/arm/akita_gen2/CMakeLists.txt b/boards/arm/akita_gen2/CMakeLists.txt index a700f3c235d0a2..e048e986e641e7 100644 --- a/boards/arm/akita_gen2/CMakeLists.txt +++ b/boards/arm/akita_gen2/CMakeLists.txt @@ -1,3 +1,8 @@ zephyr_library() zephyr_library_sources(pinmux.c) zephyr_library_include_directories(${PROJECT_SOURCE_DIR}/drivers) + +zephyr_compile_definitions( + -DFLASH_AREA_NFFS_OFFSET=0 + -DFLASH_AREA_NFFS_SIZE=8192 +) diff --git a/boards/arm/akita_gen2/Kconfig.defconfig b/boards/arm/akita_gen2/Kconfig.defconfig index 3f804ce338e28b..88ca24dbfeb1f1 100644 --- a/boards/arm/akita_gen2/Kconfig.defconfig +++ b/boards/arm/akita_gen2/Kconfig.defconfig @@ -66,13 +66,64 @@ config ADC_0 endif # ADC + if SPI config SPI_0 - def_bool y + def_bool n + +config SPI_0_IRQ_PRI + default 10 endif # SPI + +if FLASH + config SPI + def_bool y + config SPI_0 + def_bool y + config SPI_MCUX_DSPI + def_bool y + config SPI_FLASH_W25QXXXX + def_bool y + config SPI_FLASH_W25QXXXX_SPI_NAME + default "SPI_0" + choice SPI_FLASH_W25QXXXX_DEVICE + default SPI_FLASH_W25QXXXX_DEVICE_W25QXXFW + endchoice + config SPI_FLASH_W25QXXXX_SPI_FREQ_0 + default 500000 + config SPI_FLASH_W25QXXXX_SPI_SLAVE + default 0 + +endif # FLASH + + +if FILE_SYSTEM_NFFS + + config FS_NFFS_FLASH_DEV_NAME + default "W25QXXXX" + config FS_NFFS_NUM_INODES + default 100 + config FS_NFFS_NUM_BLOCKS + default 100 + config FS_NFFS_NUM_FILES + default 4 + config FS_NFFS_NUM_DIRS + default 4 + config FS_NFFS_NUM_CACHE_INODES + default 1 + config FS_NFFS_NUM_CACHE_BLOCKS + default 1 + config NFFS_FILESYSTEM_MAX_AREAS + default 8 + config NFFS_FILESYSTEM_MAX_BLOCK_SIZE + default 256 + +endif # FILE_SYSTEM_NFFS + + if LIS3DH config LIS3DH_GPIO_NAME From bd7d011cee8df5c7dac1de1121671f6ff790d9cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Prei=C3=9Fner?= Date: Mon, 9 Jul 2018 19:04:50 +0200 Subject: [PATCH 3/3] fix: BSP: Replace spaces with tabs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Replaced all spaces with tabs to conform with Zephyr style guide Signed-Off-By: Alexander Preißner Closes #25 --- boards/arm/akita_gen2/Kconfig.defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boards/arm/akita_gen2/Kconfig.defconfig b/boards/arm/akita_gen2/Kconfig.defconfig index 88ca24dbfeb1f1..46d8cac9d05bf8 100644 --- a/boards/arm/akita_gen2/Kconfig.defconfig +++ b/boards/arm/akita_gen2/Kconfig.defconfig @@ -70,10 +70,10 @@ endif # ADC if SPI config SPI_0 - def_bool n + def_bool n config SPI_0_IRQ_PRI - default 10 + default 10 endif # SPI