yair/u-boot-tk1-som
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
Wolfgang Denk
2009-08-25 22:57:10 +02:00
parent 307ecb6db0 85f9823cd7
commit 68ccfa482b
7 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/configs/cm-bf527.h
View File

@@ -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
/*

2
include/configs/cm-bf537e.h
View File

@@ -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
/*

22
include/s3c24x0.h
View File

@@ -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];