Merge pull request #11 from LonghornRacingElectric/toolchain-fixes

Super cool fixes to toolchain should work on windows

Author: Rolandw31

MODULE.bazel

@@ -12,8 +12,8 @@ arm_toolchain = use_extension("@toolchains_arm_gnu//:extensions.bzl", "arm_toolc
 
 arm_toolchain.arm_none_eabi(version = "13.2.1")
 use_repo(arm_toolchain, "arm_none_eabi")
-# register_toolchains("@arm_none_eabi//toolchain:all")
-register_toolchains("//toolchain:all")
+register_toolchains("@arm_none_eabi//toolchain:all")
+# register_toolchains("//toolchain:all")
 
 bazel_dep(name = "rules_python", version = "1.5.3")
 

VCU/BUILD

@@ -1,48 +1,14 @@
-load("@rules_cc//cc:defs.bzl", "cc_binary")
-load("//:tools/outputs/build_outputs.bzl", "binary_out", "hex_out")
+load("//:tools/outputs/build_outputs.bzl", "binary_out", "hex_out", "firmware_project")
 
-cc_binary(
+firmware_project(
     name = "vcu_firmware_2026",
-    srcs = glob([
-        "Core/Src/**/*.c",
-        "Core/Inc/**/*.h",
-    ], allow_empty = True)
-    + [
-        # Include the HAL for compilation
-        "//drivers/stm32g4:hal_srcs",
-    ],
-
-    includes = [
-        "Core/Inc",
-    ],
-
-    deps = [
-        "//drivers/stm32g4:stm32_headers",
-    ],
-
-    # Linker options, also includes the reset handler startup file
-    linkopts = [
-        "-T $(location //toolchain:stm32g474vetx_flash_script)",
-        "$(location //toolchain:stm32g474_startup)",
-    ],
-
+    linker_script = "//toolchain:stm32g474vetx_flash_script",
+    startup_script = "//toolchain:stm32g474_startup",
     defines = [
         "DEBUG",
         "USE_HAL_DRIVER",
         "STM32G474xx",
     ],
-
-    additional_linker_inputs = [
-        "//toolchain:stm32g474vetx_flash_script",
-        "//toolchain:stm32g474_startup",
-    ],
-
-    target_compatible_with = [
-        "@platforms//cpu:arm",
-        "@platforms//os:none",
-    ],
-
-    visibility = ["//visibility:public"],
 )
 
 binary_out(

VCU/firmware/BUILD.bazel

@@ -1,5 +1,7 @@
 """Macro for creating binary and hex files using objcopy."""
 
+load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
+
 def binary_out(name, src, visibility = None, **kwargs):
     """
     Runs objcopy to convert a source file (e.g., an ELF) into a raw binary.
@@ -40,4 +42,63 @@ def hex_out(name, src, visibility = None, **kwargs):
         tools = ["@arm_none_eabi//:objcopy"],
         visibility = visibility,
         **kwargs
-    )
+    )
+
+MCU_FLAGS = [
+    "-mcpu=cortex-m4",
+    "-mthumb",
+    "-mfpu=fpv4-sp-d16",
+    "-mfloat-abi=hard",
+]
+  
+def firmware_project(name, linker_script, startup_script, defines = [], extra_srcs = [], **kwargs):
+  cc_binary(
+    name = name,
+    srcs = native.glob([
+        "Core/Src/**/*.c",
+        "Core/Inc/**/*.h",
+    ], allow_empty = True)
+    + [
+        # Include the HAL for compilation
+        "//drivers/stm32g4:hal_srcs",
+    ] + extra_srcs,
+
+    includes = [
+        "Core/Inc",
+    ],
+
+    deps = [
+        "//drivers/stm32g4:stm32_headers",
+    ],
+
+    # Linker options, also includes the reset handler startup file
+    linkopts = MCU_FLAGS + [
+        "-Wl,-Map=output.map",
+        "-Wl,--gc-sections",
+        "-Wl,--no-warn-rwx-segments",
+        "-T $(location " + linker_script +")",
+        "$(location " + startup_script +")",
+    ],
+
+    defines = defines,
+
+    additional_linker_inputs = [
+        linker_script,
+        startup_script,
+    ],
+
+    target_compatible_with = [
+        "@platforms//cpu:arm",
+        "@platforms//os:none",
+    ],
+
+    copts = MCU_FLAGS + [
+        "-mthumb-interwork",
+        "-ffunction-sections",
+        "-fdata-sections",
+    ],
+  
+    visibility = ["//visibility:public"],
+
+    **kwargs
+)