diff options
| -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 | ||||
| -rw-r--r-- | include/configs/cm-bf527.h | 2 | ||||
| -rw-r--r-- | include/configs/cm-bf537e.h | 2 | ||||
| -rw-r--r-- | include/s3c24x0.h | 22 |
6 files changed, 25 insertions, 19 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) { diff --git a/include/configs/cm-bf527.h b/include/configs/cm-bf527.h index 79d06fb..1592719 100644 --- a/include/configs/cm-bf527.h +++ b/include/configs/cm-bf527.h @@ -95,7 +95,7 @@ #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_PROTECTION #define CONFIG_SYS_MAX_FLASH_BANKS 1 -#define CONFIG_SYS_MAX_FLASH_SECT 64 +#define CONFIG_SYS_MAX_FLASH_SECT 67 /* diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h index 021b631..34d4299 100644 --- a/include/configs/cm-bf537e.h +++ b/include/configs/cm-bf537e.h @@ -79,7 +79,7 @@ #define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_PROTECTION #define CONFIG_SYS_MAX_FLASH_BANKS 1 -#define CONFIG_SYS_MAX_FLASH_SECT 32 +#define CONFIG_SYS_MAX_FLASH_SECT 35 /* diff --git a/include/s3c24x0.h b/include/s3c24x0.h index 71f35a5..4fa8000 100644 --- a/include/s3c24x0.h +++ b/include/s3c24x0.h @@ -550,14 +550,20 @@ typedef struct { /* SPI (see manual chapter 22) */ typedef struct { - S3C24X0_REG32 SPCON; - S3C24X0_REG32 SPSTA; - S3C24X0_REG32 SPPIN; - S3C24X0_REG32 SPPRE; - S3C24X0_REG32 SPTDAT; - S3C24X0_REG32 SPRDAT; - S3C24X0_REG32 res[2]; -} __attribute__((__packed__)) S3C24X0_SPI_CHANNEL; + S3C24X0_REG8 SPCON; + S3C24X0_REG8 res1[3]; + S3C24X0_REG8 SPSTA; + S3C24X0_REG8 res2[3]; + S3C24X0_REG8 SPPIN; + S3C24X0_REG8 res3[3]; + S3C24X0_REG8 SPPRE; + S3C24X0_REG8 res4[3]; + S3C24X0_REG8 SPTDAT; + S3C24X0_REG8 res5[3]; + S3C24X0_REG8 SPRDAT; + S3C24X0_REG8 res6[3]; + S3C24X0_REG8 res7[16]; +} /*__attribute__((__packed__))*/ S3C24X0_SPI_CHANNEL; typedef struct { S3C24X0_SPI_CHANNEL ch[S3C24X0_SPI_CHANNELS]; |