summaryrefslogtreecommitdiff
path: root/board/keymile/kmeter1
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2008-11-21 08:29:40 +0100
committerWolfgang Denk <wd@denx.de>2009-01-24 00:39:06 +0100
commit210c8c00aad3328145204adab434bb7d70b06b75 (patch)
treee54366427b6e170c4c1a77bc5a24f3bef03a1354 /board/keymile/kmeter1
parentde0443614af4d16675ab436665aeb11ddc9f7214 (diff)
downloadu-boot-imx-210c8c00aad3328145204adab434bb7d70b06b75.zip
u-boot-imx-210c8c00aad3328145204adab434bb7d70b06b75.tar.gz
u-boot-imx-210c8c00aad3328145204adab434bb7d70b06b75.tar.bz2
powerpc: keymile: Add a check for the PIGGY debug board
Check the presence of the PIGGY on the keymile boards mgcoge, mgsuvd and kmeter1. If the PIGGY is not present, dont register this Ethernet device. Signed-off-by: Heiko Schocher <hs@denx.de> Acked-by: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'board/keymile/kmeter1')
-rw-r--r--board/keymile/kmeter1/Makefile6
-rw-r--r--board/keymile/kmeter1/kmeter1.c7
2 files changed, 10 insertions, 3 deletions
diff --git a/board/keymile/kmeter1/Makefile b/board/keymile/kmeter1/Makefile
index 88b79f3..12a1518 100644
--- a/board/keymile/kmeter1/Makefile
+++ b/board/keymile/kmeter1/Makefile
@@ -22,12 +22,14 @@
#
include $(TOPDIR)/config.mk
+ifneq ($(OBJTREE),$(SRCTREE))
+$(shell mkdir -p $(obj)../common)
+endif
LIB = $(obj)lib$(BOARD).a
-COBJS-y += $(BOARD).o
+COBJS += $(BOARD).o ../common/common.o
-COBJS := $(COBJS-y)
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
SOBJS := $(addprefix $(obj),$(SOBJS))
diff --git a/board/keymile/kmeter1/kmeter1.c b/board/keymile/kmeter1/kmeter1.c
index f9a59a64..f04a57a 100644
--- a/board/keymile/kmeter1/kmeter1.c
+++ b/board/keymile/kmeter1/kmeter1.c
@@ -27,6 +27,8 @@
#include <pci.h>
#include <libfdt.h>
+#include "../common/common.h"
+
const qe_iop_conf_t qe_iop_conf_tab[] = {
/* port pin dir open_drain assign */
@@ -141,7 +143,10 @@ phys_size_t initdram (int board_type)
int checkboard (void)
{
- puts ("Board: Keymile kmeter1\n");
+ puts ("Board: Keymile kmeter1");
+ if (ethernet_present ())
+ puts (" with PIGGY.");
+ puts ("\n");
return 0;
}