From 41cbd77db3d337aa357fd906ef8f41217a582897 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Tue, 2 Dec 2025 01:56:55 -0600
Subject: [PATCH] Move everything from /arch to /variant (#8831)

---
 platformio.ini                                             | 2 +-
 {arch => variants}/esp32/esp32.ini                         | 0
 {arch/esp32 => variants/esp32c3}/esp32c3.ini               | 0
 {arch/esp32 => variants/esp32c6}/esp32c6.ini               | 0
 {arch/esp32 => variants/esp32s2}/esp32s2.ini               | 0
 {arch/esp32 => variants/esp32s3}/esp32s3.ini               | 0
 {arch/portduino => variants/native}/portduino.ini          | 0
 {arch/nrf52 => variants/nrf52840}/cpp_overrides/lfs_util.h | 0
 {arch/nrf52 => variants/nrf52840}/nrf52.ini                | 2 +-
 {arch/nrf52 => variants/nrf52840}/nrf52832.ini             | 0
 {arch/nrf52 => variants/nrf52840}/nrf52840.ini             | 0
 {arch/rp2xx0 => variants/rp2040}/rp2040.ini                | 0
 {arch/rp2xx0 => variants/rp2350}/rp2350.ini                | 0
 {arch => variants}/stm32/stm32.ini                         | 0
 14 files changed, 2 insertions(+), 2 deletions(-)
 rename {arch => variants}/esp32/esp32.ini (100%)
 rename {arch/esp32 => variants/esp32c3}/esp32c3.ini (100%)
 rename {arch/esp32 => variants/esp32c6}/esp32c6.ini (100%)
 rename {arch/esp32 => variants/esp32s2}/esp32s2.ini (100%)
 rename {arch/esp32 => variants/esp32s3}/esp32s3.ini (100%)
 rename {arch/portduino => variants/native}/portduino.ini (100%)
 rename {arch/nrf52 => variants/nrf52840}/cpp_overrides/lfs_util.h (100%)
 rename {arch/nrf52 => variants/nrf52840}/nrf52.ini (96%)
 rename {arch/nrf52 => variants/nrf52840}/nrf52832.ini (100%)
 rename {arch/nrf52 => variants/nrf52840}/nrf52840.ini (100%)
 rename {arch/rp2xx0 => variants/rp2040}/rp2040.ini (100%)
 rename {arch/rp2xx0 => variants/rp2350}/rp2350.ini (100%)
 rename {arch => variants}/stm32/stm32.ini (100%)

diff --git a/platformio.ini b/platformio.ini
index 5b9d965ef..9b8d0a124 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -5,7 +5,7 @@
 default_envs = tbeam
 
 extra_configs =
-	arch/*/*.ini
+	variants/*/*.ini
 	variants/*/*/platformio.ini
 	variants/*/diy/*/platformio.ini
 	src/graphics/niche/InkHUD/PlatformioConfig.ini
diff --git a/arch/esp32/esp32.ini b/variants/esp32/esp32.ini
similarity index 100%
rename from arch/esp32/esp32.ini
rename to variants/esp32/esp32.ini
diff --git a/arch/esp32/esp32c3.ini b/variants/esp32c3/esp32c3.ini
similarity index 100%
rename from arch/esp32/esp32c3.ini
rename to variants/esp32c3/esp32c3.ini
diff --git a/arch/esp32/esp32c6.ini b/variants/esp32c6/esp32c6.ini
similarity index 100%
rename from arch/esp32/esp32c6.ini
rename to variants/esp32c6/esp32c6.ini
diff --git a/arch/esp32/esp32s2.ini b/variants/esp32s2/esp32s2.ini
similarity index 100%
rename from arch/esp32/esp32s2.ini
rename to variants/esp32s2/esp32s2.ini
diff --git a/arch/esp32/esp32s3.ini b/variants/esp32s3/esp32s3.ini
similarity index 100%
rename from arch/esp32/esp32s3.ini
rename to variants/esp32s3/esp32s3.ini
diff --git a/arch/portduino/portduino.ini b/variants/native/portduino.ini
similarity index 100%
rename from arch/portduino/portduino.ini
rename to variants/native/portduino.ini
diff --git a/arch/nrf52/cpp_overrides/lfs_util.h b/variants/nrf52840/cpp_overrides/lfs_util.h
similarity index 100%
rename from arch/nrf52/cpp_overrides/lfs_util.h
rename to variants/nrf52840/cpp_overrides/lfs_util.h
diff --git a/arch/nrf52/nrf52.ini b/variants/nrf52840/nrf52.ini
similarity index 96%
rename from arch/nrf52/nrf52.ini
rename to variants/nrf52840/nrf52.ini
index e60d47ce7..2904f770e 100644
--- a/arch/nrf52/nrf52.ini
+++ b/variants/nrf52840/nrf52.ini
@@ -13,7 +13,7 @@ platform_packages =
 
 build_type = debug
 build_flags =
-  -include arch/nrf52/cpp_overrides/lfs_util.h
+  -include variants/nrf52840/cpp_overrides/lfs_util.h
   ${arduino_base.build_flags}
   -DSERIAL_BUFFER_SIZE=1024
   -Wno-unused-variable
diff --git a/arch/nrf52/nrf52832.ini b/variants/nrf52840/nrf52832.ini
similarity index 100%
rename from arch/nrf52/nrf52832.ini
rename to variants/nrf52840/nrf52832.ini
diff --git a/arch/nrf52/nrf52840.ini b/variants/nrf52840/nrf52840.ini
similarity index 100%
rename from arch/nrf52/nrf52840.ini
rename to variants/nrf52840/nrf52840.ini
diff --git a/arch/rp2xx0/rp2040.ini b/variants/rp2040/rp2040.ini
similarity index 100%
rename from arch/rp2xx0/rp2040.ini
rename to variants/rp2040/rp2040.ini
diff --git a/arch/rp2xx0/rp2350.ini b/variants/rp2350/rp2350.ini
similarity index 100%
rename from arch/rp2xx0/rp2350.ini
rename to variants/rp2350/rp2350.ini
diff --git a/arch/stm32/stm32.ini b/variants/stm32/stm32.ini
similarity index 100%
rename from arch/stm32/stm32.ini
rename to variants/stm32/stm32.ini