watchdog: Migrate OMAP_WATCHDOG to Kconfig

[u-boot] / board / broadcom / bcm28155_ap / bcm28155_ap.c

diff --git a/board/broadcom/bcm28155_ap/bcm28155_ap.c b/board/broadcom/bcm28155_ap/bcm28155_ap.c
index e517db3a3bc83fcc133fac1ba8a9dfcc76207d84..f5b94f6430fe80f049aa8228a171a2bff9c6ca27 100644 (file)
--- a/board/broadcom/bcm28155_ap/bcm28155_ap.c
+++ b/board/broadcom/bcm28155_ap/bcm28155_ap.c
@@ -13,7 +13,7 @@
 #include <asm/arch/sysmap.h>
 
 #include <usb.h>
-#include <usb/s3c_udc.h>
+#include <usb/dwc2_udc.h>
 #include <g_dnl.h>
 
 #define SECWATCHDOG_SDOGCR_OFFSET      0x00000000
@@ -69,13 +69,15 @@ int dram_init(void)
 }
 
 /* This is called after dram_init() so use get_ram_size result */
-void dram_init_banksize(void)
+int dram_init_banksize(void)
 {
        gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
        gd->bd->bi_dram[0].size = gd->ram_size;
+
+       return 0;
 }
 
-#ifdef CONFIG_KONA_SDHCI
+#ifdef CONFIG_MMC_SDHCI_KONA
 /*
  * mmc_init - Initializes mmc
  */
@@ -101,8 +103,8 @@ static struct dwc2_plat_otg_data bcm_otg_data = {
 
 int board_usb_init(int index, enum usb_init_type init)
 {
-       debug("%s: performing s3c_udc_probe\n", __func__);
-       return s3c_udc_probe(&bcm_otg_data);
+       debug("%s: performing dwc2_udc_probe\n", __func__);
+       return dwc2_udc_probe(&bcm_otg_data);
 }
 
 int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)