diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-12-16 17:16:34 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-12-16 17:16:34 +0100 |
| commit | 7f202217356f19e519e6ec57a29de9af73067037 (patch) | |
| tree | 1c3fe822cc37bf4df09ac9ece94c8a71ab9a25d0 /cpu/pxa | |
| parent | 6cdadcb3f1b6eac4a1c4256acaa1438413f95351 (diff) | |
| parent | 584eedab66d0828f2d571a24b10526c4e65f547b (diff) | |
| download | u-boot-imx-7f202217356f19e519e6ec57a29de9af73067037.zip u-boot-imx-7f202217356f19e519e6ec57a29de9af73067037.tar.gz u-boot-imx-7f202217356f19e519e6ec57a29de9af73067037.tar.bz2 | |
Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
Diffstat (limited to 'cpu/pxa')
| -rw-r--r-- | cpu/pxa/config.mk | 1 | ||||
| -rw-r--r-- | cpu/pxa/i2c.c | 15 |
2 files changed, 1 insertions, 15 deletions
diff --git a/cpu/pxa/config.mk b/cpu/pxa/config.mk index f0b86b7..af910e2 100644 --- a/cpu/pxa/config.mk +++ b/cpu/pxa/config.mk @@ -32,4 +32,5 @@ PLATFORM_CPPFLAGS += -march=armv5te -mtune=xscale # # ======================================================================== PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) +PLATFORM_CPPFLAGS +=$(call cc-option,-mno-thumb-interwork,) PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) diff --git a/cpu/pxa/i2c.c b/cpu/pxa/i2c.c index 08042be..6b72ba1 100644 --- a/cpu/pxa/i2c.c +++ b/cpu/pxa/i2c.c @@ -455,19 +455,4 @@ int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len) } -uchar i2c_reg_read (uchar chip, uchar reg) -{ - uchar buf; - - PRINTD(("i2c_reg_read(chip=0x%02x, reg=0x%02x)\n",chip,reg)); - i2c_read(chip, reg, 1, &buf, 1); - return (buf); -} - -void i2c_reg_write(uchar chip, uchar reg, uchar val) -{ - PRINTD(("i2c_reg_write(chip=0x%02x, reg=0x%02x, val=0x%02x)\n",chip,reg,val)); - i2c_write(chip, reg, 1, &val, 1); -} - #endif /* CONFIG_HARD_I2C */ |