Fix formatting again?

Author: pdobbins23

hal/src/peripherals/flash_controller.rs

@@ -138,11 +138,7 @@ impl<'gcr, 'icc> FlashController<'gcr, 'icc> {
     ///  - Lock write protection
     ///  - Flush ICC
     ///  - Enable icc0
-    fn write_guard<F: Fn()>(
-        &self,
-        sys_clk: &SystemClock,
-        operation: F,
-    ) -> Result<(), FlashErr> {
+    fn write_guard<F: Fn()>(&self, sys_clk: &SystemClock, operation: F) -> Result<(), FlashErr> {
         // Pre-write
         self.wait_until_ready();
         self.disable_icc0();

tests/build.rs

@@ -13,6 +13,8 @@ fn main() {
         .write_all(include_bytes!("memory.x"))
         .unwrap();
 
+    println!("cargo:rustc-link-arg=--nmagic");
+
     // Only re-run the build script when this file, memory.x, or link.x is changed.
     println!("cargo:rerun-if-changed=build.rs");
     println!("cargo:rerun-if-changed=memory.x");

tests/memory.x

@@ -1,6 +1,7 @@
 MEMORY
 {
-    FLASH      (rx)  :  ORIGIN = 0x10000000,                             LENGTH = 512K
+    FLASH      (rx)  :  ORIGIN = 0x1000E000,                             LENGTH = 222K 
+    SECFLASH   (rx)  :  ORIGIN = ORIGIN(FLASH) + LENGTH(FLASH),          LENGTH = 2K 
     STACK      (rw)  :  ORIGIN = 0x20000000,                             LENGTH = 110K
     RAM        (rw)  :  ORIGIN = ORIGIN(STACK) + LENGTH(STACK),          LENGTH = 128K - LENGTH(STACK)
 }
@@ -9,5 +10,19 @@ MEMORY
 Add a block of memory for the stack before the RAM block, so that a stack overflow leaks into
 reserved space and flash memory, instead of .data and .bss.
 */
+ASSERT((LENGTH(SECFLASH) == 2K), "Error: SECFLASH is not 2K. To change the size, update this assert, the size in the MEMORY section, and the assert in the flash layout crate.") 
 
 _stack_start = ORIGIN(STACK) + LENGTH(STACK);
+_stack_end = ORIGIN(STACK);
+
+/* Bootloader hard jumps to 0x1000e200 */
+_stext = ORIGIN(FLASH) + 0x200;
+
+SECTIONS {
+    /* Add a section for the secure flash space. */
+    .secflash ORIGIN(SECFLASH) :
+    {
+        KEEP(*(.secflash .secflash.*));
+        . = ALIGN(4);
+    } > SECFLASH
+}