Merge upstream changes from Marlin 2.1.2

2022-12-19 15:23:45 +01:00
parent fe9ea826a5
commit 67c7ce7b79
427 changed files with 10732 additions and 7834 deletions
--- a/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
+++ b/Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
@@ -27,8 +27,8 @@
 #include "../../../inc/MarlinConfig.h"
 #include "SPIFlashStorage.h"

-#if !HAS_SPI_FLASH
-  #error "HAS_SPI_FLASH is required with TFT_LVGL_UI."
+#if DISABLED(SPI_FLASH)
+  #error "SPI_FLASH is required with TFT_LVGL_UI."
 #endif

 extern W25QXXFlash W25QXX;