diff --git a/STM32F4/variants/generic_f407v/ld/common.inc b/STM32F4/variants/generic_f407v/ld/common.inc
index acaeb3dc6..0cbaeaa44 100644
--- a/STM32F4/variants/generic_f407v/ld/common.inc
+++ b/STM32F4/variants/generic_f407v/ld/common.inc
@@ -38,9 +38,9 @@ EXTERN(start_c)
 /* main entry point */
 EXTERN(main)
 
-/* Initial stack pointer value. Relocated to CCMRAM */
+/* Initial stack pointer value. */
 EXTERN(__msp_init)
-PROVIDE(__msp_init = ORIGIN(ccmram) + LENGTH(ccmram));
+PROVIDE(__msp_init = ORIGIN(ram) + LENGTH(ram));
 
 /* Reset vector and chip reset entry point */
 EXTERN(__start__)
@@ -150,7 +150,7 @@ SECTIONS
          * I'm shoving these here naively; there's probably a cleaner way
          * to go about this. [mbolivar]
          */
-        _lm_heap_start = DEFINED(_lm_heap_start) ? _lm_heap_start : __ccmdata_end__;
+        _lm_heap_start = DEFINED(_lm_heap_start) ? _lm_heap_start : __bss_end__;
         _lm_heap_end   = DEFINED(_lm_heap_end) ? _lm_heap_end : __msp_init;
       } > REGION_RODATA