mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 21:21:37 +00:00
Eliminated arch-specific mmc header requirement
The current MMC infrastructure relies on the existence of an arch-specific header file. This isn't necessary, and a couple drivers were forced to implement dummy files to meet this requirement. Instead, we move the stuff in those header files into a more appropriate place, and eliminate the stubs and the #include of asm/arch/mmc.h Signed-off-by: Andy Fleming <afleming@freescale.com>
This commit is contained in:
parent
abb5466ccf
commit
1de97f9856
5 changed files with 54 additions and 100 deletions
|
@ -28,6 +28,8 @@
|
||||||
#include <asm/arch/hardware.h>
|
#include <asm/arch/hardware.h>
|
||||||
#include <part.h>
|
#include <part.h>
|
||||||
|
|
||||||
|
#include "mmc.h"
|
||||||
|
|
||||||
#ifdef CONFIG_MMC
|
#ifdef CONFIG_MMC
|
||||||
|
|
||||||
extern int fat_register_device(block_dev_desc_t * dev_desc, int part_no);
|
extern int fat_register_device(block_dev_desc_t * dev_desc, int part_no);
|
||||||
|
|
|
@ -1,22 +0,0 @@
|
||||||
/*
|
|
||||||
* A dummy header file for use with the LPC2292 port to keep the
|
|
||||||
* compiler happy.
|
|
||||||
*
|
|
||||||
* 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_ARM_TDM_H_
|
|
||||||
#define _MMC_ARM_TDM_H_
|
|
||||||
#endif /* _MMC_ARM_TDM_H_ */
|
|
|
@ -1,77 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2004-2006 Atmel Corporation
|
|
||||||
*
|
|
||||||
* 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 __ASM_AVR32_MMC_H
|
|
||||||
#define __ASM_AVR32_MMC_H
|
|
||||||
|
|
||||||
struct mmc_cid {
|
|
||||||
unsigned long psn;
|
|
||||||
unsigned short oid;
|
|
||||||
unsigned char mid;
|
|
||||||
unsigned char prv;
|
|
||||||
unsigned char mdt;
|
|
||||||
char pnm[7];
|
|
||||||
};
|
|
||||||
|
|
||||||
struct mmc_csd
|
|
||||||
{
|
|
||||||
u8 csd_structure:2,
|
|
||||||
spec_vers:4,
|
|
||||||
rsvd1:2;
|
|
||||||
u8 taac;
|
|
||||||
u8 nsac;
|
|
||||||
u8 tran_speed;
|
|
||||||
u16 ccc:12,
|
|
||||||
read_bl_len:4;
|
|
||||||
u64 read_bl_partial:1,
|
|
||||||
write_blk_misalign:1,
|
|
||||||
read_blk_misalign:1,
|
|
||||||
dsr_imp:1,
|
|
||||||
rsvd2:2,
|
|
||||||
c_size:12,
|
|
||||||
vdd_r_curr_min:3,
|
|
||||||
vdd_r_curr_max:3,
|
|
||||||
vdd_w_curr_min:3,
|
|
||||||
vdd_w_curr_max:3,
|
|
||||||
c_size_mult:3,
|
|
||||||
sector_size:5,
|
|
||||||
erase_grp_size:5,
|
|
||||||
wp_grp_size:5,
|
|
||||||
wp_grp_enable:1,
|
|
||||||
default_ecc:2,
|
|
||||||
r2w_factor:3,
|
|
||||||
write_bl_len:4,
|
|
||||||
write_bl_partial:1,
|
|
||||||
rsvd3:5;
|
|
||||||
u8 file_format_grp:1,
|
|
||||||
copy:1,
|
|
||||||
perm_write_protect:1,
|
|
||||||
tmp_write_protect:1,
|
|
||||||
file_format:2,
|
|
||||||
ecc:2;
|
|
||||||
u8 crc:7;
|
|
||||||
u8 one:1;
|
|
||||||
};
|
|
||||||
|
|
||||||
#define R1_ILLEGAL_COMMAND (1 << 22)
|
|
||||||
#define R1_APP_CMD (1 << 5)
|
|
||||||
|
|
||||||
#endif /* __ASM_AVR32_MMC_H */
|
|
|
@ -23,7 +23,6 @@
|
||||||
|
|
||||||
#ifndef _MMC_H_
|
#ifndef _MMC_H_
|
||||||
#define _MMC_H_
|
#define _MMC_H_
|
||||||
#include <asm/arch/mmc.h>
|
|
||||||
|
|
||||||
/* MMC command numbers */
|
/* MMC command numbers */
|
||||||
#define MMC_CMD_GO_IDLE_STATE 0
|
#define MMC_CMD_GO_IDLE_STATE 0
|
||||||
|
@ -49,8 +48,60 @@
|
||||||
#define SD_CMD_APP_SET_BUS_WIDTH 6
|
#define SD_CMD_APP_SET_BUS_WIDTH 6
|
||||||
#define SD_CMD_APP_SEND_OP_COND 41
|
#define SD_CMD_APP_SEND_OP_COND 41
|
||||||
|
|
||||||
|
#define R1_ILLEGAL_COMMAND (1 << 22)
|
||||||
|
#define R1_APP_CMD (1 << 5)
|
||||||
|
|
||||||
int mmc_legacy_init(int verbose);
|
int mmc_legacy_init(int verbose);
|
||||||
int mmc_read(ulong src, uchar *dst, int size);
|
int mmc_read(ulong src, uchar *dst, int size);
|
||||||
int mmc_write(uchar *src, ulong dst, int size);
|
int mmc_write(uchar *src, ulong dst, int size);
|
||||||
|
|
||||||
|
struct mmc_cid {
|
||||||
|
unsigned long psn;
|
||||||
|
unsigned short oid;
|
||||||
|
unsigned char mid;
|
||||||
|
unsigned char prv;
|
||||||
|
unsigned char mdt;
|
||||||
|
char pnm[7];
|
||||||
|
};
|
||||||
|
|
||||||
|
struct mmc_csd
|
||||||
|
{
|
||||||
|
u8 csd_structure:2,
|
||||||
|
spec_vers:4,
|
||||||
|
rsvd1:2;
|
||||||
|
u8 taac;
|
||||||
|
u8 nsac;
|
||||||
|
u8 tran_speed;
|
||||||
|
u16 ccc:12,
|
||||||
|
read_bl_len:4;
|
||||||
|
u64 read_bl_partial:1,
|
||||||
|
write_blk_misalign:1,
|
||||||
|
read_blk_misalign:1,
|
||||||
|
dsr_imp:1,
|
||||||
|
rsvd2:2,
|
||||||
|
c_size:12,
|
||||||
|
vdd_r_curr_min:3,
|
||||||
|
vdd_r_curr_max:3,
|
||||||
|
vdd_w_curr_min:3,
|
||||||
|
vdd_w_curr_max:3,
|
||||||
|
c_size_mult:3,
|
||||||
|
sector_size:5,
|
||||||
|
erase_grp_size:5,
|
||||||
|
wp_grp_size:5,
|
||||||
|
wp_grp_enable:1,
|
||||||
|
default_ecc:2,
|
||||||
|
r2w_factor:3,
|
||||||
|
write_bl_len:4,
|
||||||
|
write_bl_partial:1,
|
||||||
|
rsvd3:5;
|
||||||
|
u8 file_format_grp:1,
|
||||||
|
copy:1,
|
||||||
|
perm_write_protect:1,
|
||||||
|
tmp_write_protect:1,
|
||||||
|
file_format:2,
|
||||||
|
ecc:2;
|
||||||
|
u8 crc:7;
|
||||||
|
u8 one:1;
|
||||||
|
};
|
||||||
|
|
||||||
#endif /* _MMC_H_ */
|
#endif /* _MMC_H_ */
|
||||||
|
|
Loading…
Add table
Reference in a new issue