summaryrefslogtreecommitdiff
path: root/board/keymile/common/common.c
diff options
context:
space:
mode:
authorHeiko Schocher <[hs@denx.de]>2010-02-22 16:43:02 +0530
committerTom Rix <Tom.Rix@windriver.com>2010-03-07 12:36:36 -0600
commit67fa8c25f5c2d23932c0f31b035281d6abbb0965 (patch)
tree8c29542cb8dd57c1098fedb83fa075e637cd27a9 /board/keymile/common/common.c
parent6895d4510a7758595b85b48a7f449bd61dfc812f (diff)
downloadu-boot-imx-67fa8c25f5c2d23932c0f31b035281d6abbb0965.zip
u-boot-imx-67fa8c25f5c2d23932c0f31b035281d6abbb0965.tar.gz
u-boot-imx-67fa8c25f5c2d23932c0f31b035281d6abbb0965.tar.bz2
arm: add support for the suen3 board from keymile
Add support for the ARM part of the mgcoge2, named suen3. This board is based on the Marvell Kirkwood (88F6281) SoC. As there come more board variants, common config options are collected in include/configs/km_arm.h. Also, this board use common code for all keymile boards, which is stored in board/keymile/common/common.c Signed-off-by: Holger Brunck <holger.brunck@keymile.com> Signed-off-by: Stefan Roese <sr@denx.de> Signed-off-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'board/keymile/common/common.c')
-rw-r--r--board/keymile/common/common.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index ec27bda..7b4eefd 100644
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -35,6 +35,7 @@
#include <libfdt.h>
#endif
+#include "../common/common.h"
#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
#include <i2c.h>
@@ -421,7 +422,6 @@ static int get_scl (void)
return ((val & SCL_BIT) == SCL_BIT);
}
-
#endif
#if !defined(CONFIG_KMETER1)
@@ -500,7 +500,7 @@ void i2c_init_board(void)
out_8 (&dev->cr, (I2C_CR_MEN));
#else
-#if defined(CONFIG_HARD_I2C)
+#if defined(CONFIG_HARD_I2C) && !defined(CONFIG_MACH_SUEN3)
volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR ;
volatile i2c8260_t *i2c = (i2c8260_t *)&immap->im_i2c;
@@ -578,10 +578,12 @@ int fdt_get_node_and_value (void *blob,
}
#endif
+#if !defined(CONFIG_MACH_SUEN3)
int ethernet_present (void)
{
return (in_8((u8 *)CONFIG_SYS_PIGGY_BASE + CONFIG_SYS_SLOT_ID_OFF) & 0x80);
}
+#endif
int board_eth_init (bd_t *bis)
{