summaryrefslogtreecommitdiff
path: root/board/olio/h1
diff options
context:
space:
mode:
Diffstat (limited to 'board/olio/h1')
-rw-r--r--board/olio/h1/Makefile22
-rw-r--r--board/olio/h1/h1.c5
2 files changed, 5 insertions, 22 deletions
diff --git a/board/olio/h1/Makefile b/board/olio/h1/Makefile
index 9d360712c..245240191 100644
--- a/board/olio/h1/Makefile
+++ b/board/olio/h1/Makefile
@@ -5,24 +5,4 @@
# SPDX-License-Identifier: GPL-2.0+
#
-include $(TOPDIR)/config.mk
-
-LIB = $(obj)lib$(BOARD).o
-
-COBJS-y := $(BOARD).o
-
-COBJS := $(sort $(COBJS-y))
-SRCS := $(COBJS:.o=.c)
-OBJS := $(addprefix $(obj),$(COBJS))
-
-$(LIB): $(obj).depend $(OBJS)
- $(call cmd_link_o_target, $(OBJS))
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
+obj-y := h1.o
diff --git a/board/olio/h1/h1.c b/board/olio/h1/h1.c
index c9350347f..0022cc4f4 100644
--- a/board/olio/h1/h1.c
+++ b/board/olio/h1/h1.c
@@ -80,9 +80,12 @@ int misc_init_r(void)
struct control_prog_io *prog_io_base = (struct control_prog_io *)OMAP34XX_CTRL_BASE;
/* Enable i2c2 pullup resisters */
- writel(~(PRG_I2C2_PULLUPRESX), &prog_io_base->io1);
+ writel(~(PRG_I2C2_PULLUPRESX | PRG_I2C1_PULLUPRESX), &prog_io_base->io1);
printf("Olio H1\n");
+#ifdef CONFIG_SYS_I2C_OMAP34XX
+ i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
+#endif
//MUX_BEAGLE_XM();
dieid_num_r();