diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-11-17 20:54:39 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-11-17 20:54:39 +0100 |
| commit | d7b1970015e62d37b26bb6b94b64ae36728c63cc (patch) | |
| tree | 616f994080fb1c0c204e2a77d7a2bb574ba9521d /board/isee | |
| parent | 8ad25bf8d9233eb7d0b614612108622a59069354 (diff) | |
| parent | 858ecd9ac3434e011e84d5fd9013bd1ee199dbdc (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/isee')
| -rw-r--r-- | board/isee/igep0020/config.mk | 2 | ||||
| -rw-r--r-- | board/isee/igep0020/igep0020.c | 9 | ||||
| -rw-r--r-- | board/isee/igep0030/config.mk | 3 | ||||
| -rw-r--r-- | board/isee/igep0030/igep0030.c | 9 |
4 files changed, 21 insertions, 2 deletions
diff --git a/board/isee/igep0020/config.mk b/board/isee/igep0020/config.mk index b8812f94ab1..7964621ac72 100644 --- a/board/isee/igep0020/config.mk +++ b/board/isee/igep0020/config.mk @@ -30,4 +30,4 @@ # (mem base + reserved) # For use with external or internal boots. -TEXT_BASE = 0x80008000 +CONFIG_SYS_TEXT_BASE = 0x80008000 diff --git a/board/isee/igep0020/igep0020.c b/board/isee/igep0020/igep0020.c index 3f7eda1a6ba..3ba541e21e6 100644 --- a/board/isee/igep0020/igep0020.c +++ b/board/isee/igep0020/igep0020.c @@ -26,6 +26,7 @@ #include <asm/io.h> #include <asm/arch/gpio.h> #include <asm/arch/mem.h> +#include <asm/arch/mmc_host_def.h> #include <asm/arch/mux.h> #include <asm/arch/sys_proto.h> #include <asm/mach-types.h> @@ -91,6 +92,14 @@ static void setup_net_chip(void) } #endif +#ifdef CONFIG_GENERIC_MMC +int board_mmc_init(bd_t *bis) +{ + omap_mmc_init(0); + return 0; +} +#endif + /* * Routine: misc_init_r * Description: Configure board specific parts diff --git a/board/isee/igep0030/config.mk b/board/isee/igep0030/config.mk index 019f93f2007..de6384f93cf 100644 --- a/board/isee/igep0030/config.mk +++ b/board/isee/igep0030/config.mk @@ -30,4 +30,5 @@ # (mem base + reserved) # For use with external or internal boots. -TEXT_BASE = 0x80008000 +CONFIG_SYS_TEXT_BASE = 0x80008000 + diff --git a/board/isee/igep0030/igep0030.c b/board/isee/igep0030/igep0030.c index 92442591128..bb4dc3ba174 100644 --- a/board/isee/igep0030/igep0030.c +++ b/board/isee/igep0030/igep0030.c @@ -24,6 +24,7 @@ #include <twl4030.h> #include <asm/io.h> #include <asm/arch/mem.h> +#include <asm/arch/mmc_host_def.h> #include <asm/arch/mux.h> #include <asm/arch/sys_proto.h> #include <asm/mach-types.h> @@ -46,6 +47,14 @@ int board_init(void) return 0; } +#ifdef CONFIG_GENERIC_MMC +int board_mmc_init(bd_t *bis) +{ + omap_mmc_init(0); + return 0; +} +#endif + /* * Routine: misc_init_r * Description: Configure board specific parts |