Merge branch 'master' into ctr9io

diff --cc source/firm/firm.c
index 273eb42559e2a408a0357221b1960f299cfb3676,f29cdb87c049bdcade1794b79f5f9a6ec36ca27c..0faec0cfa1485460e6336247f3f49e1ab3d241d1
--- 1/source/firm/firm.c
--- 2/source/firm/firm.c
+++ b/source/firm/firm.c
@@@ -4,7 -4,7 +4,7 @@@
  #include <stddef.h>
  
  #include "../common.h"
- #include "../misc/sha256.h"
 -#include "../fatfs/sdmmc.h"
++#include <ctr9/io.h>
  
  firm_h *firm_loc = (firm_h *)FCRAM_FIRM_LOC;
  uint32_t firm_size = FCRAM_SPACING;

diff --cc source/patch/emunand.c
Simple merge

diff --cc source/patch/reboot.c
Simple merge