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 /include | |
| parent | 307ecb6db04eebdc06b8c87d48bf48d3cbd5e9d7 (diff) | |
| parent | 85f9823cd74bd2d9a7854ca0b2244e43b5214e5a (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'include')
| -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 |
3 files changed, 16 insertions, 10 deletions
diff --git a/include/configs/cm-bf527.h b/include/configs/cm-bf527.h index 79d06fba52..159271996b 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 021b631a90..34d429935e 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 71f35a5174..4fa8000681 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]; |