Merge pull request #20 from boochow/rpi

fix from rpi branch
boochow · Nov 24, 2018 · afafefb · afafefb
2 parents b1c11c9 + 84a999b
commit afafefb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/raspberrypi/Makefile b/raspberrypi/Makefile
@@ -121,7 +121,7 @@ SRC_S = \
 
 # USB
 ifneq ($(MICROPY_HW_USBHOST),0)
-RELEASE=$(RELEASE)-usb
+RELEASE :=$(RELEASE)-usb
 USBHOST_DIR=csud
 CSUDLIB=libcsud.a
 INC += -I$(USBHOST_DIR)/include
@@ -190,9 +190,9 @@ $(BUILD)/config.txt: config-template.txt
 	$(Q)$(ECHO) "kernel=firmware.img" >> $@
 
 release: $(BUILD)/firmware.img $(BUILD)/config.txt
-	$(ECHO) "GEN $@"
-	$(Q)$(ZIP) $(BUILD)/$(RELEASE) -j $^
-	$(Q)cd $(RELFILES); $(ZIP) ../$(BUILD)/$(RELEASE) -r .
+	$(ECHO) "GEN $(BUILD)/$(RELEASE).zip"
+	$(Q)$(ZIP) $(BUILD)/$(RELEASE) -jq $^
+	$(Q)cd $(RELFILES); $(ZIP) ../$(BUILD)/$(RELEASE) -rq .
 
 $(BUILD)/firmware-qemu.img: $(OBJ) $(USBLIB)
 	$(ECHO) "LINK $@"

diff --git a/raspberrypi/sd.c b/raspberrypi/sd.c
@@ -206,6 +206,7 @@ int sd_cmd(unsigned int code, unsigned int arg)
         r=sd_cmd(CMD_APP_CMD|(sd_rca?CMD_RSPNS_48:0),sd_rca);
         if(sd_rca && !r) { uart_puts("ERROR: failed to send SD APP command\n"); sd_err=SD_ERROR;return 0;}
         code &= ~CMD_NEED_APP;
+        wait_cycles(100);
     }
     if(sd_status(SR_CMD_INHIBIT)) { uart_puts("ERROR: EMMC busy\n"); sd_err= SD_TIMEOUT;return 0;}
     uart_puts("EMMC: Sending command ");uart_hex(code);uart_puts(" arg ");uart_hex(arg);uart_send('\n');