diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-04-05 23:04:30 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-04-05 23:04:30 +0200 |
| commit | 712ac6a1a6909a58d6549fb220cc921a7e9f9979 (patch) | |
| tree | 7391a68d2b81d9a9096e170b97bbfe0ed81c2c7f /include/s3c6400.h | |
| parent | 23e4af49e066a53cd3e3659b68ef90572d88de84 (diff) | |
| parent | c6fadb9c73a6a3e0c7f20696e978304a593a8d2d (diff) | |
| download | u-boot-imx-712ac6a1a6909a58d6549fb220cc921a7e9f9979.zip u-boot-imx-712ac6a1a6909a58d6549fb220cc921a7e9f9979.tar.gz u-boot-imx-712ac6a1a6909a58d6549fb220cc921a7e9f9979.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/s3c6400.h')
| -rw-r--r-- | include/s3c6400.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/s3c6400.h b/include/s3c6400.h index fd3e99b..87f3760 100644 --- a/include/s3c6400.h +++ b/include/s3c6400.h @@ -215,9 +215,9 @@ #define GPACONSLP_OFFSET 0x0C #define GPAPUDSLP_OFFSET 0x10 #define GPBCON_OFFSET 0x20 -#define GPBDAT_OFFSET 0x04 -#define GPBPUD_OFFSET 0x08 -#define GPBCONSLP_OFFSET 0x0C +#define GPBDAT_OFFSET 0x24 +#define GPBPUD_OFFSET 0x28 +#define GPBCONSLP_OFFSET 0x2C #define GPBPUDSLP_OFFSET 0x30 #define GPCCON_OFFSET 0x40 #define GPCDAT_OFFSET 0x44 @@ -380,6 +380,11 @@ */ #define ELFIN_MEM_SYS_CFG 0x7e00f120 +#define S3C64XX_MEM_SYS_CFG_16BIT (1 << 12) + +#define S3C64XX_MEM_SYS_CFG_NAND 0x0008 +#define S3C64XX_MEM_SYS_CFG_ONENAND S3C64XX_MEM_SYS_CFG_16BIT + #define GPACON (ELFIN_GPIO_BASE + GPACON_OFFSET) #define GPADAT (ELFIN_GPIO_BASE + GPADAT_OFFSET) #define GPAPUD (ELFIN_GPIO_BASE + GPAPUD_OFFSET) |