Create ./src/drivers and move s3c24xx mmc thing in there with more
specific name. Move fat.h into ./include
Signed-off-by: Andy Green <[EMAIL PROTECTED]>
---
Makefile | 2
include/fat.h | 220 ++++++++++++++++++
src/drivers/s3c24xx-mci.c | 540 +++++++++++++++++++++++++++++++++++++++++++++
src/drivers/s3c24xx-mci.h | 33 +++
src/fat.h | 220 ------------------
src/mmc.c | 540 ---------------------------------------------
src/mmc.h | 33 ---
7 files changed, 794 insertions(+), 794 deletions(-)
create mode 100644 include/fat.h
create mode 100644 src/drivers/s3c24xx-mci.c
create mode 100644 src/drivers/s3c24xx-mci.h
delete mode 100644 src/fat.h
delete mode 100644 src/mmc.c
delete mode 100644 src/mmc.h
diff --git a/Makefile b/Makefile
index 794748c..1a620f9 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ LDFLAGS =
#START = start.o lowlevel_init.o
S_SRCS = src/start.S src/lowlevel_init.S
S_OBJS = $(patsubst %.S,%.o, $(S_SRCS))
-C_SRCS = $(wildcard src/*.c) $(wildcard src/gt*/*.c)
+C_SRCS = $(wildcard src/*.c) $(wildcard src/gt*/*.c) $(wildcard
src/drivers/*.c)
C_OBJS = $(patsubst %.c,%.o, $(C_SRCS))
#SRCS := $(START: .o=.S) $(COBJS: .o=.c)
diff --git a/include/fat.h b/include/fat.h
new file mode 100644
index 0000000..f993cca
--- /dev/null
+++ b/include/fat.h
@@ -0,0 +1,220 @@
+/*
+ * R/O (V)FAT 12/16/32 filesystem implementation by Marcus Sundberg
+ *
+ * 2002-07-28 - [EMAIL PROTECTED] - ported to ppcboot v1.1.6
+ * 2003-03-10 - [EMAIL PROTECTED] - ported to u-boot
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+
+#ifndef _FAT_H_
+#define _FAT_H_
+
+#include <asm/byteorder.h>
+
+#define CONFIG_SUPPORT_VFAT
+
+#define SECTOR_SIZE FS_BLOCK_SIZE
+
+#define FS_BLOCK_SIZE 512
+
+#if FS_BLOCK_SIZE != SECTOR_SIZE
+#error FS_BLOCK_SIZE != SECTOR_SIZE - This code needs to be fixed!
+#endif
+
+#define MAX_CLUSTSIZE 65536
+#define DIRENTSPERBLOCK (FS_BLOCK_SIZE/sizeof(dir_entry))
+#define DIRENTSPERCLUST
((mydata->clust_size*SECTOR_SIZE)/sizeof(dir_entry))
+
+#define FATBUFBLOCKS 6
+#define FATBUFSIZE (FS_BLOCK_SIZE*FATBUFBLOCKS)
+#define FAT12BUFSIZE ((FATBUFSIZE*2)/3)
+#define FAT16BUFSIZE (FATBUFSIZE/2)
+#define FAT32BUFSIZE (FATBUFSIZE/4)
+
+
+/* Filesystem identifiers */
+#define FAT12_SIGN "FAT12 "
+#define FAT16_SIGN "FAT16 "
+#define FAT32_SIGN "FAT32 "
+#define SIGNLEN 8
+
+/* File attributes */
+#define ATTR_RO 1
+#define ATTR_HIDDEN 2
+#define ATTR_SYS 4
+#define ATTR_VOLUME 8
+#define ATTR_DIR 16
+#define ATTR_ARCH 32
+
+#define ATTR_VFAT (ATTR_RO | ATTR_HIDDEN | ATTR_SYS | ATTR_VOLUME)
+
+#define DELETED_FLAG ((char)0xe5) /* Marks deleted files when in name[0] */
+#define aRING 0x05 /* Used to represent '�' in name[0] */
+
+/* Indicates that the entry is the last long entry in a set of long
+ * dir entries
+ */
+#define LAST_LONG_ENTRY_MASK 0x40
+
+/* Flags telling whether we should read a file or list a directory */
+#define LS_NO 0
+#define LS_YES 1
+#define LS_DIR 1
+#define LS_ROOT 2
+
+#ifdef DEBUG
+#define FAT_DPRINT(args...) printf(args)
+#else
+#define FAT_DPRINT(args...)
+#endif
+#define FAT_ERROR(arg) printf(arg)
+
+#define ISDIRDELIM(c) ((c) == '/' || (c) == '\\')
+
+#define FSTYPE_NONE (-1)
+
+#if defined(__linux__) && defined(__KERNEL__)
+#define FAT2CPU16 le16_to_cpu
+#define FAT2CPU32 le32_to_cpu
+#else
+#if __LITTLE_ENDIAN
+#define FAT2CPU16(x) (x)
+#define FAT2CPU32(x) (x)
+#else
+#define FAT2CPU16(x) ((((x) & 0x00ff) << 8) | (((x) & 0xff00) >> 8))
+#define FAT2CPU32(x) ((((x) & 0x000000ff) << 24) | \
+ (((x) & 0x0000ff00) << 8) | \
+ (((x) & 0x00ff0000) >> 8) | \
+ (((x) & 0xff000000) >> 24))
+#endif
+#endif
+
+#define TOLOWER(c) if((c) >= 'A' && (c) <= 'Z'){(c)+=('a' - 'A');}
+#define START(dent) (FAT2CPU16((dent)->start) \
+ + (mydata->fatsize != 32 ? 0 : \
+ (FAT2CPU16((dent)->starthi) << 16)))
+#define CHECK_CLUST(x, fatsize) ((x) <= 1 || \
+ (x) >= ((fatsize) != 32 ? 0xfff0 : 0xffffff0))
+
+typedef struct boot_sector {
+ __u8 ignored[3]; /* Bootstrap code */
+ char system_id[8]; /* Name of fs */
+ __u8 sector_size[2]; /* Bytes/sector */
+ __u8 cluster_size; /* Sectors/cluster */
+ __u16 reserved; /* Number of reserved sectors */
+ __u8 fats; /* Number of FATs */
+ __u8 dir_entries[2]; /* Number of root directory entries */
+ __u8 sectors[2]; /* Number of sectors */
+ __u8 media; /* Media code */
+ __u16 fat_length; /* Sectors/FAT */
+ __u16 secs_track; /* Sectors/track */
+ __u16 heads; /* Number of heads */
+ __u32 hidden; /* Number of hidden sectors */
+ __u32 total_sect; /* Number of sectors (if sectors == 0) */
+
+ /* FAT32 only */
+ __u32 fat32_length; /* Sectors/FAT */
+ __u16 flags; /* Bit 8: fat mirroring, low 4: active fat */
+ __u8 version[2]; /* Filesystem version */
+ __u32 root_cluster; /* First cluster in root directory */
+ __u16 info_sector; /* Filesystem info sector */
+ __u16 backup_boot; /* Backup boot sector */
+ __u16 reserved2[6]; /* Unused */
+} boot_sector;
+
+typedef struct volume_info
+{
+ __u8 drive_number; /* BIOS drive number */
+ __u8 reserved; /* Unused */
+ __u8 ext_boot_sign; /* 0x29 if fields below exist (DOS 3.3+) */
+ __u8 volume_id[4]; /* Volume ID number */
+ char volume_label[11]; /* Volume label */
+ char fs_type[8]; /* Typically FAT12, FAT16, or FAT32 */
+ /* Boot code comes next, all but 2 bytes to fill up sector */
+ /* Boot sign comes last, 2 bytes */
+} volume_info;
+
+typedef struct dir_entry {
+ char name[8],ext[3]; /* Name and extension */
+ __u8 attr; /* Attribute bits */
+ __u8 lcase; /* Case for base and extension */
+ __u8 ctime_ms; /* Creation time, milliseconds */
+ __u16 ctime; /* Creation time */
+ __u16 cdate; /* Creation date */
+ __u16 adate; /* Last access date */
+ __u16 starthi; /* High 16 bits of cluster in FAT32 */
+ __u16 time,date,start;/* Time, date and first cluster */
+ __u32 size; /* File size in bytes */
+} dir_entry;
+
+typedef struct dir_slot {
+ __u8 id; /* Sequence number for slot */
+ __u8 name0_4[10]; /* First 5 characters in name */
+ __u8 attr; /* Attribute byte */
+ __u8 reserved; /* Unused */
+ __u8 alias_checksum;/* Checksum for 8.3 alias */
+ __u8 name5_10[12]; /* 6 more characters in name */
+ __u16 start; /* Unused */
+ __u8 name11_12[4]; /* Last 2 characters in name */
+} dir_slot;
+
+/* Private filesystem parameters
+ *
+ * Note: FAT buffer has to be 32 bit aligned
+ * (see FAT32 accesses)
+ */
+typedef struct {
+ __u8 fatbuf[FATBUFSIZE]; /* Current FAT buffer */
+ int fatsize; /* Size of FAT in bits */
+ __u16 fatlength; /* Length of FAT in sectors */
+ __u16 fat_sect; /* Starting sector of the FAT */
+ __u16 rootdir_sect; /* Start sector of root directory */
+ __u16 clust_size; /* Size of clusters in sectors */
+ short data_begin; /* The sector of the first cluster, can be
negative */
+ int fatbufnum; /* Used by get_fatent, init to -1 */
+} fsdata;
+
+typedef int (file_detectfs_func)(void);
+typedef int (file_ls_func)(const char *dir);
+typedef long (file_read_func)(const char *filename, void *buffer,
+ unsigned long maxsize);
+
+struct filesystem {
+ file_detectfs_func *detect;
+ file_ls_func *ls;
+ file_read_func *read;
+ const char name[12];
+};
+
+/* FAT tables */
+file_detectfs_func file_fat_detectfs;
+file_ls_func file_fat_ls;
+file_read_func file_fat_read;
+
+/* Currently this doesn't check if the dir exists or is valid... */
+int file_cd(const char *path);
+int file_fat_detectfs(void);
+int file_fat_ls(const char *dir);
+long file_fat_read(const char *filename, void *buffer, unsigned long maxsize);
+const char *file_getfsname(int idx);
+int fat_register_device(block_dev_desc_t *dev_desc, int part_no);
+
+#endif /* _FAT_H_ */
diff --git a/src/drivers/s3c24xx-mci.c b/src/drivers/s3c24xx-mci.c
new file mode 100644
index 0000000..b982657
--- /dev/null
+++ b/src/drivers/s3c24xx-mci.c
@@ -0,0 +1,540 @@
+#if 0
+/*
+ * u-boot S3C2410 MMC/SD card driver
+ * (C) Copyright 2006 by OpenMoko, Inc.
+ * Author: Harald Welte <[EMAIL PROTECTED]>
+ *
+ * based on u-boot pxa MMC driver and linux/drivers/mmc/s3c2410mci.c
+ * (C) 2005-2005 Thomas Kleffel
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <config.h>
+#include <common.h>
+#include <mmc.h>
+#include <asm/io.h>
+#include <s3c2410.h>
+#include <part.h>
+#include <fat.h>
+
+#if defined(CONFIG_MMC) && defined(CONFIG_MMC_S3C)
+
+#define CONFIG_MMC_WIDE
+
+static S3C2410_SDI *sdi;
+
+static block_dev_desc_t mmc_dev;
+
+block_dev_desc_t * mmc_get_dev(int dev)
+{
+ return ((block_dev_desc_t *)&mmc_dev);
+}
+
+/*
+ * FIXME needs to read cid and csd info to determine block size
+ * and other parameters
+ */
+static uchar mmc_buf[MMC_BLOCK_SIZE];
+static mmc_csd_t mmc_csd;
+static int mmc_ready = 0;
+static int wide = 0;
+
+
+#define CMD_F_RESP 0x01
+#define CMD_F_RESP_LONG 0x02
+
+static u_int32_t *mmc_cmd(ushort cmd, ulong arg, ushort flags)
+{
+ static u_int32_t resp[5];
+
+ u_int32_t ccon, csta;
+ u_int32_t csta_rdy_bit = S3C2410_SDICMDSTAT_CMDSENT;
+
+ memset(resp, 0, sizeof(resp));
+
+ debug("mmc_cmd CMD%d arg=0x%08x flags=%x\n", cmd, arg, flags);
+
+ sdi->SDICSTA = 0xffffffff;
+ sdi->SDIDSTA = 0xffffffff;
+ sdi->SDIFSTA = 0xffffffff;
+
+ sdi->SDICARG = arg;
+
+ ccon = cmd & S3C2410_SDICMDCON_INDEX;
+ ccon |= S3C2410_SDICMDCON_SENDERHOST|S3C2410_SDICMDCON_CMDSTART;
+
+ if (flags & CMD_F_RESP) {
+ ccon |= S3C2410_SDICMDCON_WAITRSP;
+ csta_rdy_bit = S3C2410_SDICMDSTAT_RSPFIN; /* 1 << 9 */
+ }
+
+ if (flags & CMD_F_RESP_LONG)
+ ccon |= S3C2410_SDICMDCON_LONGRSP;
+
+ sdi->SDICCON = ccon;
+
+ while (1) {
+ csta = sdi->SDICSTA;
+ if (csta & csta_rdy_bit)
+ break;
+ if (csta & S3C2410_SDICMDSTAT_CMDTIMEOUT) {
+ printf("===============> MMC CMD Timeout\n");
+ sdi->SDICSTA |= S3C2410_SDICMDSTAT_CMDTIMEOUT;
+ break;
+ }
+ }
+
+ debug("final MMC CMD status 0x%x\n", csta);
+
+ sdi->SDICSTA |= csta_rdy_bit;
+
+ if (flags & CMD_F_RESP) {
+ resp[0] = sdi->SDIRSP0;
+ resp[1] = sdi->SDIRSP1;
+ resp[2] = sdi->SDIRSP2;
+ resp[3] = sdi->SDIRSP3;
+ }
+
+ return resp;
+}
+
+#define FIFO_FILL(host) ((host->SDIFSTA & S3C2410_SDIFSTA_COUNTMASK) >> 2)
+
+static int mmc_block_read(uchar *dst, ulong src, ulong len)
+{
+ u_int32_t dcon, fifo;
+ u_int32_t *dst_u32 = (u_int32_t *)dst;
+ u_int32_t *resp;
+
+ if (len == 0)
+ return 0;
+
+ debug("mmc_block_rd dst %lx src %lx len %d\n", (ulong)dst, src, len);
+
+ /* set block len */
+ resp = mmc_cmd(MMC_CMD_SET_BLOCKLEN, len, CMD_F_RESP);
+ sdi->SDIBSIZE = len;
+
+ //sdi->SDIPRE = 0xff;
+
+ /* setup data */
+ dcon = (len >> 9) & S3C2410_SDIDCON_BLKNUM;
+ dcon |= S3C2410_SDIDCON_BLOCKMODE;
+ dcon |= S3C2410_SDIDCON_RXAFTERCMD|S3C2410_SDIDCON_XFER_RXSTART;
+ if (wide)
+ dcon |= S3C2410_SDIDCON_WIDEBUS;
+#if defined(CONFIG_S3C2440) || defined(CONFIG_S3C2442)
+ dcon |= S3C2440_SDIDCON_DS_WORD | S3C2440_SDIDCON_DATSTART;
+#endif
+ sdi->SDIDCON = dcon;
+
+ /* send read command */
+ resp = mmc_cmd(MMC_CMD_READ_BLOCK, src, CMD_F_RESP);
+
+ while (len > 0) {
+ u_int32_t sdidsta = sdi->SDIDSTA;
+ fifo = FIFO_FILL(sdi);
+ if (sdidsta & (S3C2410_SDIDSTA_FIFOFAIL|
+ S3C2410_SDIDSTA_CRCFAIL|
+ S3C2410_SDIDSTA_RXCRCFAIL|
+ S3C2410_SDIDSTA_DATATIMEOUT)) {
+ printf("mmc_block_read: err SDIDSTA=0x%08x\n", sdidsta);
+ return -EIO;
+ }
+
+ while (fifo--) {
+ //debug("dst_u32 = 0x%08x\n", dst_u32);
+ *(dst_u32++) = sdi->SDIDAT;
+ if (len >= 4)
+ len -= 4;
+ else {
+ len = 0;
+ break;
+ }
+ }
+ }
+
+ debug("waiting for SDIDSTA (currently 0x%08x\n", sdi->SDIDSTA);
+ while (!(sdi->SDIDSTA & (1 << 4))) {}
+ debug("done waiting for SDIDSTA (currently 0x%08x\n", sdi->SDIDSTA);
+
+ sdi->SDIDCON = 0;
+
+ if (!(sdi->SDIDSTA & S3C2410_SDIDSTA_XFERFINISH))
+ debug("mmc_block_read; transfer not finished!\n");
+
+ return 0;
+}
+
+static int mmc_block_write(ulong dst, uchar *src, int len)
+{
+ printf("MMC block write not yet supported on S3C2410!\n");
+ return -1;
+}
+
+
+int mmc_read(ulong src, uchar *dst, int size)
+{
+ ulong end, part_start, part_end, part_len, aligned_start, aligned_end;
+ ulong mmc_block_size, mmc_block_address;
+
+ if (size == 0)
+ return 0;
+
+ if (!mmc_ready) {
+ printf("Please initialize the MMC first\n");
+ return -1;
+ }
+
+ mmc_block_size = MMC_BLOCK_SIZE;
+ mmc_block_address = ~(mmc_block_size - 1);
+
+ src -= CFG_MMC_BASE;
+ end = src + size;
+ part_start = ~mmc_block_address & src;
+ part_end = ~mmc_block_address & end;
+ aligned_start = mmc_block_address & src;
+ aligned_end = mmc_block_address & end;
+
+ /* all block aligned accesses */
+ debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend
%lx\n",
+ src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
+ if (part_start) {
+ part_len = mmc_block_size - part_start;
+ debug("ps src %lx dst %lx end %lx pstart %lx pend %lx astart
%lx aend %lx\n",
+ src, (ulong)dst, end, part_start, part_end, aligned_start,
aligned_end);
+ if ((mmc_block_read(mmc_buf, aligned_start, mmc_block_size)) <
0)
+ return -1;
+
+ memcpy(dst, mmc_buf+part_start, part_len);
+ dst += part_len;
+ src += part_len;
+ }
+ debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend
%lx\n",
+ src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
+ for (; src < aligned_end; src += mmc_block_size, dst += mmc_block_size)
{
+ debug("al src %lx dst %lx end %lx pstart %lx pend %lx astart
%lx aend %lx\n",
+ src, (ulong)dst, end, part_start, part_end, aligned_start,
aligned_end);
+ if ((mmc_block_read((uchar *)(dst), src, mmc_block_size)) < 0)
+ return -1;
+ }
+ debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend
%lx\n",
+ src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
+ if (part_end && src < end) {
+ debug("pe src %lx dst %lx end %lx pstart %lx pend %lx astart
%lx aend %lx\n",
+ src, (ulong)dst, end, part_start, part_end, aligned_start,
aligned_end);
+ if ((mmc_block_read(mmc_buf, aligned_end, mmc_block_size)) < 0)
+ return -1;
+
+ memcpy(dst, mmc_buf, part_end);
+ }
+ return 0;
+}
+
+int mmc_write(uchar *src, ulong dst, int size)
+{
+ ulong end, part_start, part_end, part_len, aligned_start, aligned_end;
+ ulong mmc_block_size, mmc_block_address;
+
+ if (size == 0)
+ return 0;
+
+ if (!mmc_ready) {
+ printf("Please initialize the MMC first\n");
+ return -1;
+ }
+
+ mmc_block_size = MMC_BLOCK_SIZE;
+ mmc_block_address = ~(mmc_block_size - 1);
+
+ dst -= CFG_MMC_BASE;
+ end = dst + size;
+ part_start = ~mmc_block_address & dst;
+ part_end = ~mmc_block_address & end;
+ aligned_start = mmc_block_address & dst;
+ aligned_end = mmc_block_address & end;
+
+ /* all block aligned accesses */
+ debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend
%lx\n",
+ src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
+ if (part_start) {
+ part_len = mmc_block_size - part_start;
+ debug("ps src %lx dst %lx end %lx pstart %lx pend %lx astart
%lx aend %lx\n",
+ (ulong)src, dst, end, part_start, part_end, aligned_start,
aligned_end);
+ if ((mmc_block_read(mmc_buf, aligned_start, mmc_block_size)) <
0)
+ return -1;
+
+ memcpy(mmc_buf+part_start, src, part_len);
+ if ((mmc_block_write(aligned_start, mmc_buf, mmc_block_size)) <
0)
+ return -1;
+
+ dst += part_len;
+ src += part_len;
+ }
+ debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend
%lx\n",
+ src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
+ for (; dst < aligned_end; src += mmc_block_size, dst += mmc_block_size)
{
+ debug("al src %lx dst %lx end %lx pstart %lx pend %lx astart
%lx aend %lx\n",
+ src, (ulong)dst, end, part_start, part_end, aligned_start,
aligned_end);
+ if ((mmc_block_write(dst, (uchar *)src, mmc_block_size)) < 0)
+ return -1;
+
+ }
+ debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend
%lx\n",
+ src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
+ if (part_end && dst < end) {
+ debug("pe src %lx dst %lx end %lx pstart %lx pend %lx astart
%lx aend %lx\n",
+ src, (ulong)dst, end, part_start, part_end, aligned_start,
aligned_end);
+ if ((mmc_block_read(mmc_buf, aligned_end, mmc_block_size)) < 0)
+ return -1;
+
+ memcpy(mmc_buf, src, part_end);
+ if ((mmc_block_write(aligned_end, mmc_buf, mmc_block_size)) < 0)
+ return -1;
+
+ }
+ return 0;
+}
+
+ulong mmc_bread(int dev_num, ulong blknr, ulong blkcnt, void *dst)
+{
+ int mmc_block_size = MMC_BLOCK_SIZE;
+ ulong src = blknr * mmc_block_size + CFG_MMC_BASE;
+
+ mmc_read(src, dst, blkcnt*mmc_block_size);
+ return blkcnt;
+}
+
+/* MMC_DEFAULT_RCA should probably be just 1, but this may break other code
+ that expects it to be shifted. */
+static u_int16_t rca = MMC_DEFAULT_RCA >> 16;
+
+static u_int32_t mmc_size(const struct mmc_csd *csd)
+{
+ u_int32_t block_len, mult, blocknr;
+
+ block_len = csd->read_bl_len << 12;
+ mult = csd->c_size_mult1 << 8;
+ blocknr = (csd->c_size+1) * mult;
+
+ return blocknr * block_len;
+}
+
+struct sd_cid {
+ char pnm_0; /* product name */
+ char oid_1; /* OEM/application ID */
+ char oid_0;
+ uint8_t mid; /* manufacturer ID */
+ char pnm_4;
+ char pnm_3;
+ char pnm_2;
+ char pnm_1;
+ uint8_t psn_2; /* product serial number */
+ uint8_t psn_1;
+ uint8_t psn_0; /* MSB */
+ uint8_t prv; /* product revision */
+ uint8_t crc; /* CRC7 checksum, b0 is unused and set to 1 */
+ uint8_t mdt_1; /* manufacturing date, LSB, RRRRyyyy yyyymmmm */
+ uint8_t mdt_0; /* MSB */
+ uint8_t psn_3; /* LSB */
+};
+
+static void print_mmc_cid(mmc_cid_t *cid)
+{
+ printf("MMC found. Card desciption is:\n");
+ printf("Manufacturer ID = %02x%02x%02x\n",
+ cid->id[0], cid->id[1], cid->id[2]);
+ printf("HW/FW Revision = %x %x\n",cid->hwrev, cid->fwrev);
+ cid->hwrev = cid->fwrev = 0; /* null terminate string */
+ printf("Product Name = %s\n",cid->name);
+ printf("Serial Number = %02x%02x%02x\n",
+ cid->sn[0], cid->sn[1], cid->sn[2]);
+ printf("Month = %d\n",cid->month);
+ printf("Year = %d\n",1997 + cid->year);
+}
+
+static void print_sd_cid(const struct sd_cid *cid)
+{
+ printf("Manufacturer: 0x%02x, OEM \"%c%c\"\n",
+ cid->mid, cid->oid_0, cid->oid_1);
+ printf("Product name: \"%c%c%c%c%c\", revision %d.%d\n",
+ cid->pnm_0, cid->pnm_1, cid->pnm_2, cid->pnm_3, cid->pnm_4,
+ cid->prv >> 4, cid->prv & 15);
+ printf("Serial number: %u\n",
+ cid->psn_0 << 24 | cid->psn_1 << 16 | cid->psn_2 << 8 |
+ cid->psn_3);
+ printf("Manufacturing date: %d/%d\n",
+ cid->mdt_1 & 15,
+ 2000+((cid->mdt_0 & 15) << 4)+((cid->mdt_1 & 0xf0) >> 4));
+ printf("CRC: 0x%02x, b0 = %d\n",
+ cid->crc >> 1, cid->crc & 1);
+}
+
+int mmc_init(int verbose)
+{
+ int retries, rc = -ENODEV;
+ int is_sd = 0;
+ u_int32_t *resp;
+ S3C24X0_CLOCK_POWER * const clk_power = S3C24X0_GetBase_CLOCK_POWER();
+
+ sdi = S3C2410_GetBase_SDI();
+
+ debug("mmc_init(PCLK=%u)\n", get_PCLK());
+
+ clk_power->CLKCON |= (1 << 9);
+
+ sdi->SDIBSIZE = 512;
+#if defined(CONFIG_S3C2410)
+ /* S3C2410 has some bug that prevents reliable operation at higher
speed */
+ //sdi->SDIPRE = 0x3e; /* SDCLK = PCLK/2 / (SDIPRE+1) = 396kHz */
+ sdi->SDIPRE = 0x02; /* 2410: SDCLK = PCLK/2 / (SDIPRE+1) = 11MHz */
+ sdi->SDIDTIMER = 0xffff;
+#elif defined(CONFIG_S3C2440) || defined(CONFIG_S3C2442)
+ sdi->SDIPRE = 0x05; /* 2410: SDCLK = PCLK / (SDIPRE+1) = 11MHz */
+ sdi->SDIDTIMER = 0x7fffff;
+#endif
+ sdi->SDIIMSK = 0x0;
+ sdi->SDICON = S3C2410_SDICON_FIFORESET|S3C2410_SDICON_CLOCKTYPE;
+ udelay(125000); /* FIXME: 74 SDCLK cycles */
+
+ mmc_csd.c_size = 0;
+
+ /* reset */
+ retries = 10;
+ resp = mmc_cmd(MMC_CMD_RESET, 0, 0);
+
+ printf("trying to detect SD Card...\n");
+ while (retries--) {
+ udelay(100000);
+ resp = mmc_cmd(55, 0x00000000, CMD_F_RESP);
+ resp = mmc_cmd(41, 0x00300000, CMD_F_RESP);
+
+ if (resp[0] & (1 << 31)) {
+ is_sd = 1;
+ break;
+ }
+ }
+
+ if (retries == 0 && !is_sd) {
+ retries = 10;
+ printf("failed to detect SD Card, trying MMC\n");
+ resp = mmc_cmd(MMC_CMD_SEND_OP_COND, 0x00ffc000, CMD_F_RESP);
+ while (retries-- && resp && !(resp[4] & 0x80)) {
+ debug("resp %x %x\n", resp[0], resp[1]);
+ udelay(50);
+ resp = mmc_cmd(1, 0x00ffff00, CMD_F_RESP);
+ }
+ }
+
+ /* try to get card id */
+ resp = mmc_cmd(MMC_CMD_ALL_SEND_CID, 0, CMD_F_RESP|CMD_F_RESP_LONG);
+ if (resp) {
+ if (!is_sd) {
+ /* TODO configure mmc driver depending on card
+ attributes */
+ mmc_cid_t *cid = (mmc_cid_t *)resp;
+
+ if (verbose)
+ print_mmc_cid(cid);
+ sprintf((char *) mmc_dev.vendor,
+ "Man %02x%02x%02x Snr %02x%02x%02x",
+ cid->id[0], cid->id[1], cid->id[2],
+ cid->sn[0], cid->sn[1], cid->sn[2]);
+ sprintf((char *) mmc_dev.product,"%s",cid->name);
+ sprintf((char *) mmc_dev.revision,"%x %x",
+ cid->hwrev, cid->fwrev);
+ }
+ else {
+ struct sd_cid *cid = (struct sd_cid *) resp;
+
+ if (verbose)
+ print_sd_cid(cid);
+ sprintf((char *) mmc_dev.vendor,
+ "Man %02 OEM %c%c \"%c%c%c%c%c\"",
+ cid->mid, cid->oid_0, cid->oid_1,
+ cid->pnm_0, cid->pnm_1, cid->pnm_2, cid->pnm_3,
+ cid->pnm_4);
+ sprintf((char *) mmc_dev.product, "%d",
+ cid->psn_0 << 24 | cid->psn_1 << 16 |
+ cid->psn_2 << 8 | cid->psn_3);
+ sprintf((char *) mmc_dev.revision, "%d.%d",
+ cid->prv >> 4, cid->prv & 15);
+ }
+
+ /* fill in device description */
+ mmc_dev.if_type = IF_TYPE_MMC;
+ mmc_dev.part_type = PART_TYPE_DOS;
+ mmc_dev.dev = 0;
+ mmc_dev.lun = 0;
+ mmc_dev.type = 0;
+ /* FIXME fill in the correct size (is set to 32MByte) */
+ mmc_dev.blksz = 512;
+ mmc_dev.lba = 0x10000;
+ mmc_dev.removable = 0;
+ mmc_dev.block_read = mmc_bread;
+
+ /* MMC exists, get CSD too */
+ resp = mmc_cmd(MMC_CMD_SET_RCA, MMC_DEFAULT_RCA, CMD_F_RESP);
+ if (is_sd)
+ rca = resp[0] >> 16;
+
+ resp = mmc_cmd(MMC_CMD_SEND_CSD, rca<<16,
CMD_F_RESP|CMD_F_RESP_LONG);
+ if (resp) {
+ mmc_csd_t *csd = (mmc_csd_t *)resp;
+ memcpy(&mmc_csd, csd, sizeof(csd));
+ rc = 0;
+ mmc_ready = 1;
+ /* FIXME add verbose printout for csd */
+ printf("READ_BL_LEN=%u, C_SIZE_MULT=%u, C_SIZE=%u\n",
+ csd->read_bl_len, csd->c_size_mult1,
csd->c_size);
+ printf("size = %u\n", mmc_size(csd));
+ }
+ }
+
+ resp = mmc_cmd(MMC_CMD_SELECT_CARD, rca<<16, CMD_F_RESP);
+
+#ifdef CONFIG_MMC_WIDE
+ if (is_sd) {
+ resp = mmc_cmd(55, rca<<16, CMD_F_RESP);
+ resp = mmc_cmd(6, 0x02, CMD_F_RESP);
+ wide = 1;
+ }
+#endif
+
+ fat_register_device(&mmc_dev,1); /* partitions start counting with 1 */
+
+ return rc;
+}
+
+int
+mmc_ident(block_dev_desc_t *dev)
+{
+ return 0;
+}
+
+int
+mmc2info(ulong addr)
+{
+ /* FIXME hard codes to 32 MB device */
+ if (addr >= CFG_MMC_BASE && addr < CFG_MMC_BASE + 0x02000000)
+ return 1;
+
+ return 0;
+}
+
+#endif /* defined(CONFIG_MMC) && defined(CONFIG_MMC_S3C) */
+#endif
diff --git a/src/drivers/s3c24xx-mci.h b/src/drivers/s3c24xx-mci.h
new file mode 100644
index 0000000..a271695
--- /dev/null
+++ b/src/drivers/s3c24xx-mci.h
@@ -0,0 +1,33 @@
+/*
+ * (C) Copyright 2000-2003
+ * Wolfgang Denk, DENX Software Engineering, [EMAIL PROTECTED]
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef _MMC_H_
+#define _MMC_H_
+#include <asm/arch/mmc.h>
+
+int mmc_init(int verbose);
+int mmc_read(ulong src, uchar *dst, int size);
+int mmc_write(uchar *src, ulong dst, int size);
+int mmc2info(ulong addr);
+
+#endif /* _MMC_H_ */
diff --git a/src/fat.h b/src/fat.h
deleted file mode 100644
index f993cca..0000000
--- a/src/fat.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * R/O (V)FAT 12/16/32 filesystem implementation by Marcus Sundberg
- *
- * 2002-07-28 - [EMAIL PROTECTED] - ported to ppcboot v1.1.6
- * 2003-03-10 - [EMAIL PROTECTED] - ported to u-boot
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- *
- */
-
-#ifndef _FAT_H_
-#define _FAT_H_
-
-#include <asm/byteorder.h>
-
-#define CONFIG_SUPPORT_VFAT
-
-#define SECTOR_SIZE FS_BLOCK_SIZE
-
-#define FS_BLOCK_SIZE 512
-
-#if FS_BLOCK_SIZE != SECTOR_SIZE
-#error FS_BLOCK_SIZE != SECTOR_SIZE - This code needs to be fixed!
-#endif
-
-#define MAX_CLUSTSIZE 65536
-#define DIRENTSPERBLOCK (FS_BLOCK_SIZE/sizeof(dir_entry))
-#define DIRENTSPERCLUST
((mydata->clust_size*SECTOR_SIZE)/sizeof(dir_entry))
-
-#define FATBUFBLOCKS 6
-#define FATBUFSIZE (FS_BLOCK_SIZE*FATBUFBLOCKS)
-#define FAT12BUFSIZE ((FATBUFSIZE*2)/3)
-#define FAT16BUFSIZE (FATBUFSIZE/2)
-#define FAT32BUFSIZE (FATBUFSIZE/4)
-
-
-/* Filesystem identifiers */
-#define FAT12_SIGN "FAT12 "
-#define FAT16_SIGN "FAT16 "
-#define FAT32_SIGN "FAT32 "
-#define SIGNLEN 8
-
-/* File attributes */
-#define ATTR_RO 1
-#define ATTR_HIDDEN 2
-#define ATTR_SYS 4
-#define ATTR_VOLUME 8
-#define ATTR_DIR 16
-#define ATTR_ARCH 32
-
-#define ATTR_VFAT (ATTR_RO | ATTR_HIDDEN | ATTR_SYS | ATTR_VOLUME)
-
-#define DELETED_FLAG ((char)0xe5) /* Marks deleted files when in name[0] */
-#define aRING 0x05 /* Used to represent '�' in name[0] */
-
-/* Indicates that the entry is the last long entry in a set of long
- * dir entries
- */
-#define LAST_LONG_ENTRY_MASK 0x40
-
-/* Flags telling whether we should read a file or list a directory */
-#define LS_NO 0
-#define LS_YES 1
-#define LS_DIR 1
-#define LS_ROOT 2
-
-#ifdef DEBUG
-#define FAT_DPRINT(args...) printf(args)
-#else
-#define FAT_DPRINT(args...)
-#endif
-#define FAT_ERROR(arg) printf(arg)
-
-#define ISDIRDELIM(c) ((c) == '/' || (c) == '\\')
-
-#define FSTYPE_NONE (-1)
-
-#if defined(__linux__) && defined(__KERNEL__)
-#define FAT2CPU16 le16_to_cpu
-#define FAT2CPU32 le32_to_cpu
-#else
-#if __LITTLE_ENDIAN
-#define FAT2CPU16(x) (x)
-#define FAT2CPU32(x) (x)
-#else
-#define FAT2CPU16(x) ((((x) & 0x00ff) << 8) | (((x) & 0xff00) >> 8))
-#define FAT2CPU32(x) ((((x) & 0x000000ff) << 24) | \
- (((x) & 0x0000ff00) << 8) | \
- (((x) & 0x00ff0000) >> 8) | \
- (((x) & 0xff000000) >> 24))
-#endif
-#endif
-
-#define TOLOWER(c) if((c) >= 'A' && (c) <= 'Z'){(c)+=('a' - 'A');}
-#define START(dent) (FAT2CPU16((dent)->start) \
- + (mydata->fatsize != 32 ? 0 : \
- (FAT2CPU16((dent)->starthi) << 16)))
-#define CHECK_CLUST(x, fatsize) ((x) <= 1 || \
- (x) >= ((fatsize) != 32 ? 0xfff0 : 0xffffff0))
-
-typedef struct boot_sector {
- __u8 ignored[3]; /* Bootstrap code */
- char system_id[8]; /* Name of fs */
- __u8 sector_size[2]; /* Bytes/sector */
- __u8 cluster_size; /* Sectors/cluster */
- __u16 reserved; /* Number of reserved sectors */
- __u8 fats; /* Number of FATs */
- __u8 dir_entries[2]; /* Number of root directory entries */
- __u8 sectors[2]; /* Number of sectors */
- __u8 media; /* Media code */
- __u16 fat_length; /* Sectors/FAT */
- __u16 secs_track; /* Sectors/track */
- __u16 heads; /* Number of heads */
- __u32 hidden; /* Number of hidden sectors */
- __u32 total_sect; /* Number of sectors (if sectors == 0) */
-
- /* FAT32 only */
- __u32 fat32_length; /* Sectors/FAT */
- __u16 flags; /* Bit 8: fat mirroring, low 4: active fat */
- __u8 version[2]; /* Filesystem version */
- __u32 root_cluster; /* First cluster in root directory */
- __u16 info_sector; /* Filesystem info sector */
- __u16 backup_boot; /* Backup boot sector */
- __u16 reserved2[6]; /* Unused */
-} boot_sector;
-
-typedef struct volume_info
-{
- __u8 drive_number; /* BIOS drive number */
- __u8 reserved; /* Unused */
- __u8 ext_boot_sign; /* 0x29 if fields below exist (DOS 3.3+) */
- __u8 volume_id[4]; /* Volume ID number */
- char volume_label[11]; /* Volume label */
- char fs_type[8]; /* Typically FAT12, FAT16, or FAT32 */
- /* Boot code comes next, all but 2 bytes to fill up sector */
- /* Boot sign comes last, 2 bytes */
-} volume_info;
-
-typedef struct dir_entry {
- char name[8],ext[3]; /* Name and extension */
- __u8 attr; /* Attribute bits */
- __u8 lcase; /* Case for base and extension */
- __u8 ctime_ms; /* Creation time, milliseconds */
- __u16 ctime; /* Creation time */
- __u16 cdate; /* Creation date */
- __u16 adate; /* Last access date */
- __u16 starthi; /* High 16 bits of cluster in FAT32 */
- __u16 time,date,start;/* Time, date and first cluster */
- __u32 size; /* File size in bytes */
-} dir_entry;
-
-typedef struct dir_slot {
- __u8 id; /* Sequence number for slot */
- __u8 name0_4[10]; /* First 5 characters in name */
- __u8 attr; /* Attribute byte */
- __u8 reserved; /* Unused */
- __u8 alias_checksum;/* Checksum for 8.3 alias */
- __u8 name5_10[12]; /* 6 more characters in name */
- __u16 start; /* Unused */
- __u8 name11_12[4]; /* Last 2 characters in name */
-} dir_slot;
-
-/* Private filesystem parameters
- *
- * Note: FAT buffer has to be 32 bit aligned
- * (see FAT32 accesses)
- */
-typedef struct {
- __u8 fatbuf[FATBUFSIZE]; /* Current FAT buffer */
- int fatsize; /* Size of FAT in bits */
- __u16 fatlength; /* Length of FAT in sectors */
- __u16 fat_sect; /* Starting sector of the FAT */
- __u16 rootdir_sect; /* Start sector of root directory */
- __u16 clust_size; /* Size of clusters in sectors */
- short data_begin; /* The sector of the first cluster, can be
negative */
- int fatbufnum; /* Used by get_fatent, init to -1 */
-} fsdata;
-
-typedef int (file_detectfs_func)(void);
-typedef int (file_ls_func)(const char *dir);
-typedef long (file_read_func)(const char *filename, void *buffer,
- unsigned long maxsize);
-
-struct filesystem {
- file_detectfs_func *detect;
- file_ls_func *ls;
- file_read_func *read;
- const char name[12];
-};
-
-/* FAT tables */
-file_detectfs_func file_fat_detectfs;
-file_ls_func file_fat_ls;
-file_read_func file_fat_read;
-
-/* Currently this doesn't check if the dir exists or is valid... */
-int file_cd(const char *path);
-int file_fat_detectfs(void);
-int file_fat_ls(const char *dir);
-long file_fat_read(const char *filename, void *buffer, unsigned long maxsize);
-const char *file_getfsname(int idx);
-int fat_register_device(block_dev_desc_t *dev_desc, int part_no);
-
-#endif /* _FAT_H_ */
diff --git a/src/mmc.c b/src/mmc.c
deleted file mode 100644
index b982657..0000000
--- a/src/mmc.c
+++ /dev/null
@@ -1,540 +0,0 @@
-#if 0
-/*
- * u-boot S3C2410 MMC/SD card driver
- * (C) Copyright 2006 by OpenMoko, Inc.
- * Author: Harald Welte <[EMAIL PROTECTED]>
- *
- * based on u-boot pxa MMC driver and linux/drivers/mmc/s3c2410mci.c
- * (C) 2005-2005 Thomas Kleffel
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <config.h>
-#include <common.h>
-#include <mmc.h>
-#include <asm/io.h>
-#include <s3c2410.h>
-#include <part.h>
-#include <fat.h>
-
-#if defined(CONFIG_MMC) && defined(CONFIG_MMC_S3C)
-
-#define CONFIG_MMC_WIDE
-
-static S3C2410_SDI *sdi;
-
-static block_dev_desc_t mmc_dev;
-
-block_dev_desc_t * mmc_get_dev(int dev)
-{
- return ((block_dev_desc_t *)&mmc_dev);
-}
-
-/*
- * FIXME needs to read cid and csd info to determine block size
- * and other parameters
- */
-static uchar mmc_buf[MMC_BLOCK_SIZE];
-static mmc_csd_t mmc_csd;
-static int mmc_ready = 0;
-static int wide = 0;
-
-
-#define CMD_F_RESP 0x01
-#define CMD_F_RESP_LONG 0x02
-
-static u_int32_t *mmc_cmd(ushort cmd, ulong arg, ushort flags)
-{
- static u_int32_t resp[5];
-
- u_int32_t ccon, csta;
- u_int32_t csta_rdy_bit = S3C2410_SDICMDSTAT_CMDSENT;
-
- memset(resp, 0, sizeof(resp));
-
- debug("mmc_cmd CMD%d arg=0x%08x flags=%x\n", cmd, arg, flags);
-
- sdi->SDICSTA = 0xffffffff;
- sdi->SDIDSTA = 0xffffffff;
- sdi->SDIFSTA = 0xffffffff;
-
- sdi->SDICARG = arg;
-
- ccon = cmd & S3C2410_SDICMDCON_INDEX;
- ccon |= S3C2410_SDICMDCON_SENDERHOST|S3C2410_SDICMDCON_CMDSTART;
-
- if (flags & CMD_F_RESP) {
- ccon |= S3C2410_SDICMDCON_WAITRSP;
- csta_rdy_bit = S3C2410_SDICMDSTAT_RSPFIN; /* 1 << 9 */
- }
-
- if (flags & CMD_F_RESP_LONG)
- ccon |= S3C2410_SDICMDCON_LONGRSP;
-
- sdi->SDICCON = ccon;
-
- while (1) {
- csta = sdi->SDICSTA;
- if (csta & csta_rdy_bit)
- break;
- if (csta & S3C2410_SDICMDSTAT_CMDTIMEOUT) {
- printf("===============> MMC CMD Timeout\n");
- sdi->SDICSTA |= S3C2410_SDICMDSTAT_CMDTIMEOUT;
- break;
- }
- }
-
- debug("final MMC CMD status 0x%x\n", csta);
-
- sdi->SDICSTA |= csta_rdy_bit;
-
- if (flags & CMD_F_RESP) {
- resp[0] = sdi->SDIRSP0;
- resp[1] = sdi->SDIRSP1;
- resp[2] = sdi->SDIRSP2;
- resp[3] = sdi->SDIRSP3;
- }
-
- return resp;
-}
-
-#define FIFO_FILL(host) ((host->SDIFSTA & S3C2410_SDIFSTA_COUNTMASK) >> 2)
-
-static int mmc_block_read(uchar *dst, ulong src, ulong len)
-{
- u_int32_t dcon, fifo;
- u_int32_t *dst_u32 = (u_int32_t *)dst;
- u_int32_t *resp;
-
- if (len == 0)
- return 0;
-
- debug("mmc_block_rd dst %lx src %lx len %d\n", (ulong)dst, src, len);
-
- /* set block len */
- resp = mmc_cmd(MMC_CMD_SET_BLOCKLEN, len, CMD_F_RESP);
- sdi->SDIBSIZE = len;
-
- //sdi->SDIPRE = 0xff;
-
- /* setup data */
- dcon = (len >> 9) & S3C2410_SDIDCON_BLKNUM;
- dcon |= S3C2410_SDIDCON_BLOCKMODE;
- dcon |= S3C2410_SDIDCON_RXAFTERCMD|S3C2410_SDIDCON_XFER_RXSTART;
- if (wide)
- dcon |= S3C2410_SDIDCON_WIDEBUS;
-#if defined(CONFIG_S3C2440) || defined(CONFIG_S3C2442)
- dcon |= S3C2440_SDIDCON_DS_WORD | S3C2440_SDIDCON_DATSTART;
-#endif
- sdi->SDIDCON = dcon;
-
- /* send read command */
- resp = mmc_cmd(MMC_CMD_READ_BLOCK, src, CMD_F_RESP);
-
- while (len > 0) {
- u_int32_t sdidsta = sdi->SDIDSTA;
- fifo = FIFO_FILL(sdi);
- if (sdidsta & (S3C2410_SDIDSTA_FIFOFAIL|
- S3C2410_SDIDSTA_CRCFAIL|
- S3C2410_SDIDSTA_RXCRCFAIL|
- S3C2410_SDIDSTA_DATATIMEOUT)) {
- printf("mmc_block_read: err SDIDSTA=0x%08x\n", sdidsta);
- return -EIO;
- }
-
- while (fifo--) {
- //debug("dst_u32 = 0x%08x\n", dst_u32);
- *(dst_u32++) = sdi->SDIDAT;
- if (len >= 4)
- len -= 4;
- else {
- len = 0;
- break;
- }
- }
- }
-
- debug("waiting for SDIDSTA (currently 0x%08x\n", sdi->SDIDSTA);
- while (!(sdi->SDIDSTA & (1 << 4))) {}
- debug("done waiting for SDIDSTA (currently 0x%08x\n", sdi->SDIDSTA);
-
- sdi->SDIDCON = 0;
-
- if (!(sdi->SDIDSTA & S3C2410_SDIDSTA_XFERFINISH))
- debug("mmc_block_read; transfer not finished!\n");
-
- return 0;
-}
-
-static int mmc_block_write(ulong dst, uchar *src, int len)
-{
- printf("MMC block write not yet supported on S3C2410!\n");
- return -1;
-}
-
-
-int mmc_read(ulong src, uchar *dst, int size)
-{
- ulong end, part_start, part_end, part_len, aligned_start, aligned_end;
- ulong mmc_block_size, mmc_block_address;
-
- if (size == 0)
- return 0;
-
- if (!mmc_ready) {
- printf("Please initialize the MMC first\n");
- return -1;
- }
-
- mmc_block_size = MMC_BLOCK_SIZE;
- mmc_block_address = ~(mmc_block_size - 1);
-
- src -= CFG_MMC_BASE;
- end = src + size;
- part_start = ~mmc_block_address & src;
- part_end = ~mmc_block_address & end;
- aligned_start = mmc_block_address & src;
- aligned_end = mmc_block_address & end;
-
- /* all block aligned accesses */
- debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend
%lx\n",
- src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
- if (part_start) {
- part_len = mmc_block_size - part_start;
- debug("ps src %lx dst %lx end %lx pstart %lx pend %lx astart
%lx aend %lx\n",
- src, (ulong)dst, end, part_start, part_end, aligned_start,
aligned_end);
- if ((mmc_block_read(mmc_buf, aligned_start, mmc_block_size)) <
0)
- return -1;
-
- memcpy(dst, mmc_buf+part_start, part_len);
- dst += part_len;
- src += part_len;
- }
- debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend
%lx\n",
- src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
- for (; src < aligned_end; src += mmc_block_size, dst += mmc_block_size)
{
- debug("al src %lx dst %lx end %lx pstart %lx pend %lx astart
%lx aend %lx\n",
- src, (ulong)dst, end, part_start, part_end, aligned_start,
aligned_end);
- if ((mmc_block_read((uchar *)(dst), src, mmc_block_size)) < 0)
- return -1;
- }
- debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend
%lx\n",
- src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
- if (part_end && src < end) {
- debug("pe src %lx dst %lx end %lx pstart %lx pend %lx astart
%lx aend %lx\n",
- src, (ulong)dst, end, part_start, part_end, aligned_start,
aligned_end);
- if ((mmc_block_read(mmc_buf, aligned_end, mmc_block_size)) < 0)
- return -1;
-
- memcpy(dst, mmc_buf, part_end);
- }
- return 0;
-}
-
-int mmc_write(uchar *src, ulong dst, int size)
-{
- ulong end, part_start, part_end, part_len, aligned_start, aligned_end;
- ulong mmc_block_size, mmc_block_address;
-
- if (size == 0)
- return 0;
-
- if (!mmc_ready) {
- printf("Please initialize the MMC first\n");
- return -1;
- }
-
- mmc_block_size = MMC_BLOCK_SIZE;
- mmc_block_address = ~(mmc_block_size - 1);
-
- dst -= CFG_MMC_BASE;
- end = dst + size;
- part_start = ~mmc_block_address & dst;
- part_end = ~mmc_block_address & end;
- aligned_start = mmc_block_address & dst;
- aligned_end = mmc_block_address & end;
-
- /* all block aligned accesses */
- debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend
%lx\n",
- src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
- if (part_start) {
- part_len = mmc_block_size - part_start;
- debug("ps src %lx dst %lx end %lx pstart %lx pend %lx astart
%lx aend %lx\n",
- (ulong)src, dst, end, part_start, part_end, aligned_start,
aligned_end);
- if ((mmc_block_read(mmc_buf, aligned_start, mmc_block_size)) <
0)
- return -1;
-
- memcpy(mmc_buf+part_start, src, part_len);
- if ((mmc_block_write(aligned_start, mmc_buf, mmc_block_size)) <
0)
- return -1;
-
- dst += part_len;
- src += part_len;
- }
- debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend
%lx\n",
- src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
- for (; dst < aligned_end; src += mmc_block_size, dst += mmc_block_size)
{
- debug("al src %lx dst %lx end %lx pstart %lx pend %lx astart
%lx aend %lx\n",
- src, (ulong)dst, end, part_start, part_end, aligned_start,
aligned_end);
- if ((mmc_block_write(dst, (uchar *)src, mmc_block_size)) < 0)
- return -1;
-
- }
- debug("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend
%lx\n",
- src, (ulong)dst, end, part_start, part_end, aligned_start, aligned_end);
- if (part_end && dst < end) {
- debug("pe src %lx dst %lx end %lx pstart %lx pend %lx astart
%lx aend %lx\n",
- src, (ulong)dst, end, part_start, part_end, aligned_start,
aligned_end);
- if ((mmc_block_read(mmc_buf, aligned_end, mmc_block_size)) < 0)
- return -1;
-
- memcpy(mmc_buf, src, part_end);
- if ((mmc_block_write(aligned_end, mmc_buf, mmc_block_size)) < 0)
- return -1;
-
- }
- return 0;
-}
-
-ulong mmc_bread(int dev_num, ulong blknr, ulong blkcnt, void *dst)
-{
- int mmc_block_size = MMC_BLOCK_SIZE;
- ulong src = blknr * mmc_block_size + CFG_MMC_BASE;
-
- mmc_read(src, dst, blkcnt*mmc_block_size);
- return blkcnt;
-}
-
-/* MMC_DEFAULT_RCA should probably be just 1, but this may break other code
- that expects it to be shifted. */
-static u_int16_t rca = MMC_DEFAULT_RCA >> 16;
-
-static u_int32_t mmc_size(const struct mmc_csd *csd)
-{
- u_int32_t block_len, mult, blocknr;
-
- block_len = csd->read_bl_len << 12;
- mult = csd->c_size_mult1 << 8;
- blocknr = (csd->c_size+1) * mult;
-
- return blocknr * block_len;
-}
-
-struct sd_cid {
- char pnm_0; /* product name */
- char oid_1; /* OEM/application ID */
- char oid_0;
- uint8_t mid; /* manufacturer ID */
- char pnm_4;
- char pnm_3;
- char pnm_2;
- char pnm_1;
- uint8_t psn_2; /* product serial number */
- uint8_t psn_1;
- uint8_t psn_0; /* MSB */
- uint8_t prv; /* product revision */
- uint8_t crc; /* CRC7 checksum, b0 is unused and set to 1 */
- uint8_t mdt_1; /* manufacturing date, LSB, RRRRyyyy yyyymmmm */
- uint8_t mdt_0; /* MSB */
- uint8_t psn_3; /* LSB */
-};
-
-static void print_mmc_cid(mmc_cid_t *cid)
-{
- printf("MMC found. Card desciption is:\n");
- printf("Manufacturer ID = %02x%02x%02x\n",
- cid->id[0], cid->id[1], cid->id[2]);
- printf("HW/FW Revision = %x %x\n",cid->hwrev, cid->fwrev);
- cid->hwrev = cid->fwrev = 0; /* null terminate string */
- printf("Product Name = %s\n",cid->name);
- printf("Serial Number = %02x%02x%02x\n",
- cid->sn[0], cid->sn[1], cid->sn[2]);
- printf("Month = %d\n",cid->month);
- printf("Year = %d\n",1997 + cid->year);
-}
-
-static void print_sd_cid(const struct sd_cid *cid)
-{
- printf("Manufacturer: 0x%02x, OEM \"%c%c\"\n",
- cid->mid, cid->oid_0, cid->oid_1);
- printf("Product name: \"%c%c%c%c%c\", revision %d.%d\n",
- cid->pnm_0, cid->pnm_1, cid->pnm_2, cid->pnm_3, cid->pnm_4,
- cid->prv >> 4, cid->prv & 15);
- printf("Serial number: %u\n",
- cid->psn_0 << 24 | cid->psn_1 << 16 | cid->psn_2 << 8 |
- cid->psn_3);
- printf("Manufacturing date: %d/%d\n",
- cid->mdt_1 & 15,
- 2000+((cid->mdt_0 & 15) << 4)+((cid->mdt_1 & 0xf0) >> 4));
- printf("CRC: 0x%02x, b0 = %d\n",
- cid->crc >> 1, cid->crc & 1);
-}
-
-int mmc_init(int verbose)
-{
- int retries, rc = -ENODEV;
- int is_sd = 0;
- u_int32_t *resp;
- S3C24X0_CLOCK_POWER * const clk_power = S3C24X0_GetBase_CLOCK_POWER();
-
- sdi = S3C2410_GetBase_SDI();
-
- debug("mmc_init(PCLK=%u)\n", get_PCLK());
-
- clk_power->CLKCON |= (1 << 9);
-
- sdi->SDIBSIZE = 512;
-#if defined(CONFIG_S3C2410)
- /* S3C2410 has some bug that prevents reliable operation at higher
speed */
- //sdi->SDIPRE = 0x3e; /* SDCLK = PCLK/2 / (SDIPRE+1) = 396kHz */
- sdi->SDIPRE = 0x02; /* 2410: SDCLK = PCLK/2 / (SDIPRE+1) = 11MHz */
- sdi->SDIDTIMER = 0xffff;
-#elif defined(CONFIG_S3C2440) || defined(CONFIG_S3C2442)
- sdi->SDIPRE = 0x05; /* 2410: SDCLK = PCLK / (SDIPRE+1) = 11MHz */
- sdi->SDIDTIMER = 0x7fffff;
-#endif
- sdi->SDIIMSK = 0x0;
- sdi->SDICON = S3C2410_SDICON_FIFORESET|S3C2410_SDICON_CLOCKTYPE;
- udelay(125000); /* FIXME: 74 SDCLK cycles */
-
- mmc_csd.c_size = 0;
-
- /* reset */
- retries = 10;
- resp = mmc_cmd(MMC_CMD_RESET, 0, 0);
-
- printf("trying to detect SD Card...\n");
- while (retries--) {
- udelay(100000);
- resp = mmc_cmd(55, 0x00000000, CMD_F_RESP);
- resp = mmc_cmd(41, 0x00300000, CMD_F_RESP);
-
- if (resp[0] & (1 << 31)) {
- is_sd = 1;
- break;
- }
- }
-
- if (retries == 0 && !is_sd) {
- retries = 10;
- printf("failed to detect SD Card, trying MMC\n");
- resp = mmc_cmd(MMC_CMD_SEND_OP_COND, 0x00ffc000, CMD_F_RESP);
- while (retries-- && resp && !(resp[4] & 0x80)) {
- debug("resp %x %x\n", resp[0], resp[1]);
- udelay(50);
- resp = mmc_cmd(1, 0x00ffff00, CMD_F_RESP);
- }
- }
-
- /* try to get card id */
- resp = mmc_cmd(MMC_CMD_ALL_SEND_CID, 0, CMD_F_RESP|CMD_F_RESP_LONG);
- if (resp) {
- if (!is_sd) {
- /* TODO configure mmc driver depending on card
- attributes */
- mmc_cid_t *cid = (mmc_cid_t *)resp;
-
- if (verbose)
- print_mmc_cid(cid);
- sprintf((char *) mmc_dev.vendor,
- "Man %02x%02x%02x Snr %02x%02x%02x",
- cid->id[0], cid->id[1], cid->id[2],
- cid->sn[0], cid->sn[1], cid->sn[2]);
- sprintf((char *) mmc_dev.product,"%s",cid->name);
- sprintf((char *) mmc_dev.revision,"%x %x",
- cid->hwrev, cid->fwrev);
- }
- else {
- struct sd_cid *cid = (struct sd_cid *) resp;
-
- if (verbose)
- print_sd_cid(cid);
- sprintf((char *) mmc_dev.vendor,
- "Man %02 OEM %c%c \"%c%c%c%c%c\"",
- cid->mid, cid->oid_0, cid->oid_1,
- cid->pnm_0, cid->pnm_1, cid->pnm_2, cid->pnm_3,
- cid->pnm_4);
- sprintf((char *) mmc_dev.product, "%d",
- cid->psn_0 << 24 | cid->psn_1 << 16 |
- cid->psn_2 << 8 | cid->psn_3);
- sprintf((char *) mmc_dev.revision, "%d.%d",
- cid->prv >> 4, cid->prv & 15);
- }
-
- /* fill in device description */
- mmc_dev.if_type = IF_TYPE_MMC;
- mmc_dev.part_type = PART_TYPE_DOS;
- mmc_dev.dev = 0;
- mmc_dev.lun = 0;
- mmc_dev.type = 0;
- /* FIXME fill in the correct size (is set to 32MByte) */
- mmc_dev.blksz = 512;
- mmc_dev.lba = 0x10000;
- mmc_dev.removable = 0;
- mmc_dev.block_read = mmc_bread;
-
- /* MMC exists, get CSD too */
- resp = mmc_cmd(MMC_CMD_SET_RCA, MMC_DEFAULT_RCA, CMD_F_RESP);
- if (is_sd)
- rca = resp[0] >> 16;
-
- resp = mmc_cmd(MMC_CMD_SEND_CSD, rca<<16,
CMD_F_RESP|CMD_F_RESP_LONG);
- if (resp) {
- mmc_csd_t *csd = (mmc_csd_t *)resp;
- memcpy(&mmc_csd, csd, sizeof(csd));
- rc = 0;
- mmc_ready = 1;
- /* FIXME add verbose printout for csd */
- printf("READ_BL_LEN=%u, C_SIZE_MULT=%u, C_SIZE=%u\n",
- csd->read_bl_len, csd->c_size_mult1,
csd->c_size);
- printf("size = %u\n", mmc_size(csd));
- }
- }
-
- resp = mmc_cmd(MMC_CMD_SELECT_CARD, rca<<16, CMD_F_RESP);
-
-#ifdef CONFIG_MMC_WIDE
- if (is_sd) {
- resp = mmc_cmd(55, rca<<16, CMD_F_RESP);
- resp = mmc_cmd(6, 0x02, CMD_F_RESP);
- wide = 1;
- }
-#endif
-
- fat_register_device(&mmc_dev,1); /* partitions start counting with 1 */
-
- return rc;
-}
-
-int
-mmc_ident(block_dev_desc_t *dev)
-{
- return 0;
-}
-
-int
-mmc2info(ulong addr)
-{
- /* FIXME hard codes to 32 MB device */
- if (addr >= CFG_MMC_BASE && addr < CFG_MMC_BASE + 0x02000000)
- return 1;
-
- return 0;
-}
-
-#endif /* defined(CONFIG_MMC) && defined(CONFIG_MMC_S3C) */
-#endif
diff --git a/src/mmc.h b/src/mmc.h
deleted file mode 100644
index a271695..0000000
--- a/src/mmc.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * (C) Copyright 2000-2003
- * Wolfgang Denk, DENX Software Engineering, [EMAIL PROTECTED]
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#ifndef _MMC_H_
-#define _MMC_H_
-#include <asm/arch/mmc.h>
-
-int mmc_init(int verbose);
-int mmc_read(ulong src, uchar *dst, int size);
-int mmc_write(uchar *src, ulong dst, int size);
-int mmc2info(ulong addr);
-
-#endif /* _MMC_H_ */
