leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pxa: move mmc drivers to drivers/mmc

Browse Source 
introduce new macro CONFIG_PXA_MMC to activate it

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2009-02-20 03:47:50 +01:00
parent 9490f46564
commit b03d92e558
11 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/pxa/Makefile
View File

@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(CPU).a LIB = $(obj)lib$(CPU).a
START = start.o START = start.o
COBJS = serial.o interrupts.o cpu.o i2c.o pxafb.o mmc.o usb.o COBJS = serial.o interrupts.o cpu.o i2c.o pxafb.o usb.o
SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))

1
drivers/mmc/Makefile
View File

@ -30,6 +30,7 @@ COBJS-$(CONFIG_ATMEL_MCI) += atmel_mci.o
COBJS-$(CONFIG_BFIN_SDH) += bfin_sdh.o COBJS-$(CONFIG_BFIN_SDH) += bfin_sdh.o
COBJS-$(CONFIG_OMAP3_MMC) += omap3_mmc.o COBJS-$(CONFIG_OMAP3_MMC) += omap3_mmc.o
COBJS-$(CONFIG_FSL_ESDHC) += fsl_esdhc.o COBJS-$(CONFIG_FSL_ESDHC) += fsl_esdhc.o
COBJS-$(CONFIG_PXA_MMC) += pxa_mmc.o
COBJS := $(COBJS-y) COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c) SRCS := $(COBJS:.o=.c)

6
cpu/pxa/mmc.c → drivers/mmc/pxa_mmc.c
View File

@ -28,9 +28,7 @@
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
#include <part.h> #include <part.h>
#include "mmc.h" #include "pxa_mmc.h"
#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);
@ -646,5 +644,3 @@ mmc_legacy_init(int verbose)
return rc; return rc;
} }
#endif /* CONFIG_MMC */

0
cpu/pxa/mmc.h → drivers/mmc/pxa_mmc.h
View File

7
include/configs/delta.h
View File

