Migrate remaining variants to new dir structure

platformio.ini

@@ -6,7 +6,6 @@ default_envs = tbeam
 
 extra_configs =
 	arch/*/*.ini
-	variants/*/platformio.ini ; Remove when all variants migrated to new dir structure
 	variants/*/*/platformio.ini
 	variants/*/diy/*/platformio.ini
 	src/graphics/niche/InkHUD/PlatformioConfig.ini

variants/esp32c6/tlora_c6/platformio.ini

@@ -4,6 +4,6 @@ board = esp32-c6-devkitm-1
 build_flags = 
   ${esp32c6_base.build_flags}
   -D TLORA_C6
-  -I variants/tlora_c6
+  -I variants/esp32c6/tlora_c6
   -DARDUINO_USB_CDC_ON_BOOT=1
   -DARDUINO_USB_MODE=1

variants/esp32s3/mesh-tab/platformio.ini

@@ -45,7 +45,7 @@ build_flags = ${esp32s3_base.build_flags}
   -D LGFX_TOUCH_INT=41
   -D VIEW_320x240
   -D USE_PACKET_API
-  -I variants/mesh-tab
+  -I variants/esp32s3/mesh-tab
 build_src_filter = ${esp32_base.build_src_filter}
 lib_deps =
   ${esp32_base.lib_deps}

variants/native/portduino-buildroot/platformio.ini

@@ -2,7 +2,7 @@
 extends = portduino_base
 ; Optional libraries should be appended to `PLATFORMIO_BUILD_FLAGS`
 ; environment variable in the buildroot environment.
-build_flags = ${portduino_base.build_flags} -O0 -I variants/portduino-buildroot
+build_flags = ${portduino_base.build_flags} -O0 -I variants/native/portduino-buildroot
 board = buildroot
 lib_deps = ${portduino_base.lib_deps}
 build_src_filter = ${portduino_base.build_src_filter}

variants/native/portduino/platformio.ini

@@ -1,6 +1,6 @@
 [native_base]
 extends = portduino_base
-build_flags = ${portduino_base.build_flags} -I variants/portduino
+build_flags = ${portduino_base.build_flags} -I variants/native/portduino
   -D ARCH_PORTDUINO
   -I /usr/include
 board = cross_platform