Migrate WEAR_LEVELING_*_SIZE to info.json (qmk#22010)

christrotter · Nov 28, 2023 · 40db9da · 40db9da
1 parent b73d8bc
commit 40db9da
Show file tree

Hide file tree

Showing 58 changed files with 89 additions and 120 deletions.
diff --git a/keyboards/akko/5108/config.h b/keyboards/akko/5108/config.h
@@ -35,7 +35,6 @@
 #define SPI_MOSI_PAL_MODE 5
 
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
-#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)
 
 /* I2C Config for LED Driver */
 #define IS31FL3733_DRIVER_COUNT 2

diff --git a/keyboards/akko/5108/info.json b/keyboards/akko/5108/info.json
@@ -29,7 +29,8 @@
     "eeprom": {
         "driver": "wear_leveling",
         "wear_leveling": {
-            "driver": "spi_flash"
+            "driver": "spi_flash",
+            "backing_size": 8192
         }
     },
     "indicators": {

diff --git a/keyboards/akko/acr87/config.h b/keyboards/akko/acr87/config.h
@@ -32,7 +32,6 @@
 #define SPI_MOSI_PAL_MODE 5
 
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
-#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)
 
 /* I2C Config for LED Driver */
 #define IS31FL3733_DRIVER_COUNT 3

diff --git a/keyboards/akko/acr87/info.json b/keyboards/akko/acr87/info.json
@@ -29,7 +29,8 @@
     "eeprom": {
         "driver": "wear_leveling",
         "wear_leveling": {
-            "driver": "spi_flash"
+            "driver": "spi_flash",
+            "backing_size": 8192
         }
     },
     "rgb_matrix": {

diff --git a/keyboards/akko/top40/config.h b/keyboards/akko/top40/config.h
@@ -32,7 +32,6 @@
 #define SPI_MOSI_PAL_MODE 5
 
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
-#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)
 
 /* I2C Config for LED Driver */
 #define IS31FL3733_DRIVER_COUNT 2

diff --git a/keyboards/akko/top40/info.json b/keyboards/akko/top40/info.json
@@ -29,7 +29,8 @@
     "eeprom": {
         "driver": "wear_leveling",
         "wear_leveling": {
-            "driver": "spi_flash"
+            "driver": "spi_flash",
+            "backing_size": 8192
         }
     },
     "rgb_matrix": {

diff --git a/keyboards/annepro2/c15/config.h b/keyboards/annepro2/c15/config.h
@@ -57,7 +57,3 @@
 #define EXTERNAL_FLASH_SECTOR_SIZE 4096
 #define EXTERNAL_FLASH_BLOCK_SIZE 4096
 #define EXTERNAL_FLASH_SIZE (256 * 1024) // 2M-bit flash size
-
-// Wear-leveling driver configuration
-#define WEAR_LEVELING_LOGICAL_SIZE 1024
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
diff --git a/keyboards/annepro2/c15/info.json b/keyboards/annepro2/c15/info.json
@@ -6,7 +6,8 @@
     "eeprom": {
         "driver": "wear_leveling",
         "wear_leveling": {
-            "driver": "spi_flash"
+            "driver": "spi_flash",
+            "backing_size": 2048
         }
     },
     "rgb_matrix": {

diff --git a/keyboards/annepro2/c18/config.h b/keyboards/annepro2/c18/config.h
@@ -55,7 +55,3 @@
 #define EXTERNAL_FLASH_SECTOR_SIZE 4096
 #define EXTERNAL_FLASH_BLOCK_SIZE 4096
 #define EXTERNAL_FLASH_SIZE (256 * 1024) // 2M-bit flash size
-
-// Wear-leveling driver configuration
-#define WEAR_LEVELING_LOGICAL_SIZE 1024
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
diff --git a/keyboards/annepro2/c18/info.json b/keyboards/annepro2/c18/info.json
@@ -6,7 +6,8 @@
     "eeprom": {
         "driver": "wear_leveling",
         "wear_leveling": {
-            "driver": "spi_flash"
+            "driver": "spi_flash",
+            "backing_size": 2048
         }
     },
     "rgb_matrix": {

diff --git a/keyboards/binepad/bn006/config.h b/keyboards/binepad/bn006/config.h
@@ -3,14 +3,6 @@
 
 #pragma once
 
-/*
- * Wear Leveling EEPROM Emulation
- */
-
-#define WEAR_LEVELING_LOGICAL_SIZE 2048                              // Number of bytes "exposed" to the rest of QMK and denotes the size of the usable EEPROM.
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)  // Number of bytes used by the wear-leveling algorithm for its underlying storage, and needs to be a multiple of the logical size.
-
-
 /*
  * RGB Matrix
  */

diff --git a/keyboards/binepad/bn006/info.json b/keyboards/binepad/bn006/info.json
@@ -24,6 +24,11 @@
         "pid": "0x426E",
         "device_version": "1.0.0"
     },
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
     "ws2812": {
         "pin": "B15"
     },

diff --git a/keyboards/binepad/bn006/rules.mk b/keyboards/binepad/bn006/rules.mk
@@ -1,5 +1 @@
-# Copyright 2022 Binepad (@binpad)
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-EPROM_DRIVER = wear_leveling
-WEAR_LEVELING_DRIVER = embedded_flash
+# This file intentionally left blank
diff --git a/keyboards/binepad/bn009/r2/config.h b/keyboards/binepad/bn009/r2/config.h
diff --git a/keyboards/binepad/bn009/r2/info.json b/keyboards/binepad/bn009/r2/info.json
@@ -6,6 +6,11 @@
         "cols": ["A1", "A2", "A6"],
         "rows": ["B6", "B7", "B2"]
     },
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
     "processor": "STM32F103",
     "usb": {
         "device_version": "2.0.0"

diff --git a/keyboards/binepad/bnr1/v2/config.h b/keyboards/binepad/bnr1/v2/config.h
diff --git a/keyboards/chosfox/cf81/config.h b/keyboards/chosfox/cf81/config.h
@@ -32,7 +32,6 @@
 #define SPI_MOSI_PAL_MODE 5
 
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
-#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)
 
 /* I2C Config for LED Driver */
 #define IS31FL3733_DRIVER_COUNT 2

diff --git a/keyboards/chosfox/cf81/info.json b/keyboards/chosfox/cf81/info.json
@@ -12,7 +12,8 @@
     "eeprom": {
         "driver": "wear_leveling",
         "wear_leveling": {
-            "driver": "spi_flash"
+            "driver": "spi_flash",
+            "backing_size": 8192
         }
     },
     "processor": "WB32FQ95",

diff --git a/keyboards/gmmk/gmmk2/p96/ansi/info.json b/keyboards/gmmk/gmmk2/p96/ansi/info.json
@@ -22,7 +22,8 @@
     "eeprom": {
         "driver": "wear_leveling",
         "wear_leveling": {
-            "driver": "spi_flash"
+            "driver": "spi_flash",
+            "backing_size": 2048
         }
     },
     "processor": "WB32F3G71",

diff --git a/keyboards/gmmk/gmmk2/p96/config.h b/keyboards/gmmk/gmmk2/p96/config.h
@@ -25,7 +25,6 @@
 
 /* External spi flash */
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14
-#define WEAR_LEVELING_BACKING_SIZE 2048
 
 /* SPI Config for LED Driver */
 #define SPI_DRIVER SPIDQ

diff --git a/keyboards/gmmk/gmmk2/p96/iso/info.json b/keyboards/gmmk/gmmk2/p96/iso/info.json
@@ -22,7 +22,8 @@
     "eeprom": {
         "driver": "wear_leveling",
         "wear_leveling": {
-            "driver": "spi_flash"
+            "driver": "spi_flash",
+            "backing_size": 2048
         }
     },
     "processor": "WB32F3G71",

diff --git a/keyboards/gmmk/numpad/config.h b/keyboards/gmmk/numpad/config.h
@@ -37,7 +37,6 @@
 #define RGB_MATRIX_LED_COUNT 31
 
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B6
-#define WEAR_LEVELING_BACKING_SIZE 2048
 
 #define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN

diff --git a/keyboards/gmmk/numpad/info.json b/keyboards/gmmk/numpad/info.json
@@ -11,7 +11,8 @@
     "eeprom": {
         "driver": "wear_leveling",
         "wear_leveling": {
-            "driver": "spi_flash"
+            "driver": "spi_flash",
+            "backing_size": 2048
         }
     },
     "encoder": {

diff --git a/keyboards/gmmk/pro/rev2/ansi/info.json b/keyboards/gmmk/pro/rev2/ansi/info.json
@@ -19,7 +19,8 @@
     "eeprom": {
         "driver": "wear_leveling",
         "wear_leveling": {
-            "driver": "spi_flash"
+            "driver": "spi_flash",
+            "backing_size": 2048
         }
     },
     "encoder": {

diff --git a/keyboards/gmmk/pro/rev2/config.h b/keyboards/gmmk/pro/rev2/config.h
@@ -19,7 +19,6 @@
 
 /* External spi flash */
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B12
-#define WEAR_LEVELING_BACKING_SIZE 2048
 
 /* SPI Config for LED Driver */
 #define SPI_DRIVER SPIDQ
diff --git a/keyboards/gmmk/pro/rev2/iso/info.json b/keyboards/gmmk/pro/rev2/iso/info.json
@@ -19,7 +19,8 @@
     "eeprom": {
         "driver": "wear_leveling",
         "wear_leveling": {
-            "driver": "spi_flash"
+            "driver": "spi_flash",
+            "backing_size": 2048
         }
     },
     "encoder": {

diff --git a/keyboards/hfdkb/ac001/config.h b/keyboards/hfdkb/ac001/config.h
@@ -32,7 +32,6 @@
 #define SPI_MOSI_PAL_MODE 5
 
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
-#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)
 
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 

diff --git a/keyboards/hfdkb/ac001/info.json b/keyboards/hfdkb/ac001/info.json
@@ -20,7 +20,8 @@
     "eeprom": {
         "driver": "wear_leveling",
         "wear_leveling": {
-            "driver": "spi_flash"
+            "driver": "spi_flash",
+            "backing_size": 8192
         }
     },
     "ws2812": {

diff --git a/keyboards/horrortroll/handwired_k552/config.h b/keyboards/horrortroll/handwired_k552/config.h
@@ -30,10 +30,6 @@
 #define EXTERNAL_FLASH_BLOCK_SIZE 4096
 #define EXTERNAL_FLASH_SIZE (256 * 1024) // 2M-bit flash size
 
-// Wear-leveling driver configuration
-#define WEAR_LEVELING_LOGICAL_SIZE 1024
-#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-
 #ifdef OLED_ENABLE
     /* Mapping I2C2 for OLED */
     #define I2C1_SCL_PIN B10

diff --git a/keyboards/horrortroll/handwired_k552/info.json b/keyboards/horrortroll/handwired_k552/info.json
@@ -23,7 +23,8 @@
     "eeprom": {
         "driver": "wear_leveling",
         "wear_leveling": {
-            "driver": "spi_flash"
+            "driver": "spi_flash",
+            "backing_size": 2048
         }
     },
     "community_layouts": ["tkl_ansi"],

diff --git a/keyboards/ibm/model_m/yugo_m/config.h b/keyboards/ibm/model_m/yugo_m/config.h
@@ -36,7 +36,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* redefine available (emulated) EEPROM as 4 kB rather than the default 2 kB to let VIA use more of the on-chip Flash of the STM32F303 to store 4 layers (since 4 layers * 8 rows * 16 columns * 2 = 1024 bytes but the default max available is 1023 bytes due to ATMEGA32U4 etc. only having 1 kB of EEPROM) */
-#define WEAR_LEVELING_BACKING_SIZE 4096
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
diff --git a/keyboards/ibm/model_m/yugo_m/info.json b/keyboards/ibm/model_m/yugo_m/info.json
@@ -13,6 +13,11 @@
         "rows": ["B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"]
     },
     "diode_direction": "ROW2COL",
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "board": "QMK_PROTON_C",

diff --git a/keyboards/inland/kb83/config.h b/keyboards/inland/kb83/config.h
@@ -36,7 +36,6 @@
 #define SPI_MOSI_PAL_MODE 5
 
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
-#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)
 
 /* I2C Config for LED Driver */
 #define IS31FL3733_DRIVER_COUNT 2

diff --git a/keyboards/inland/kb83/info.json b/keyboards/inland/kb83/info.json
@@ -21,7 +21,8 @@
     "eeprom": {
         "driver": "wear_leveling",
         "wear_leveling": {
-            "driver": "spi_flash"
+            "driver": "spi_flash",
+            "backing_size": 8192
         }
     },
     "encoder": {

diff --git a/keyboards/inland/mk47/config.h b/keyboards/inland/mk47/config.h
@@ -23,7 +23,6 @@
 #define SPI_MISO_PIN B4
 
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
-#define WEAR_LEVELING_BACKING_SIZE (4 * 1024)
 
 /* I2C Config for LED Driver */
 #define IS31FL3733_DRIVER_COUNT 1

diff --git a/keyboards/inland/mk47/info.json b/keyboards/inland/mk47/info.json
@@ -29,7 +29,8 @@
     "eeprom": {
         "driver": "wear_leveling",
         "wear_leveling": {
-            "driver": "spi_flash"
+            "driver": "spi_flash",
+            "backing_size": 4096
         }
     },
     "rgb_matrix": {

diff --git a/keyboards/mechlovin/hex6c/config.h b/keyboards/mechlovin/hex6c/config.h
@@ -18,6 +18,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define BACKLIGHT_PWM_DRIVER PWMD3
-
-#define WEAR_LEVELING_BACKING_SIZE 4096
-#define WEAR_LEVELING_LOGICAL_SIZE 2048
diff --git a/keyboards/mechlovin/hex6c/info.json b/keyboards/mechlovin/hex6c/info.json
@@ -13,6 +13,11 @@
         "rows": ["A10", "B13", "B12", "B11", "C14", "C15"]
     },
     "diode_direction": "COL2ROW",
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "A15", "pin_b": "A2"}

diff --git a/keyboards/mode/m75h/config.h b/keyboards/mode/m75h/config.h
diff --git a/keyboards/mode/m75h/info.json b/keyboards/mode/m75h/info.json
@@ -13,6 +13,11 @@
         "rows": ["C5", "B0", "B14", "B15", "A8", "C9", "A15"]
     },
     "diode_direction": "COL2ROW",
+    "eeprom": {
+        "wear_leveling": {
+            "backing_size": 4096
+        }
+    },
     "processor": "STM32F401",
     "bootloader": "stm32-dfu",
     "layout_aliases": {