diff --git a/tools/cpp/CROSSTOOL b/tools/cpp/CROSSTOOL
index 0b1223e..c015eaa 100644
--- a/tools/cpp/CROSSTOOL
+++ b/tools/cpp/CROSSTOOL
@@ -910,7 +910,8 @@
   linker_flag: "-lstdc++_nano"
   linker_flag: "-lm"
   linker_flag: "-lc_nano"
-  linker_flag: "-Tmotors/core/kinetis_192k.ld"
+  linker_flag: "-Tmotors/core/kinetis_512_256.ld"
+  linker_flag: "-Tmotors/core/kinetis_sections.ld"
   objcopy_embed_flag: "-I"
   objcopy_embed_flag: "binary"
   compilation_mode_flags {
@@ -1112,7 +1113,8 @@
   linker_flag: "-lstdc++_nano"
   linker_flag: "-lm"
   linker_flag: "-lc_nano"
-  linker_flag: "-Tmotors/core/kinetis_128k.ld"
+  linker_flag: "-Tmotors/core/kinetis_512_128.ld"
+  linker_flag: "-Tmotors/core/kinetis_sections.ld"
   objcopy_embed_flag: "-I"
   objcopy_embed_flag: "binary"
   compilation_mode_flags {
diff --git a/tools/cpp/cortex_m4f_crosstool.pb b/tools/cpp/cortex_m4f_crosstool.pb
index cd854fd..867e8b0 100644
--- a/tools/cpp/cortex_m4f_crosstool.pb
+++ b/tools/cpp/cortex_m4f_crosstool.pb
@@ -141,6 +141,7 @@
   linker_flag: "-lm"
   linker_flag: "-lc_nano"
   linker_flag: "-T%LINKER_SCRIPT%"
+  linker_flag: "-Tmotors/core/kinetis_sections.ld"
 
   compiler_flag: "-fmessage-length=80"
   compiler_flag: "-fmax-errors=20"
diff --git a/tools/cpp/gen_crosstool.py b/tools/cpp/gen_crosstool.py
index 547faf0..ec70e11 100644
--- a/tools/cpp/gen_crosstool.py
+++ b/tools/cpp/gen_crosstool.py
@@ -47,13 +47,16 @@
       '%NAME%': 'cortex-m4f',
       '%CPU%': '__MK64FX512__',
       '%F_CPU%': '120000000',
-      '%LINKER_SCRIPT%': 'motors/core/kinetis_192k.ld',
+      '%LINKER_SCRIPT%': 'motors/core/kinetis_512_256.ld',
       })
+  # TODO(Brian): The parts we actually use have 1M of FLASH. Do we want to take
+  # advantage, or maintain compatibility with alternative parts that use some
+  # of it for EEPROM/FlexMem/etc?
   add_m4f_toolchain(crosstool_proto.toolchain.add(), m4f_proto, {
       '%NAME%': 'cortex-m4f-k22',
       '%CPU%': '__MK22FX512__',
       '%F_CPU%': '120000000',
-      '%LINKER_SCRIPT%': 'motors/core/kinetis_128k.ld',
+      '%LINKER_SCRIPT%': 'motors/core/kinetis_512_128.ld',
       })
 
   with open(args[2], 'w') as f: