summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-08-25 22:51:40 +0200
committerWolfgang Denk <wd@denx.de>2009-08-25 22:51:40 +0200
commit3d447d135c13e4ddfd8ac3f54506e9d1c9d5bb16 (patch)
tree42d42c2e040d1f59c8eb02383e409a73a63d2446 /board
parent30fc5cd3116cb112d0aab7e6d7c8eef1b67ed075 (diff)
parente637385e69f63bc73b9dfd2ddd8d0f383790ca28 (diff)
downloadu-boot-imx-3d447d135c13e4ddfd8ac3f54506e9d1c9d5bb16.zip
u-boot-imx-3d447d135c13e4ddfd8ac3f54506e9d1c9d5bb16.tar.gz
u-boot-imx-3d447d135c13e4ddfd8ac3f54506e9d1c9d5bb16.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'board')
-rw-r--r--board/cm-bf527/gpio_cfi_flash.c6
-rw-r--r--board/cm-bf537e/gpio_cfi_flash.c6
-rw-r--r--board/tcm-bf537/gpio_cfi_flash.c6
3 files changed, 9 insertions, 9 deletions
diff --git a/board/cm-bf527/gpio_cfi_flash.c b/board/cm-bf527/gpio_cfi_flash.c
index 565d900..7167680 100644
--- a/board/cm-bf527/gpio_cfi_flash.c
+++ b/board/cm-bf527/gpio_cfi_flash.c
@@ -51,9 +51,9 @@ u##size flash_read##size(void *addr) \
return __raw_read##sfx(gpio_cfi_flash_swizzle(addr)); \
}
MAKE_FLASH(8, b) /* flash_write8() flash_read8() */
-MAKE_FLASH(16, w) /* flash_write16() flash_write16() */
-MAKE_FLASH(32, l) /* flash_write32() flash_write32() */
-MAKE_FLASH(64, q) /* flash_write64() flash_write64() */
+MAKE_FLASH(16, w) /* flash_write16() flash_read16() */
+MAKE_FLASH(32, l) /* flash_write32() flash_read32() */
+MAKE_FLASH(64, q) /* flash_write64() flash_read64() */
void gpio_cfi_flash_init(void)
{
diff --git a/board/cm-bf537e/gpio_cfi_flash.c b/board/cm-bf537e/gpio_cfi_flash.c
index bb35169..a9e69cf 100644
--- a/board/cm-bf537e/gpio_cfi_flash.c
+++ b/board/cm-bf537e/gpio_cfi_flash.c
@@ -49,9 +49,9 @@ u##size flash_read##size(void *addr) \
return __raw_read##sfx(gpio_cfi_flash_swizzle(addr)); \
}
MAKE_FLASH(8, b) /* flash_write8() flash_read8() */
-MAKE_FLASH(16, w) /* flash_write16() flash_write16() */
-MAKE_FLASH(32, l) /* flash_write32() flash_write32() */
-MAKE_FLASH(64, q) /* flash_write64() flash_write64() */
+MAKE_FLASH(16, w) /* flash_write16() flash_read16() */
+MAKE_FLASH(32, l) /* flash_write32() flash_read32() */
+MAKE_FLASH(64, q) /* flash_write64() flash_read64() */
void gpio_cfi_flash_init(void)
{
diff --git a/board/tcm-bf537/gpio_cfi_flash.c b/board/tcm-bf537/gpio_cfi_flash.c
index 7137d12..ac8587c 100644
--- a/board/tcm-bf537/gpio_cfi_flash.c
+++ b/board/tcm-bf537/gpio_cfi_flash.c
@@ -51,9 +51,9 @@ u##size flash_read##size(void *addr) \
return __raw_read##sfx(gpio_cfi_flash_swizzle(addr)); \
}
MAKE_FLASH(8, b) /* flash_write8() flash_read8() */
-MAKE_FLASH(16, w) /* flash_write16() flash_write16() */
-MAKE_FLASH(32, l) /* flash_write32() flash_write32() */
-MAKE_FLASH(64, q) /* flash_write64() flash_write64() */
+MAKE_FLASH(16, w) /* flash_write16() flash_read16() */
+MAKE_FLASH(32, l) /* flash_write32() flash_read32() */
+MAKE_FLASH(64, q) /* flash_write64() flash_read64() */
void gpio_cfi_flash_init(void)
{