projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-samsung
[platform/kernel/u-boot.git]
/
board
/
gumstix
/
duovero
/
duovero.c
diff --git
a/board/gumstix/duovero/duovero.c
b/board/gumstix/duovero/duovero.c
index
3786842
..
849224e
100644
(file)
--- a/
board/gumstix/duovero/duovero.c
+++ b/
board/gumstix/duovero/duovero.c
@@
-14,6
+14,7
@@
#include <asm/arch/clock.h>
#include <asm/arch/gpio.h>
#include <asm/gpio.h>
#include <asm/arch/clock.h>
#include <asm/arch/gpio.h>
#include <asm/gpio.h>
+#include <asm/mach-types.h>
#include "duovero_mux_data.h"
#include "duovero_mux_data.h"
@@
-24,7
+25,7
@@
static void setup_net_chip(void);
#endif
static void setup_net_chip(void);
#endif
-#ifdef CONFIG_USB_EHCI
+#ifdef CONFIG_USB_EHCI
_HCD
#include <usb.h>
#include <asm/arch/ehci.h>
#include <asm/ehci-omap.h>
#include <usb.h>
#include <asm/arch/ehci.h>
#include <asm/ehci-omap.h>
@@
-47,7
+48,7
@@
int board_init(void)
{
gpmc_init();
{
gpmc_init();
- gd->bd->bi_arch_number = MACH_TYPE_
OMAP4_
DUOVERO;
+ gd->bd->bi_arch_number = MACH_TYPE_DUOVERO;
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
return 0;
gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
return 0;
@@
-110,17
+111,19
@@
void set_muxconf_regs(void)
sizeof(struct pad_conf_entry));
}
sizeof(struct pad_conf_entry));
}
-#if
!defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC
_MMC)
+#if
defined(CONFIG
_MMC)
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);
}
int board_mmc_init(bd_t *bis)
{
return omap_mmc_init(0, 0, 0, -1, -1);
}
+#if !defined(CONFIG_SPL_BUILD)
void board_mmc_power_init(void)
{
twl6030_power_mmc_init(0);
}
#endif
void board_mmc_power_init(void)
{
twl6030_power_mmc_init(0);
}
#endif
+#endif
#if defined(CONFIG_CMD_NET)
#if defined(CONFIG_CMD_NET)
@@
-204,7
+207,7
@@
int board_eth_init(bd_t *bis)
return rc;
}
return rc;
}
-#ifdef CONFIG_USB_EHCI
+#ifdef CONFIG_USB_EHCI
_HCD
static struct omap_usbhs_board_data usbhs_bdata = {
.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
static struct omap_usbhs_board_data usbhs_bdata = {
.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,