NuttX stm32f7 fully re-enable dcache with write back

- fixes #12216
PX4 · Jul 9, 2019 · fae6a8a · fae6a8a
1 parent 89a6b83
commit fae6a8a
Show file tree

Hide file tree

Showing 31 changed files with 14 additions and 420 deletions.
diff --git a/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark b/ROMFS/px4fmu_common/init.d/airframes/13014_vtol_babyshark
@@ -92,8 +92,6 @@ then
 	param set PWM_MAIN_MIN3 1120
 	param set PWM_MIN 950
 
-	param set SYS_FORCE_F7DC	2
-
 	param set VT_ARSP_BLEND 10
 	param set VT_ARSP_TRANS 21
 	param set VT_B_TRANS_DUR 12

diff --git a/boards/av/x-v1/default.cmake b/boards/av/x-v1/default.cmake
@@ -49,7 +49,6 @@ px4_add_board(
 		#roboclaw
 		stm32
 		stm32/adc
-		stm32/armv7-m_dcache
 		#stm32/tone_alarm
 		tap_esc
 		telemetry # all available telemetry drivers

diff --git a/boards/av/x-v1/nuttx-config/nsh/defconfig b/boards/av/x-v1/nuttx-config/nsh/defconfig
@@ -49,7 +49,6 @@ CONFIG_ARCH_MATH_H=y
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_BASEPRI_WAR=y
 CONFIG_ARMV7M_DCACHE=y
-CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_DTCM=y
 CONFIG_ARMV7M_ICACHE=y
 CONFIG_ARMV7M_MEMCPY=y

diff --git a/boards/av/x-v1/src/init.c b/boards/av/x-v1/src/init.c
@@ -164,7 +164,7 @@ __EXPORT void board_on_reset(int status)
 #ifdef CONFIG_BOARDCTL_FINALINIT
 int board_app_finalinitialize(uintptr_t arg)
 {
-	board_configure_dcache(1);
+
 	return 0;
 }
 #endif
@@ -223,9 +223,6 @@ stm32_boardinitialize(void)
 
 __EXPORT int board_app_initialize(uintptr_t arg)
 {
-
-	board_configure_dcache(0);
-
 	px4_platform_init();
 
 	/* configure the DMA allocator */

diff --git a/boards/px4/fmu-v5/default.cmake b/boards/px4/fmu-v5/default.cmake
@@ -54,7 +54,6 @@ px4_add_board(
 		roboclaw
 		stm32
 		stm32/adc
-		stm32/armv7-m_dcache
 		stm32/tone_alarm
 		tap_esc
 		telemetry # all available telemetry drivers

diff --git a/boards/px4/fmu-v5/fixedwing.cmake b/boards/px4/fmu-v5/fixedwing.cmake
@@ -38,7 +38,6 @@ px4_add_board(
 		rc_input
 		stm32
 		stm32/adc
-		stm32/armv7-m_dcache
 		stm32/tone_alarm
 		telemetry # all available telemetry drivers
 		tone_alarm

diff --git a/boards/px4/fmu-v5/multicopter.cmake b/boards/px4/fmu-v5/multicopter.cmake
@@ -42,7 +42,6 @@ px4_add_board(
 		roboclaw
 		stm32
 		stm32/adc
-		stm32/armv7-m_dcache
 		stm32/tone_alarm
 		tap_esc
 		telemetry # all available telemetry drivers

diff --git a/boards/px4/fmu-v5/nuttx-config/nsh/defconfig b/boards/px4/fmu-v5/nuttx-config/nsh/defconfig
@@ -31,7 +31,6 @@ CONFIG_ARCH_MATH_H=y
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_BASEPRI_WAR=y
 CONFIG_ARMV7M_DCACHE=y
-CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_DTCM=y
 CONFIG_ARMV7M_ICACHE=y
 CONFIG_ARMV7M_MEMCPY=y

diff --git a/boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig b/boards/px4/fmu-v5/nuttx-config/stackcheck/defconfig
@@ -24,7 +24,6 @@ CONFIG_ARCH_MATH_H=y
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_BASEPRI_WAR=y
 CONFIG_ARMV7M_DCACHE=y
-CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_DTCM=y
 CONFIG_ARMV7M_ICACHE=y
 CONFIG_ARMV7M_MEMCPY=y

diff --git a/boards/px4/fmu-v5/rover.cmake b/boards/px4/fmu-v5/rover.cmake
@@ -42,7 +42,6 @@ px4_add_board(
 		roboclaw
 		stm32
 		stm32/adc
-		stm32/armv7-m_dcache
 		stm32/tone_alarm
 		telemetry # all available telemetry drivers
 		tone_alarm

diff --git a/boards/px4/fmu-v5/rtps.cmake b/boards/px4/fmu-v5/rtps.cmake
@@ -52,7 +52,6 @@ px4_add_board(
 		roboclaw
 		stm32
 		stm32/adc
-		stm32/armv7-m_dcache
 		stm32/tone_alarm
 		tap_esc
 		telemetry # all available telemetry drivers

diff --git a/boards/px4/fmu-v5/src/init.c b/boards/px4/fmu-v5/src/init.c
@@ -211,7 +211,6 @@ __EXPORT void board_on_reset(int status)
 #ifdef CONFIG_BOARDCTL_FINALINIT
 int board_app_finalinitialize(uintptr_t arg)
 {
-	board_configure_dcache(1);
 	return 0;
 }
 #endif
@@ -279,9 +278,6 @@ stm32_boardinitialize(void)
 __EXPORT int board_app_initialize(uintptr_t arg)
 {
 	/* Power on Interfaces */
-
-	board_configure_dcache(0);
-
 	VDD_3V3_SD_CARD_EN(true);
 	VDD_5V_PERIPH_EN(true);
 	VDD_5V_HIPOWER_EN(true);

diff --git a/boards/px4/fmu-v5/stackcheck.cmake b/boards/px4/fmu-v5/stackcheck.cmake
@@ -52,7 +52,6 @@ px4_add_board(
 		roboclaw
 		stm32
 		stm32/adc
-		stm32/armv7-m_dcache
 		stm32/tone_alarm
 		tap_esc
 		telemetry # all available telemetry drivers
@@ -90,6 +89,7 @@ px4_add_board(
 	SYSTEMCMDS
 		bl_update
 		config
+		dmesg
 		dumpfile
 		esc_calib
 		hardfault_log

diff --git a/boards/px4/fmu-v5x/default.cmake b/boards/px4/fmu-v5x/default.cmake
@@ -54,7 +54,6 @@ px4_add_board(
 		roboclaw
 		stm32
 		stm32/adc
-		stm32/armv7-m_dcache
 		stm32/tone_alarm
 		tap_esc
 		telemetry # all available telemetry drivers

diff --git a/boards/px4/fmu-v5x/fixedwing.cmake b/boards/px4/fmu-v5x/fixedwing.cmake
@@ -48,7 +48,6 @@ px4_add_board(
 		rc_input
 		stm32
 		stm32/adc
-		stm32/armv7-m_dcache
 		stm32/tone_alarm
 		telemetry # all available telemetry drivers
 		tone_alarm

diff --git a/boards/px4/fmu-v5x/multicopter.cmake b/boards/px4/fmu-v5x/multicopter.cmake
@@ -49,7 +49,6 @@ px4_add_board(
 		roboclaw
 		stm32
 		stm32/adc
-		stm32/armv7-m_dcache
 		stm32/tone_alarm
 		tap_esc
 		telemetry # all available telemetry drivers

diff --git a/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig b/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig
@@ -31,7 +31,6 @@ CONFIG_ARCH_MATH_H=y
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_BASEPRI_WAR=y
 CONFIG_ARMV7M_DCACHE=y
-CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_DTCM=y
 CONFIG_ARMV7M_ICACHE=y
 CONFIG_ARMV7M_MEMCPY=y

diff --git a/boards/px4/fmu-v5x/nuttx-config/stackcheck/defconfig b/boards/px4/fmu-v5x/nuttx-config/stackcheck/defconfig
@@ -24,7 +24,6 @@ CONFIG_ARCH_MATH_H=y
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARMV7M_BASEPRI_WAR=y
 CONFIG_ARMV7M_DCACHE=y
-CONFIG_ARMV7M_DCACHE_WRITETHROUGH=y
 CONFIG_ARMV7M_DTCM=y
 CONFIG_ARMV7M_ICACHE=y
 CONFIG_ARMV7M_MEMCPY=y
@@ -144,7 +143,6 @@ CONFIG_SCHED_LPWORKPRIORITY=50
 CONFIG_SCHED_LPWORKSTACKSIZE=1800
 CONFIG_SCHED_WAITPID=y
 CONFIG_SDCLONE_DISABLE=y
-CONFIG_SDMMC1_SDIO_MODE=y
 CONFIG_SEM_NNESTPRIO=8
 CONFIG_SEM_PREALLOCHOLDERS=0
 CONFIG_SERIAL_IFLOWCONTROL_WATERMARKS=y
@@ -223,8 +221,8 @@ CONFIG_UART7_RXDMA=y
 CONFIG_UART7_TXBUFSIZE=3000
 CONFIG_UART8_BAUD=57600
 CONFIG_UART8_RXBUFSIZE=600
-CONFIG_UART8_TXBUFSIZE=1500
 CONFIG_UART8_RXDMA=y
+CONFIG_UART8_TXBUFSIZE=1500
 CONFIG_USART1_BAUD=57600
 CONFIG_USART1_RXBUFSIZE=600
 CONFIG_USART1_TXBUFSIZE=1500
@@ -233,9 +231,9 @@ CONFIG_USART2_IFLOWCONTROL=y
 CONFIG_USART2_OFLOWCONTROL=y
 CONFIG_USART2_RXBUFSIZE=600
 CONFIG_USART2_TXBUFSIZE=3000
-CONFIG_USART3_SERIAL_CONSOLE=y
 CONFIG_USART3_BAUD=57600
 CONFIG_USART3_RXBUFSIZE=180
+CONFIG_USART3_SERIAL_CONSOLE=y
 CONFIG_USART3_TXBUFSIZE=1500
 CONFIG_USART6_BAUD=57600
 CONFIG_USART6_RXBUFSIZE=600

diff --git a/boards/px4/fmu-v5x/rover.cmake b/boards/px4/fmu-v5x/rover.cmake
@@ -52,7 +52,6 @@ px4_add_board(
 		roboclaw
 		stm32
 		stm32/adc
-		stm32/armv7-m_dcache
 		stm32/tone_alarm
 		telemetry # all available telemetry drivers
 		tone_alarm

diff --git a/boards/px4/fmu-v5x/rtps.cmake b/boards/px4/fmu-v5x/rtps.cmake
@@ -54,7 +54,6 @@ px4_add_board(
 		roboclaw
 		stm32
 		stm32/adc
-		stm32/armv7-m_dcache
 		stm32/tone_alarm
 		tap_esc
 		telemetry # all available telemetry drivers

diff --git a/boards/px4/fmu-v5x/src/init.c b/boards/px4/fmu-v5x/src/init.c
@@ -217,7 +217,6 @@ __EXPORT void board_on_reset(int status)
 #ifdef CONFIG_BOARDCTL_FINALINIT
 int board_app_finalinitialize(uintptr_t arg)
 {
-	board_configure_dcache(1);
 	return 0;
 }
 #endif
@@ -285,9 +284,6 @@ stm32_boardinitialize(void)
 __EXPORT int board_app_initialize(uintptr_t arg)
 {
 	/* Power on Interfaces */
-
-	board_configure_dcache(0);
-
 	VDD_3V3_SD_CARD_EN(true);
 	VDD_5V_PERIPH_EN(true);
 	VDD_5V_HIPOWER_EN(true);

diff --git a/boards/px4/fmu-v5x/stackcheck.cmake b/boards/px4/fmu-v5x/stackcheck.cmake
@@ -54,7 +54,6 @@ px4_add_board(
 		roboclaw
 		stm32
 		stm32/adc
-		stm32/armv7-m_dcache
 		stm32/tone_alarm
 		tap_esc
 		telemetry # all available telemetry drivers

diff --git a/src/drivers/boards/common/CMakeLists.txt b/src/drivers/boards/common/CMakeLists.txt
@@ -39,7 +39,6 @@ if ((${PX4_PLATFORM} MATCHES "nuttx") AND NOT ${PX4_BOARD} MATCHES "io")
 		board_dma_alloc.c
 		board_fat_dma_alloc.c
 		board_gpio_init.c
-		board_dcache_control.c
 		)
 
 	if (${CONFIG_ARCH_CHIP} MATCHES "kinetis")