diff options
| author | Evan Wilson <evan@oliodevices.com> | 2014-04-07 13:35:18 -0700 |
|---|---|---|
| committer | Evan Wilson <evan@oliodevices.com> | 2014-04-07 13:35:18 -0700 |
| commit | 1ae15fc82718fb6ba04cd5ef171b57232899b93b (patch) | |
| tree | b7bf9139f73e787fc177774787cd3df478a3b095 | |
| parent | 296a4a7816edb3050f1e3abf8df3b86a511858f0 (diff) | |
| download | olio-uboot-2014.01-1ae15fc82718fb6ba04cd5ef171b57232899b93b.tar.xz olio-uboot-2014.01-1ae15fc82718fb6ba04cd5ef171b57232899b93b.zip | |
Changes for 2014.01 U-boot version
| -rw-r--r-- | board/olio/h1/Makefile | 22 | ||||
| -rw-r--r-- | board/olio/h1/h1.c | 5 | ||||
| -rw-r--r-- | include/configs/omap3_h1.h | 10 |
3 files changed, 10 insertions, 27 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(); diff --git a/include/configs/omap3_h1.h b/include/configs/omap3_h1.h index ee599f0e0..7ca70e725 100644 --- a/include/configs/omap3_h1.h +++ b/include/configs/omap3_h1.h @@ -114,11 +114,10 @@ #undef CONFIG_CMD_IMLS /* List all found images */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_HARD_I2C 1 -#define CONFIG_SYS_I2C_SPEED 100000 -#define CONFIG_SYS_I2C_SLAVE 1 -#define CONFIG_I2C_MULTI_BUS 1 -#define CONFIG_DRIVER_OMAP34XX_I2C 1 +#define CONFIG_SYS_I2C +#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 +#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 +#define CONFIG_SYS_I2C_OMAP34XX /*define CONFIG_VIDEO_OMAP3 DSS Support */ /* @@ -306,6 +305,7 @@ 10, 11, 12, 13} #define CONFIG_SYS_NAND_ECCSIZE 512 #define CONFIG_SYS_NAND_ECCBYTES 3 +#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_HAM1_CODE_HW #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 |