Migrate MCU and BOOTLOADER to data-driven (qmk#19529)

jpskenn · Nov 4, 2023 · 0317dac · 0317dac
1 parent 5eca8be
commit 0317dac
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 24 deletions.
diff --git a/keyboards/nora/v01/info.json b/keyboards/nora/v01/info.json
@@ -8,6 +8,8 @@
         "pid": "0xC9D7",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [

diff --git a/keyboards/nora/v01/rules.mk b/keyboards/nora/v01/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes        # Mouse keys

diff --git a/keyboards/nora/v03/info.json b/keyboards/nora/v03/info.json
@@ -8,6 +8,8 @@
         "pid": "0xC9D7",
         "device_version": "0.3.0"
     },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [

diff --git a/keyboards/nora/v03/rules.mk b/keyboards/nora/v03/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes        # Mouse keys

diff --git a/keyboards/nora/v031/info.json b/keyboards/nora/v031/info.json
@@ -8,6 +8,8 @@
         "pid": "0xC9D7",
         "device_version": "0.3.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [

diff --git a/keyboards/nora/v031/rules.mk b/keyboards/nora/v031/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes        # Mouse keys

diff --git a/keyboards/nora/v1/info.json b/keyboards/nora/v1/info.json
@@ -8,6 +8,8 @@
         "pid": "0xC9D7",
         "device_version": "0.3.2"
     },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_all": {
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1}, {"x":14.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.5}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":3.5, "y":2}, {"x":4.5, "y":2}, {"x":5.5, "y":2}, {"x":6.5, "y":2}, {"x":7.5, "y":2}, {"x":8.5, "y":2}, {"x":9.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2}, {"x":12.5, "y":2}, {"x":13.5, "y":2}, {"x":14.5, "y":2, "w":1.5}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":2.25, "y":4, "w":1.5}, {"x":3.75, "y":4}, {"x":4.75, "y":4, "w":1.5}, {"x":6.25, "y":4}, {"x":7.25, "y":4, "w":1.5}, {"x":8.75, "y":4}, {"x":9.75, "y":4, "w":1.5}, {"x":11.25, "y":4}, {"x":12.25, "y":4, "w":1.5}]

diff --git a/keyboards/nora/v1/rules.mk b/keyboards/nora/v1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes        # Mouse keys