summaryrefslogtreecommitdiff
path: root/board/st/u8500/Makefile
diff options
context:
space:
mode:
authorMichael Brandt <michael.brandt@stericsson.com>2010-02-17 13:14:09 +0100
committerJonas ABERG <jonas.aberg@stericsson.com>2010-05-19 07:40:42 +0200
commit1e4db0172510318ddc94ef7fcc071fdd435c2e47 (patch)
tree1cb7fde9a824922054de38fe09f5c3d29347b6ab /board/st/u8500/Makefile
parent9a711e3345a291058e071ddbc4133c9f71941eec (diff)
General I2C refactoring and environment settings cleanup
These are the patches for WP252006. There will be a follow-up patched for WP254081. Environment settings * board_id bootargs parameter from board_id environment var set in board_late_init(). * decreased bootdelay to 1 second * added check for keypress on bootdelay==0 * removed preboot command and introduced "run cmdfile" instead * changed rootfstype from ext2 to ext3 General I2C refactoring * include/configs/u8500.h: Enabled i2c command line commands. Changed environment settings to use board_id as set in board_late_init(). Added I2C address and configuration defines. * board/st/u8500/Makefile: Replaced i2c.o with u8500_i2c.o. * board/st/u8500/gpio.c, gpio.h: Added I2C busses to altfunc_table. * board/st/u8500/init_mmc.c: removed config_extended_gpio() and therefore I2C references. GPIOE settings are now in board_late_init(). * board/st/u8500/u8500.c: Removed I2C/SD gpio settings from addr,value array. board_late_init(): Determine and set board_id environment variable 0: mop500, 1: href500 Above boards have different GPIO expander chips which we can distinguish by the chip id (1 and 3). The board_id environment variable is needed for the Linux bootargs. Signed-off-by: Michael Brandt <Michael.Brandt@stericsson.com> Change-Id: I4c2cab28c1cb74692e0c72b2daa422e97787ff8d Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/167 Reviewed-by: Michael BRANDT <michael.brandt@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'board/st/u8500/Makefile')
-rw-r--r--[-rwxr-xr-x]board/st/u8500/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/board/st/u8500/Makefile b/board/st/u8500/Makefile
index 632a49161..b5dfc7bdd 100755..100644
--- a/board/st/u8500/Makefile
+++ b/board/st/u8500/Makefile
@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
CFLAGS += -D__RELEASE -D__STN_8500
LIB = $(obj)lib$(BOARD).a
-COBJS := u8500.o flash.o gpio.o i2c.o mmc.o mmc_utils.o init_mmc.o emmc.o
+COBJS := u8500.o flash.o gpio.o u8500_i2c.o mmc.o mmc_utils.o init_mmc.o emmc.o
SOBJS := core2.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)