summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVaibhav Hiremath <hvaibhav@ti.com>2009-09-29 19:03:37 +0530
committerJustin Waters <justin.waters@timesys.com>2009-10-21 16:46:36 -0400
commitb828bf4fcc2d97cedfe65bfed4887680bb802544 (patch)
treeff43a304e675cce2c5c3e2e808cc2236a76ff6cb
parent0e14a72e3bff28486bfc443907dcc91b0e2d647a (diff)
OMAP3517: Warning messages fixed
-rw-r--r--board/omap3/omap3517evm/omap3517evm.c17
-rw-r--r--cpu/arm_cortexa8/omap3/sys_info.c4
2 files changed, 13 insertions, 8 deletions
diff --git a/board/omap3/omap3517evm/omap3517evm.c b/board/omap3/omap3517evm/omap3517evm.c
index 9f5774d28d..a0718daae7 100644
--- a/board/omap3/omap3517evm/omap3517evm.c
+++ b/board/omap3/omap3517evm/omap3517evm.c
@@ -36,6 +36,8 @@
#include <asm/mach-types.h>
#include "omap3517evm.h"
+extern int eth_hw_init(void);
+
/******************************************************************************
* Routine: board_init
* Description: Early hardware init.
@@ -110,7 +112,7 @@ void set_muxconf_regs(void)
*****************************************************************************/
static void setup_net_chip(void)
{
- #if 0
+#if 0
gpio_t *gpio3_base = (gpio_t *)OMAP34XX_GPIO3_BASE;
gpmc_csx_t *gpmc_cs6_base = (gpmc_csx_t *)GPMC_CONFIG_CS6_BASE;
ctrl_t *ctrl_base = (ctrl_t *)OMAP34XX_CTRL_BASE;
@@ -141,12 +143,11 @@ static void setup_net_chip(void)
writel(GPIO0, &gpio3_base->cleardataout);
udelay(1);
writel(GPIO0, &gpio3_base->setdataout);
- #else
+#else
volatile unsigned int ctr;
-
+
gpio_t *gpio1_base = (gpio_t *)OMAP34XX_GPIO1_BASE;
- ctrl_t *ctrl_base = (ctrl_t *)OMAP34XX_CTRL_BASE;
-
+
/* Make GPIO 30 as output pin */
writel(readl(&gpio1_base->oe) & ~(GPIO30), &gpio1_base->oe);
@@ -158,7 +159,7 @@ static void setup_net_chip(void)
udelay(1000);
ctr++;
}while (ctr <300);
-
+
writel(GPIO30, &gpio1_base->setdataout);
ctr =0;
/* allow the PHY to stabilize and settle down */
@@ -166,6 +167,6 @@ static void setup_net_chip(void)
udelay(1000);
ctr++;
}while (ctr <300);
-
- #endif
+
+#endif
}
diff --git a/cpu/arm_cortexa8/omap3/sys_info.c b/cpu/arm_cortexa8/omap3/sys_info.c
index 8077ecf74b..551f5510ca 100644
--- a/cpu/arm_cortexa8/omap3/sys_info.c
+++ b/cpu/arm_cortexa8/omap3/sys_info.c
@@ -32,6 +32,10 @@
#include <i2c.h>
extern omap3_sysinfo sysinfo;
+
+#if defined (CONFIG_OMAP35XX)
+extern unsigned long calc_size_from_emif4(int cs);
+#endif
static gpmc_csx_t *gpmc_cs_base = (gpmc_csx_t *)GPMC_CONFIG_CS0_BASE;
static sdrc_t *sdrc_base = (sdrc_t *)OMAP34XX_SDRC_BASE;
static ctrl_t *ctrl_base = (ctrl_t *)OMAP34XX_CTRL_BASE;