From ed0b5a7c1a12fd975caf88ab859b81866866f72c Mon Sep 17 00:00:00 2001
From: Peter van der Perk <peter.vanderperk@nxp.com>
Date: Fri, 28 May 2021 15:05:28 +0200
Subject: [PATCH] FMUK66 update socketcan configs

---
 boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig  | 5 ++---
 boards/nxp/fmuk66-e/socketcan.cmake                   | 3 +--
 boards/nxp/fmuk66-v3/nuttx-config/socketcan/defconfig | 1 +
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig b/boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig
index 0eedb3e153..807b7a19c4 100644
--- a/boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig
+++ b/boards/nxp/fmuk66-e/nuttx-config/socketcan/defconfig
@@ -41,8 +41,6 @@ CONFIG_DEBUG_HARDFAULT_ALERT=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_FIFO_SIZE=0
 CONFIG_DEV_PIPE_SIZE=70
-CONFIG_DISABLE_MQUEUE=y
-CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_ETH0_PHY_TJA1100=y
 CONFIG_FAT_DMAMEMORY=y
 CONFIG_FAT_LCNAMES=y
@@ -64,7 +62,7 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_I2C_RESET=y
 CONFIG_IDLETHREAD_STACKSIZE=750
 CONFIG_IOB_NBUFFERS=48
-CONFIG_IOB_NCHAINS=16
+CONFIG_IOB_NCHAINS=18
 CONFIG_KINETIS_ADC0=y
 CONFIG_KINETIS_ADC1=y
 CONFIG_KINETIS_CRC=y
@@ -113,6 +111,7 @@ CONFIG_LPUART0_SERIAL_CONSOLE=y
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MMCSD=y
+CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MTD=y
 CONFIG_MTD_BYTE_WRITE=y
diff --git a/boards/nxp/fmuk66-e/socketcan.cmake b/boards/nxp/fmuk66-e/socketcan.cmake
index 4b41341924..12e45c1e82 100644
--- a/boards/nxp/fmuk66-e/socketcan.cmake
+++ b/boards/nxp/fmuk66-e/socketcan.cmake
@@ -8,7 +8,6 @@ px4_add_board(
 	ARCHITECTURE cortex-m4
 	CONSTRAINED_MEMORY
 	ROMFSROOT px4fmu_common
-	UAVCAN_INTERFACES 2
 	SERIAL_PORTS
 		GPS1:/dev/ttyS3
 		TEL1:/dev/ttyS4
@@ -47,7 +46,7 @@ px4_add_board(
 		safety_button
 		telemetry # all available telemetry drivers
 		tone_alarm
-		#uavcannode_v1
+		uavcan_v1
 	MODULES
 		airspeed_selector
 		attitude_estimator_q
diff --git a/boards/nxp/fmuk66-v3/nuttx-config/socketcan/defconfig b/boards/nxp/fmuk66-v3/nuttx-config/socketcan/defconfig
index b4c08cc30d..4308bbcdef 100644
--- a/boards/nxp/fmuk66-v3/nuttx-config/socketcan/defconfig
+++ b/boards/nxp/fmuk66-v3/nuttx-config/socketcan/defconfig
@@ -112,6 +112,7 @@ CONFIG_LPUART0_SERIAL_CONSOLE=y
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MMCSD=y
+CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MTD=y
 CONFIG_MTD_BYTE_WRITE=y