You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2023/02/17 17:58:45 UTC
[nuttx] branch master updated (77f6319268 -> 889a84f9f7)
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from 77f6319268 sync ps/assert output
new d52e875a99 samv7: fix build error in sam_mcan.c file
new 889a84f9f7 same70-xplained: add configuration option for MCAN support
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/arm/src/samv7/sam_mcan.c | 11 +++++++----
boards/arm/samv7/same70-xplained/README.txt | 6 ++++++
.../arm/samv7/same70-xplained/configs/{nsh => can}/defconfig | 4 ++--
3 files changed, 15 insertions(+), 6 deletions(-)
copy boards/arm/samv7/same70-xplained/configs/{nsh => can}/defconfig (97%)
[nuttx] 02/02: same70-xplained: add configuration option for MCAN support
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 889a84f9f71d668bdf64eddb9e039f1720fce86b
Author: Michal Lenc <mi...@seznam.cz>
AuthorDate: Fri Feb 17 16:23:16 2023 +0100
same70-xplained: add configuration option for MCAN support
This commit adds configuration file with enabled MCAN support. This is
mainly to track changes in architectural driver that could cause build
errors.
Signed-off-by: Michal Lenc <mi...@seznam.cz>
---
boards/arm/samv7/same70-xplained/README.txt | 6 ++
.../samv7/same70-xplained/configs/can/defconfig | 79 ++++++++++++++++++++++
2 files changed, 85 insertions(+)
diff --git a/boards/arm/samv7/same70-xplained/README.txt b/boards/arm/samv7/same70-xplained/README.txt
index b92c9cb3df..a3508cf564 100644
--- a/boards/arm/samv7/same70-xplained/README.txt
+++ b/boards/arm/samv7/same70-xplained/README.txt
@@ -1321,6 +1321,12 @@ Configuration sub-directories
DMA to transfer samples. Number of transferred samples can be set
by configuring CONFIG_SAMV7_AFEC_DMASAMPLES.
+ can
+
+ An nsh configuration (see below) with added support fo MCAN driver.
+ The purpose of the configuration is mainly to track whether changes
+ to SAMv7 MCAN driver do not cause build errors and warnings.
+
mrf24j40-starhub
This configuration implements a hub node in a 6LoWPAN start network.
diff --git a/boards/arm/samv7/same70-xplained/configs/can/defconfig b/boards/arm/samv7/same70-xplained/configs/can/defconfig
new file mode 100644
index 0000000000..94339b30d5
--- /dev/null
+++ b/boards/arm/samv7/same70-xplained/configs/can/defconfig
@@ -0,0 +1,79 @@
+#
+# This file is autogenerated: PLEASE DO NOT EDIT IT.
+#
+# You can use "make menuconfig" to make any modifications to the installed .config file.
+# You can then do "make savedefconfig" to generate a new defconfig file that includes your
+# modifications.
+#
+# CONFIG_ARCH_RAMFUNCS is not set
+# CONFIG_MMCSD_MMCSUPPORT is not set
+# CONFIG_MMCSD_SPI is not set
+# CONFIG_SAMV7_SDRAMHEAP is not set
+# CONFIG_SAMV7_UART0 is not set
+# CONFIG_SAMV7_UART2 is not set
+# CONFIG_SAMV7_UART4 is not set
+CONFIG_ARCH="arm"
+CONFIG_ARCH_BOARD="same70-xplained"
+CONFIG_ARCH_BOARD_COMMON=y
+CONFIG_ARCH_BOARD_SAME70_XPLAINED=y
+CONFIG_ARCH_BUTTONS=y
+CONFIG_ARCH_CHIP="samv7"
+CONFIG_ARCH_CHIP_SAME70=y
+CONFIG_ARCH_CHIP_SAME70Q21=y
+CONFIG_ARCH_CHIP_SAME70Q=y
+CONFIG_ARCH_CHIP_SAMV7=y
+CONFIG_ARCH_CHIP_SAMV7_MEM_FLASH=0x200000
+CONFIG_ARCH_CHIP_SAMV7_MEM_RAM=0x60000
+CONFIG_ARCH_INTERRUPTSTACK=2048
+CONFIG_ARCH_IRQBUTTONS=y
+CONFIG_ARCH_STACKDUMP=y
+CONFIG_ARMV7M_DCACHE=y
+CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
+CONFIG_ARMV7M_ICACHE=y
+CONFIG_AT24XX_ADDR=0x57
+CONFIG_AT24XX_EXTENDED=y
+CONFIG_AT24XX_EXTSIZE=160
+CONFIG_AT24XX_SIZE=2
+CONFIG_BOARD_LOOPSPERMSEC=51262
+CONFIG_BUILTIN=y
+CONFIG_FAT_LCNAMES=y
+CONFIG_FAT_LFN=y
+CONFIG_FS_FAT=y
+CONFIG_FS_PROCFS=y
+CONFIG_I2CTOOL_MAXBUS=0
+CONFIG_INIT_ENTRYPOINT="nsh_main"
+CONFIG_MMCSD_MULTIBLOCK_LIMIT=1
+CONFIG_MMCSD_SDIO=y
+CONFIG_MTD=y
+CONFIG_MTD_AT24XX=y
+CONFIG_MTD_AT25=y
+CONFIG_MTD_CONFIG=y
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_BUILTIN_APPS=y
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_READLINE=y
+CONFIG_PREALLOC_TIMERS=4
+CONFIG_RAM_SIZE=393216
+CONFIG_RAM_START=0x20400000
+CONFIG_RAW_BINARY=y
+CONFIG_RR_INTERVAL=200
+CONFIG_SAMV7_GPIOA_IRQ=y
+CONFIG_SAMV7_GPIOC_IRQ=y
+CONFIG_SAMV7_GPIO_IRQ=y
+CONFIG_SAMV7_HSMCI0=y
+CONFIG_SAMV7_MCAN0=y
+CONFIG_SAMV7_SDRAMC=y
+CONFIG_SAMV7_SDRAMSIZE=2097152
+CONFIG_SAMV7_TWIHS0=y
+CONFIG_SAMV7_USART1=y
+CONFIG_SAMV7_XDMAC=y
+CONFIG_SCHED_WAITPID=y
+CONFIG_SDIO_BLOCKSETUP=y
+CONFIG_START_DAY=10
+CONFIG_START_MONTH=3
+CONFIG_START_YEAR=2014
+CONFIG_SYSTEM_I2CTOOL=y
+CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_RAMTEST=y
+CONFIG_USART1_SERIAL_CONSOLE=y
[nuttx] 01/02: samv7: fix build error in sam_mcan.c file
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit d52e875a99811721a81326e8ab03949d99485612
Author: Michal Lenc <mi...@seznam.cz>
AuthorDate: Fri Feb 17 16:22:10 2023 +0100
samv7: fix build error in sam_mcan.c file
Commit d07792a caused a build error in sam_mcan.c file. This commit fixes
the build. The file now succesfully compiles and CAN works.
Signed-off-by: Michal Lenc <mi...@seznam.cz>
---
arch/arm/src/samv7/sam_mcan.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/arch/arm/src/samv7/sam_mcan.c b/arch/arm/src/samv7/sam_mcan.c
index 81ba8dbc37..4e1cbf0591 100644
--- a/arch/arm/src/samv7/sam_mcan.c
+++ b/arch/arm/src/samv7/sam_mcan.c
@@ -4220,6 +4220,7 @@ static int mcan_hw_initialize(struct sam_mcan_s *priv)
struct can_dev_s *sam_mcan_initialize(int port)
{
struct sam_mcan_s *priv;
+ struct can_dev_s *dev;
uint32_t regval;
caninfo("MCAN%d\n", port);
@@ -4243,13 +4244,14 @@ struct can_dev_s *sam_mcan_initialize(int port)
{
/* Select the MCAN0 device structure */
- priv = &g_mcan0priv;
+ dev = &g_mcan0dev;
+ priv = dev->cd_priv;
/* Configure MCAN0 Message RAM Base Address */
regval = getreg32(SAM_MATRIX_CAN0);
regval &= MATRIX_CAN0_RESERVED;
- regval |= (uint32_t)config->msgram.stdfilters &
+ regval |= (uint32_t)priv->config->msgram.stdfilters &
MATRIX_CAN0_CAN0DMABA_MASK;
putreg32(regval, SAM_MATRIX_CAN0);
}
@@ -4260,13 +4262,14 @@ struct can_dev_s *sam_mcan_initialize(int port)
{
/* Select the MCAN1 device structure */
- priv = &g_mcan1priv;
+ dev = &g_mcan1dev;
+ priv = dev->cd_priv;
/* Configure MCAN1 Message RAM Base Address */
regval = getreg32(SAM_MATRIX_CCFG_SYSIO);
regval &= ~MATRIX_CCFG_CAN1DMABA_MASK;
- regval |= (uint32_t)config->msgram.stdfilters &
+ regval |= (uint32_t)priv->config->msgram.stdfilters &
MATRIX_CCFG_CAN1DMABA_MASK;
putreg32(regval, SAM_MATRIX_CCFG_SYSIO);
}