some renaming

Makefile

@@ -18,7 +18,7 @@ loc:
 clean:
  rm -rf $(DEBUG_DIR) $(RELEASE_DIR) $(BUILD_DIR)/mkfs $(BUILD_DIR)/disk.img
 
-EARTH_SRCS = earth/*.c earth/sdlib/*.c shared/*.c
+EARTH_SRCS = earth/*.c earth/sd/*.c shared/*.c
 EARTH_LAYOUT = -Tearth/layout.lds
 
 GRASS_SRCS = grass/enter.S grass/*.c shared/*.c
@@ -38,7 +38,7 @@ INCLUDE = -Ishared/include
 CFLAGS = -march=rv32imac -mabi=ilp32 -mcmodel=medlow
 CFLAGS += -ffunction-sections -fdata-sections
 
-ARTY_FLAGS = -Linstall/metal -Iearth/include
+ARTY_FLAGS = -Linstall/arty -Iinstall/arty
 LDFLAGS = -Wl,--gc-sections -nostartfiles -nostdlib
 
 DEFAULT_LDLIBS = -lc -lgcc

earth/dev_disk.c

@@ -9,7 +9,7 @@
 
 
 #include "earth.h"
-#include "sdlib/sdlib.h"
+#include "sd/sd.h"
 
 enum {
  SD_CARD,

earth/sdlib/sdinit.c → earth/sd/sdinit.c

@@ -9,7 +9,7 @@
 
 
 #include <stdio.h>
-#include "sdlib.h"
+#include "sd.h"
 #include "sdutil.h"
 
 static int sd_spi_reset(struct metal_spi*);
@@ -253,13 +253,7 @@ static int sd_spi_configure(struct metal_spi *spi) {
  /* Set CS line */
  METAL_SPI_REGW(METAL_SIFIVE_SPI0_CSID) = config->csid;
 
- /* Toggle off memory-mapped SPI flash mode, toggle on programmable IO mode
- * It seems that with this line uncommented, the debugger cannot have access
- * to the chip at all because it assumes the chip is in memory-mapped mode.
- * I have to compile the code with this line commented and launch gdb,
- * reset cores, reset $pc, set *((int *) 0x20004060) = 0, (set the flash
- * interface control register to programmable I/O mode) and then continue
- * Alternative, comment out the "flash" line in openocd.cfg */
+ /* Toggle off memory-mapped SPI flash mode, toggle on programmable IO mode */
  METAL_SPI_REGW(METAL_SIFIVE_SPI0_FCTRL) = METAL_SPI_CONTROL_IO;
 
  return 0;