Added SD Card support to bootloader. New binaries.

Author: mattairtech

bootloaders/zero/Makefile

@@ -18,6 +18,11 @@
 
 # Begin Config ###############################
 
+# -----------------------------------------------------------------------------
+# SD Card support. This can also be set in the relevant board_definitions file.
+# SDCARD_DISABLED, SDCARD_ENABLED
+SDCARD?=SDCARD_DISABLED
+
 # -----------------------------------------------------------------------------
 # Boards definitions:
 # MT_D21E_rev_A, MT_D21E_rev_B, MT_D11
@@ -44,7 +49,11 @@ MCU?=SAMD21E18A
 
 # End Config ###############################
 
+ifeq ($(findstring ENABLED,$(SDCARD)),ENABLED)
+NAME=sam_ba_sdcard_$(BOARD_ID)_$(MCU)
+else
 NAME=sam_ba_$(BOARD_ID)_$(MCU)
+endif
 
 ifeq ($(findstring 18,$(MCU)),18)
 FLASHSIZE=256KB
@@ -113,7 +122,8 @@ SIZE=$(ARM_GCC_PATH)size
 
 # -----------------------------------------------------------------------------
 # Compiler options
-CFLAGS_EXTRA=-D__$(MCU)__ -DBOARD_ID_$(BOARD_ID)
+# eliminate PARANOIA define to save a tiny amount of code (~40B)
+CFLAGS_EXTRA=-D$(SDCARD) -D__$(MCU)__ -DBOARD_ID_$(BOARD_ID) -DPARANOIA
 CFLAGS=-mthumb -mcpu=cortex-m0plus -Wall -c -std=gnu99 -ffunction-sections -fdata-sections -nostdlib -nostartfiles --param max-inline-insns-single=500 -Wa,-adhlns=$(<:%.c=$(BUILD_PATH)/%.lst)
 ifdef DEBUG
   CFLAGS+=-g3 -O1 -DDEBUG=1
@@ -141,6 +151,10 @@ SOURCES= \
   board_driver_serial.c \
   board_init.c \
   board_startup.c \
+  util.c \
+  SDCard/sdBootloader.c \
+  SDCard/mmcbbp.c \
+  SDCard/pff.c \
   main.c \
   sam_ba_monitor.c \
   sam_ba_serial.c
@@ -152,6 +166,10 @@ SOURCES= \
   board_driver_usb.c \
   board_init.c \
   board_startup.c \
+  util.c \
+  SDCard/sdBootloader.c \
+  SDCard/mmcbbp.c \
+  SDCard/pff.c \
   main.c \
   sam_ba_usb.c \
   sam_ba_cdc.c \
@@ -200,6 +218,7 @@ $(BUILD_PATH):
 	@echo ----------------------------------------------------------
 	@echo Creating build folder
 	-mkdir $(BUILD_PATH)
+	-mkdir $(BUILD_PATH)/SDCard
 
 print_info:
 	@echo ----------------------------------------------------------
@@ -227,14 +246,18 @@ clean: $(AS_CLEAN)
 	@echo Cleaning project
 	-$(RM) $(BIN)
 	-$(RM) $(HEX)
