diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-08-25 22:57:10 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-08-25 22:57:10 +0200 |
| commit | 68ccfa482be0c7e4aa18285aceb214ed7f5d8e89 (patch) | |
| tree | 9c40b6367afd28d90e9952af5d986912a5368b24 /board | |
| parent | 307ecb6db04eebdc06b8c87d48bf48d3cbd5e9d7 (diff) | |
| parent | 85f9823cd74bd2d9a7854ca0b2244e43b5214e5a (diff) | |
| download | u-boot-68ccfa482be0c7e4aa18285aceb214ed7f5d8e89.zip u-boot-68ccfa482be0c7e4aa18285aceb214ed7f5d8e89.tar.gz u-boot-68ccfa482be0c7e4aa18285aceb214ed7f5d8e89.tar.bz2 | |
Merge branch 'master' into next
Diffstat (limited to 'board')
| -rw-r--r-- | board/cm-bf527/gpio_cfi_flash.c | 6 | ||||
| -rw-r--r-- | board/cm-bf537e/gpio_cfi_flash.c | 6 | ||||
| -rw-r--r-- | board/tcm-bf537/gpio_cfi_flash.c | 6 |
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) { |