eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

omap3: embedd gpmc_cs into gpmc config struct

Browse Source 
Embedd chip select configuration into struct for gpmc config
instead of having it completely separated as suggested by
Wolfgang Denk on
http://lists.denx.de/pipermail/u-boot/2009-May/052247.html

Signed-off-by: Matthias Ludwig <mludwig@ultratronik.de>
This commit is contained in:
Matthias Ludwig
2009-05-19 09:09:31 +02:00
committed by Wolfgang Denk
parent cb32ed1fc2
commit 187af954cf
12 changed files with 53 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
include/asm-arm/arch-omap3/cpu.h
View File

@@ -81,30 +81,38 @@ typedef struct ctrl_id {
#define HS_DEVICE 0x2
#define GP_DEVICE 0x3
/* GPMC CS3/cs4/cs6 not avaliable */
#define GPMC_BASE (OMAP34XX_GPMC_BASE)
#define GPMC_CONFIG_CS0 0x60
#define GPMC_CONFIG_CS5 0x150
#define GPMC_CONFIG_CS0_BASE (GPMC_BASE + GPMC_CONFIG_CS0)
#define GPMC_CONFIG_CS5_BASE (GPMC_BASE + GPMC_CONFIG_CS5)
#define GPMC_CONFIG_WP 0x10
#define GPMC_CONFIG_WIDTH 0x30
#ifndef __ASSEMBLY__
struct gpmc_cs {
unsigned int config1; /* 0x00 */
unsigned int config2; /* 0x04 */
unsigned int config3; /* 0x08 */
unsigned int config4; /* 0x0C */
unsigned int config5; /* 0x10 */
unsigned int config6; /* 0x14 */
unsigned int config7; /* 0x18 */
unsigned int nand_cmd; /* 0x1C */
unsigned int nand_adr; /* 0x20 */
unsigned int nand_dat; /* 0x24 */
unsigned char res[8]; /* blow up to 0x30 byte */
};
typedef struct gpmc {
unsigned char res1[0x10];
unsigned int sysconfig; /* 0x10 */
unsigned char res2[0x4];
unsigned int irqstatus; /* 0x18 */
unsigned int irqenable; /* 0x1C */
unsigned int irqenable; /* 0x1C */
unsigned char res3[0x20];
unsigned int timeout_control; /* 0x40 */
unsigned char res4[0xC];
unsigned int config; /* 0x50 */
unsigned int status; /* 0x54 */
unsigned char res5[0x19C];
unsigned char res5[0x8];
struct gpmc_cs cs[8]; /* 0x60, 0x90, .. */
unsigned char res6[0x18];
unsigned int ecc_config; /* 0x1F4 */
unsigned int ecc_control; /* 0x1F8 */
unsigned int ecc_size_config; /* 0x1FC */
@@ -118,19 +126,6 @@ typedef struct gpmc {
unsigned int ecc8_result; /* 0x21C */
unsigned int ecc9_result; /* 0x220 */
} gpmc_t;
typedef struct gpmc_csx {
unsigned int config1; /* 0x00 */
unsigned int config2; /* 0x04 */
unsigned int config3; /* 0x08 */
unsigned int config4; /* 0x0C */
unsigned int config5; /* 0x10 */
unsigned int config6; /* 0x14 */
unsigned int config7; /* 0x18 */
unsigned int nand_cmd; /* 0x1C */
unsigned int nand_adr; /* 0x20 */
unsigned int nand_dat; /* 0x24 */
} gpmc_csx_t;
#else /* __ASSEMBLY__ */
#define GPMC_CONFIG1 0x00
#define GPMC_CONFIG2 0x04

1
include/configs/omap3_beagle.h
View File

@@ -300,7 +300,6 @@
#define CONFIG_SYS_JFFS2_NUM_BANKS 1
#ifndef __ASSEMBLY__
extern gpmc_csx_t *nand_cs_base;
extern gpmc_t *gpmc_cfg_base;
extern unsigned int boot_flash_base;
extern volatile unsigned int boot_flash_env_addr;

1
include/configs/omap3_evm.h
View File

@@ -292,7 +292,6 @@
#define CONFIG_SYS_JFFS2_NUM_BANKS 1
#ifndef __ASSEMBLY__
extern gpmc_csx_t *nand_cs_base;
extern gpmc_t *gpmc_cfg_base;
extern unsigned int boot_flash_base;
extern volatile unsigned int boot_flash_env_addr;

1
include/configs/omap3_overo.h
View File

@@ -285,7 +285,6 @@
#define CONFIG_SYS_JFFS2_NUM_BANKS 1
#ifndef __ASSEMBLY__
extern gpmc_csx_t *nand_cs_base;
extern gpmc_t *gpmc_cfg_base;
extern unsigned int boot_flash_base;
extern volatile unsigned int boot_flash_env_addr;

1
include/configs/omap3_pandora.h
View File

@@ -289,7 +289,6 @@
#define CONFIG_SYS_JFFS2_NUM_BANKS 1
#ifndef __ASSEMBLY__
extern gpmc_csx_t *nand_cs_base;
extern gpmc_t *gpmc_cfg_base;
extern unsigned int boot_flash_base;
extern volatile unsigned int boot_flash_env_addr;

1
include/configs/omap3_zoom1.h
View File

@@ -297,7 +297,6 @@
#define CONFIG_SYS_JFFS2_NUM_BANKS 1
#ifndef __ASSEMBLY__
extern gpmc_csx_t *nand_cs_base;
extern gpmc_t *gpmc_cfg_base;
extern unsigned int boot_flash_base;
extern volatile unsigned int boot_flash_env_addr;

1
include/configs/omap3_zoom2.h
View File

@@ -252,7 +252,6 @@
#define CONFIG_SYS_FLASH_WRITE_TOUT (100 * CONFIG_SYS_HZ)
#ifndef __ASSEMBLY__
extern gpmc_csx_t *nand_cs_base;
extern gpmc_t *gpmc_cfg_base;
extern unsigned int boot_flash_base;
extern volatile unsigned int boot_flash_env_addr;