+	-$(RM) $(BUILD_PATH)/SDCard/*.*
 	-$(RM) $(BUILD_PATH)/*.*
+	-rmdir $(BUILD_PATH)/SDCard
 	-rmdir $(BUILD_PATH)
 
 mostly_clean: $(AS_CLEAN)
 	@echo ----------------------------------------------------------
 	@echo Cleaning project except bin
 	-$(RM) $(HEX)
+	-$(RM) $(BUILD_PATH)/SDCard/*.*
 	-$(RM) $(BUILD_PATH)/*.*
+	-rmdir $(BUILD_PATH)/SDCard
 	-rmdir $(BUILD_PATH)
 
 .phony: print_info $(BUILD_PATH)

bootloaders/zero/README.md

@@ -0,0 +1,46 @@
+Petit FatFs Module Source Files R0.03                (C)ChaN, 2014
+
+
+FILES
+
+  pff.h      Common include file for Petit FatFs and application module.
+  pff.c      Petit FatFs module.
+  diskio.h   Common include file for Petit FatFs and disk I/O module.
+  diskio.c   Skeleton of low level disk I/O module.
+  integer.h  Alternative type definitions for integer variables.
+
+  Low level disk I/O module is not included in this archive because the Petit
+  FatFs module is only a generic file system layer and not depend on any
+  specific storage device. You have to provide a low level disk I/O module that
+  written to control your storage device.
+
+
+
+AGREEMENTS
+
+ Petit FatFs module is an open source software to implement FAT file system to
+ small embedded systems. This is a free software and is opened for education,
+ research and commercial developments under license policy of following trems.
+
+  Copyright (C) 2014, ChaN, all right reserved.
+
+ * The Petit FatFs module is a free software and there is NO WARRANTY.
+ * No restriction on use. You can use, modify and redistribute it for
+   personal, non-profit or commercial use UNDER YOUR RESPONSIBILITY.
+ * Redistributions of source code must retain the above copyright notice.
+
+
+
+REVISION HISTORY
+
+  Jun 15, 2009  R0.01a  First release (Branched from FatFs R0.07b)
+
+  Dec 14, 2009  R0.02   Added multiple code page support.
+                        Added write funciton.
+                        Changed stream read mode interface.
+  Dec 07,'2010  R0.02a  Added some configuration options.
+                        Fixed fails to open objects with DBCS character.
+
+  Jun 10, 2014  R0.03   Separated out configuration options to pffconf.h.
+                        Added _USE_LCC option.
+                        Added _FS_FAT16 option.

bootloaders/zero/SDCard/00readme.txt

@@ -0,0 +1,92 @@
+/*-----------------------------------------------------------------------
+/  PFF - Low level disk interface modlue include file    (C)ChaN, 2014
+/-----------------------------------------------------------------------*/
+
+#ifndef _DISKIO_DEFINED
+#define _DISKIO_DEFINED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <sam.h>
+#include "integer.h"
+
+
+/* Status of Disk Functions */
+typedef BYTE	DSTATUS;
+
+
+/* Results of Disk Functions */
+typedef enum {
+	RES_OK = 0,		/* 0: Function succeeded */
+	RES_ERROR,		/* 1: Disk error */
+	RES_NOTRDY,		/* 2: Not ready */
+	RES_PARERR		/* 3: Invalid parameter */
+} DRESULT;
+
+
+/* SERCOM SPI available pad settings */
+enum spi_pad_settings {
+  SPI_RX_PAD0_TX_PAD2_SCK_PAD3 = SERCOM_SPI_CTRLA_DIPO(0) | SERCOM_SPI_CTRLA_DOPO(1),
+  SPI_RX_PAD0_TX_PAD3_SCK_PAD1 = SERCOM_SPI_CTRLA_DIPO(0) | SERCOM_SPI_CTRLA_DOPO(2),
+  SPI_RX_PAD1_TX_PAD2_SCK_PAD3 = SERCOM_SPI_CTRLA_DIPO(1) | SERCOM_SPI_CTRLA_DOPO(1),
+  SPI_RX_PAD1_TX_PAD0_SCK_PAD3 = SERCOM_SPI_CTRLA_DIPO(1) | SERCOM_SPI_CTRLA_DOPO(3),
+  SPI_RX_PAD2_TX_PAD0_SCK_PAD1 = SERCOM_SPI_CTRLA_DIPO(2) | SERCOM_SPI_CTRLA_DOPO(0),
+  SPI_RX_PAD2_TX_PAD3_SCK_PAD1 = SERCOM_SPI_CTRLA_DIPO(2) | SERCOM_SPI_CTRLA_DOPO(2),
+  SPI_RX_PAD2_TX_PAD0_SCK_PAD3 = SERCOM_SPI_CTRLA_DIPO(2) | SERCOM_SPI_CTRLA_DOPO(3),
+  SPI_RX_PAD3_TX_PAD0_SCK_PAD1 = SERCOM_SPI_CTRLA_DIPO(3) | SERCOM_SPI_CTRLA_DOPO(0),
+};
+
+
+/*---------------------------------------*/
+/* Prototypes for disk control functions */
+
+DSTATUS disk_initialize (void);
+DRESULT disk_readp (BYTE* buff, DWORD sector, UINT offser, UINT count);
+DRESULT disk_writep (const BYTE* buff, DWORD sc);
+
+#define DUMMY_BYTE			0xFF
+
+#define STA_NOINIT		0x01	/* Drive not initialized */
+#define STA_NODISK		0x02	/* No medium in the drive */
+
+/* Card type flags (CardType) */
+#define CT_MMC				0x01	/* MMC ver 3 */
+#define CT_SD1				0x02	/* SD ver 1 */
+#define CT_SD2				0x04	/* SD ver 2 */
+#define CT_SDC				(CT_SD1|CT_SD2)	/* SD */
+#define CT_BLOCK			0x08	/* Block addressing */
+
+/* Definitions for MMC/SDC command */
+#define CMD0    (0x40+0)        /* GO_IDLE_STATE */
+#define CMD1    (0x40+1)        /* SEND_OP_COND (MMC) */
+#define ACMD41  (0xC0+41)       /* SEND_OP_COND (SDC) */
+#define CMD8    (0x40+8)        /* SEND_IF_COND */
+#define CMD16   (0x40+16)       /* SET_BLOCKLEN */
+#define CMD17   (0x40+17)       /* READ_SINGLE_BLOCK */
+#define CMD24   (0x40+24)       /* WRITE_BLOCK */
+#define CMD55   (0x40+55)       /* APP_CMD */
+#define CMD58   (0x40+58)       /* READ_OCR */
+
+#define   SERCOM_MODE_USART_EXT_CLK_Val         0x0ul
+#define   SERCOM_MODE_USART_INT_CLK_Val         0x1ul
+#define   SERCOM_MODE_SPI_SLAVE_Val             0x2ul
+#define   SERCOM_MODE_SPI_MASTER_Val            0x3ul
+#define   SERCOM_MODE_I2C_SLAVE_Val             0x4ul
+#define   SERCOM_MODE_I2C_MASTER_Val            0x5ul
+
+#define   SERCOM_DORD_MSB_FIRST_Val             0x0ul
+#define   SERCOM_DORD_LSB_FIRST_Val             0x1ul
+
+#define   SERCOM_CHAR_SIZE_8_BITS_Val           0x0ul
+#define   SERCOM_CHAR_SIZE_9_BITS_Val           0x1ul
+
+#define   SDCARD_SPI_BUAD_SLOW                  250000ul
+#define   SDCARD_SPI_BUAD_FAST                  6000000ul
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _DISKIO_DEFINED */

bootloaders/zero/SDCard/diskio.h

@@ -0,0 +1,33 @@
+/*-------------------------------------------*/
+/* Integer type definitions for FatFs module */
+/*-------------------------------------------*/
+
+#ifndef _FF_INTEGER
+#define _FF_INTEGER
+
+#ifdef _WIN32	/* FatFs development platform */
+
+#include <windows.h>
+#include <tchar.h>
+
+#else			/* Embedded platform */
+
+/* This type MUST be 8 bit */
+typedef unsigned char	BYTE;
+
+/* These types MUST be 16 bit */
+typedef short			SHORT;
+typedef unsigned short	WORD;
+typedef unsigned short	WCHAR;
+
+/* These types MUST be 16 bit or 32 bit */
+typedef int				INT;
+typedef unsigned int	UINT;
+
+/* These types MUST be 32 bit */
+typedef long			LONG;
+typedef unsigned long	DWORD;
+
+#endif
+
+#endif