@ -34,7 +34,6 @@
#ifdef CONFIG_LCD #ifdef CONFIG_LCD
#define CONFIG_SHARP_LM8V31 #define CONFIG_SHARP_LM8V31
#endif #endif
/* #define CONFIG_MMC 1 */
#define BOARD_LATE_INIT 1 #define BOARD_LATE_INIT 1
#undef CONFIG_SKIP_RELOCATE_UBOOT #undef CONFIG_SKIP_RELOCATE_UBOOT
@ -181,7 +180,11 @@
/* valid baudrates */ /* valid baudrates */
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
/* #define CONFIG_SYS_MMC_BASE 0xF0000000 */ #ifdef CONFIG_MMC
#define CONFIG_PXA_MMC
#define CONFIG_CMD_MMC
#define CONFIG_SYS_MMC_BASE 0xF0000000
#endif
/* /*
* Stack sizes * Stack sizes

7
include/configs/lubbock.h
View File

@ -40,7 +40,7 @@
#ifdef CONFIG_LCD #ifdef CONFIG_LCD
#define CONFIG_SHARP_LM8V31 #define CONFIG_SHARP_LM8V31
#endif #endif
#define CONFIG_MMC 1 #define CONFIG_MMC
#define BOARD_LATE_INIT 1 #define BOARD_LATE_INIT 1
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION
@ -83,7 +83,6 @@
*/ */
#include <config_cmd_default.h> #include <config_cmd_default.h>
#define CONFIG_CMD_MMC
#define CONFIG_CMD_FAT #define CONFIG_CMD_FAT
@ -133,7 +132,11 @@
/* valid baudrates */ /* valid baudrates */
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
#ifdef CONFIG_MMC
#define CONFIG_PXA_MMC
#define CONFIG_CMD_MMC
#define CONFIG_SYS_MMC_BASE 0xF0000000 #define CONFIG_SYS_MMC_BASE 0xF0000000
#endif
/* /*
* Stack sizes * Stack sizes

5
include/configs/pleb2.h
View File

@ -132,6 +132,11 @@
/* valid baudrates */ /* valid baudrates */
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
#ifdef CONFIG_MMC
#define CONFIG_PXA_MMC
#define CONFIG_CMD_MMC
#endif
/* /*
* Stack sizes * Stack sizes
* *

5
include/configs/pxa255_idp.h
View File

@ -119,7 +119,6 @@
*/ */
#include <config_cmd_default.h> #include <config_cmd_default.h>
#define CONFIG_CMD_MMC
#define CONFIG_CMD_FAT #define CONFIG_CMD_FAT
#define CONFIG_CMD_DHCP #define CONFIG_CMD_DHCP
@ -249,7 +248,11 @@
/* valid baudrates */ /* valid baudrates */
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
#ifdef CONFIG_MMC
#define CONFIG_PXA_MMC
#define CONFIG_CMD_MMC
#define CONFIG_SYS_MMC_BASE 0xF0000000 #define CONFIG_SYS_MMC_BASE 0xF0000000
#endif
/* /*
* Stack sizes * Stack sizes

5
include/configs/trizepsiv.h
View File

@ -79,7 +79,6 @@
*/ */
#include <config_cmd_default.h> #include <config_cmd_default.h>
#define CONFIG_CMD_MMC
#define CONFIG_CMD_FAT #define CONFIG_CMD_FAT
#define CONFIG_CMD_IMLS #define CONFIG_CMD_IMLS
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
@ -174,7 +173,11 @@
/* valid baudrates */ /* valid baudrates */
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
#ifdef CONFIG_MMC
#define CONFIG_PXA_MMC
#define CONFIG_CMD_MMC
#define CONFIG_SYS_MMC_BASE 0xF0000000 #define CONFIG_SYS_MMC_BASE 0xF0000000
#endif
/* /*
* Stack sizes * Stack sizes

8
include/configs/xsengine.h
View File

@ -115,7 +115,6 @@
*/ */
#include <config_cmd_default.h> #include <config_cmd_default.h>
#define CONFIG_CMD_MMC
#define CONFIG_CMD_FAT #define CONFIG_CMD_FAT
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_JFFS2
@ -142,9 +141,14 @@
#define CONFIG_SYS_MEMTEST_END 0xA0800000 /* 4 ... 8 MB in DRAM */ #define CONFIG_SYS_MEMTEST_END 0xA0800000 /* 4 ... 8 MB in DRAM */
#undef CONFIG_SYS_CLKS_IN_HZ /* everything, incl board info, in Hz */ #undef CONFIG_SYS_CLKS_IN_HZ /* everything, incl board info, in Hz */
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } /* valid baudrates */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } /* valid baudrates */
#define CONFIG_SYS_MMC_BASE 0xF0000000
#define CONFIG_SYS_LOAD_ADDR 0xA0000000 /* load kernel to this address */ #define CONFIG_SYS_LOAD_ADDR 0xA0000000 /* load kernel to this address */
#ifdef CONFIG_MMC
#define CONFIG_PXA_MMC
#define CONFIG_CMD_MMC
#define CONFIG_SYS_MMC_BASE 0xF0000000
#endif
/* Stack sizes - The stack sizes are set up in start.S using the settings below */ /* Stack sizes - The stack sizes are set up in start.S using the settings below */
#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #define CONFIG_STACKSIZE (128*1024) /* regular stack */
#ifdef CONFIG_USE_IRQ #ifdef CONFIG_USE_IRQ

8
include/configs/zylonite.h
View File

@ -41,7 +41,7 @@
#ifdef CONFIG_LCD #ifdef CONFIG_LCD
#define CONFIG_SHARP_LM8V31 #define CONFIG_SHARP_LM8V31
#endif #endif
/* #define CONFIG_MMC 1 */ #undef CONFIG_MMC
#define BOARD_LATE_INIT 1 #define BOARD_LATE_INIT 1
#undef CONFIG_SKIP_RELOCATE_UBOOT #undef CONFIG_SKIP_RELOCATE_UBOOT
@ -152,7 +152,11 @@
/* valid baudrates */ /* valid baudrates */
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
/* #define CONFIG_SYS_MMC_BASE 0xF0000000 */ #ifdef CONFIG_MMC
#define CONFIG_PXA_MMC
#define CONFIG_CMD_MMC
#define CONFIG_SYS_MMC_BASE 0xF0000000
#endif
/* /*
* Stack sizes * Stack sizes