summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDirk Behme <dirk.behme@googlemail.com>2009-08-08 09:30:21 +0200
committerWolfgang Denk <wd@denx.de>2009-08-08 11:33:23 +0200
commit97a099eaa48d5c762c4f73c52c3090c513b8b877 (patch)
tree625ee27bb2ad928ef01e68ad8d7fa2e92b2c60bb /include
parent187af954cf7958c24efcf0fd62289bbdb4f1f24e (diff)
downloadu-boot-imx-97a099eaa48d5c762c4f73c52c3090c513b8b877.zip
u-boot-imx-97a099eaa48d5c762c4f73c52c3090c513b8b877.tar.gz
u-boot-imx-97a099eaa48d5c762c4f73c52c3090c513b8b877.tar.bz2
omap3: remove typedefs for configuration structs
Signed-off-by: Matthias Ludwig <mludwig@ultratronik.de> Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/arch-omap3/cpu.h50
-rw-r--r--include/asm-arm/arch-omap3/mem.h4
-rw-r--r--include/asm-arm/arch-omap3/omap3.h8
-rw-r--r--include/configs/omap3_beagle.h2
-rw-r--r--include/configs/omap3_evm.h2
-rw-r--r--include/configs/omap3_overo.h2
-rw-r--r--include/configs/omap3_pandora.h2
-rw-r--r--include/configs/omap3_zoom1.h2
-rw-r--r--include/configs/omap3_zoom2.h2
9 files changed, 37 insertions, 37 deletions
diff --git a/include/asm-arm/arch-omap3/cpu.h b/include/asm-arm/arch-omap3/cpu.h
index 2d203d1..b66bd85 100644
--- a/include/asm-arm/arch-omap3/cpu.h
+++ b/include/asm-arm/arch-omap3/cpu.h
@@ -28,7 +28,7 @@
/* Register offsets of common modules */
/* Control */
#ifndef __ASSEMBLY__
-typedef struct ctrl {
+struct ctrl {
unsigned char res1[0xC0];
unsigned short gpmc_nadv_ale; /* 0xC0 */
unsigned short gpmc_noe; /* 0xC2 */
@@ -49,7 +49,7 @@ typedef struct ctrl {
unsigned int randkey_3; /* 0x324 */
unsigned char res5[0x124];
unsigned int ctrl_omap_stat; /* 0x44C */
-} ctrl_t;
+};
#else /* __ASSEMBLY__ */
#define CONTROL_STATUS 0x2F0
#endif /* __ASSEMBLY__ */
@@ -61,7 +61,7 @@ typedef struct ctrl {
#define OMAP3530 0x0c00
#ifndef __ASSEMBLY__
-typedef struct ctrl_id {
+struct ctrl_id {
unsigned char res1[0x4];
unsigned int idcode; /* 0x04 */
unsigned int prod_id; /* 0x08 */
@@ -70,7 +70,7 @@ typedef struct ctrl_id {
unsigned int die_id_1; /* 0x1C */
unsigned int die_id_2; /* 0x20 */
unsigned int die_id_3; /* 0x24 */
-} ctrl_id_t;
+};
#endif /* __ASSEMBLY__ */
/* device type */
@@ -99,7 +99,7 @@ struct gpmc_cs {
unsigned char res[8]; /* blow up to 0x30 byte */
};
-typedef struct gpmc {
+struct gpmc {
unsigned char res1[0x10];
unsigned int sysconfig; /* 0x10 */
unsigned char res2[0x4];
@@ -125,7 +125,7 @@ typedef struct gpmc {
unsigned int ecc7_result; /* 0x218 */
unsigned int ecc8_result; /* 0x21C */
unsigned int ecc9_result; /* 0x220 */
-} gpmc_t;
+};
#else /* __ASSEMBLY__ */
#define GPMC_CONFIG1 0x00
#define GPMC_CONFIG2 0x04
@@ -151,21 +151,21 @@ typedef struct gpmc {
/* (actual size small port) */
/* SMS */
#ifndef __ASSEMBLY__
-typedef struct sms {
+struct sms {
unsigned char res1[0x10];
unsigned int sysconfig; /* 0x10 */
unsigned char res2[0x34];
unsigned int rg_att0; /* 0x48 */
unsigned char res3[0x84];
unsigned int class_arb0; /* 0xD0 */
-} sms_t;
+};
#endif /* __ASSEMBLY__ */
#define BURSTCOMPLETE_GROUP7 (0x1 << 31)
/* SDRC */
#ifndef __ASSEMBLY__
-typedef struct sdrc_cs {
+struct sdrc_cs {
unsigned int mcfg; /* 0x80 || 0xB0 */
unsigned int mr; /* 0x84 || 0xB4 */
unsigned char res1[0x4];
@@ -174,14 +174,14 @@ typedef struct sdrc_cs {
unsigned int rfr_ctrl; /* 0x84 || 0xD4 */
unsigned int manual; /* 0xA8 || 0xD8 */
unsigned char res3[0x4];
-} sdrc_cs_t;
+};
-typedef struct sdrc_actim {
+struct sdrc_actim {
unsigned int ctrla; /* 0x9C || 0xC4 */
unsigned int ctrlb; /* 0xA0 || 0xC8 */
-} sdrc_actim_t;
+};
-typedef struct sdrc {
+struct sdrc {
unsigned char res1[0x10];
unsigned int sysconfig; /* 0x10 */
unsigned int status; /* 0x14 */
@@ -195,8 +195,8 @@ typedef struct sdrc {
unsigned int dllb_status; /* 0x6C */
unsigned int power; /* 0x70 */
unsigned char res4[0xC];
- sdrc_cs_t cs[2]; /* 0x80 || 0xB0 */
-} sdrc_t;
+ struct sdrc_cs cs[2]; /* 0x80 || 0xB0 */
+};
#endif /* __ASSEMBLY__ */
#define DLLPHASE_90 (0x1 << 1)
@@ -240,7 +240,7 @@ typedef struct sdrc {
/* timer regs offsets (32 bit regs) */
#ifndef __ASSEMBLY__
-typedef struct gptimer {
+struct gptimer {
unsigned int tidr; /* 0x00 r */
unsigned char res[0xc];
unsigned int tiocp_cfg; /* 0x10 rw */
@@ -257,7 +257,7 @@ typedef struct gptimer {
unsigned int tcar1; /* 0x3c r */
unsigned int tcicr; /* 0x40 rw */
unsigned int tcar2; /* 0x44 r */
-} gptimer_t;
+};
#endif /* __ASSEMBLY__ */
/* enable sys_clk NO-prescale /1 */
@@ -265,12 +265,12 @@ typedef struct gptimer {
/* Watchdog */
#ifndef __ASSEMBLY__
-typedef struct watchdog {
+struct watchdog {
unsigned char res1[0x34];
unsigned int wwps; /* 0x34 r */
unsigned char res2[0x10];
unsigned int wspr; /* 0x48 rw */
-} watchdog_t;
+};
#endif /* __ASSEMBLY__ */
#define WD_UNLOCK1 0xAAAA
@@ -280,7 +280,7 @@ typedef struct watchdog {
#define PRCM_BASE 0x48004000
#ifndef __ASSEMBLY__
-typedef struct prcm {
+struct prcm {
unsigned int fclken_iva2; /* 0x00 */
unsigned int clken_pll_iva2; /* 0x04 */
unsigned char res1[0x1c];
@@ -344,7 +344,7 @@ typedef struct prcm {
unsigned int clksel_per; /* 0x1040 */
unsigned char res28[0xfc];
unsigned int clksel1_emu; /* 0x1140 */
-} prcm_t;
+};
#else /* __ASSEMBLY__ */
#define CM_CLKSEL_CORE 0x48004a40
#define CM_CLKSEL_GFX 0x48004b40
@@ -357,14 +357,14 @@ typedef struct prcm {
#define PRM_BASE 0x48306000
#ifndef __ASSEMBLY__
-typedef struct prm {
+struct prm {
unsigned char res1[0xd40];
unsigned int clksel; /* 0xd40 */
unsigned char res2[0x50c];
unsigned int rstctrl; /* 0x1250 */
unsigned char res3[0x1c];
unsigned int clksrc_ctrl; /* 0x1270 */
-} prm_t;
+};
#else /* __ASSEMBLY__ */
#define PRM_RSTCTRL 0x48307250
#endif /* __ASSEMBLY__ */
@@ -400,7 +400,7 @@ typedef struct prm {
#define PM_IVA2_BASE_ADDR_ARM (SMX_APE_BASE + 0x14000)
#ifndef __ASSEMBLY__
-typedef struct pm {
+struct pm {
unsigned char res1[0x48];
unsigned int req_info_permission_0; /* 0x48 */
unsigned char res2[0x4];
@@ -413,7 +413,7 @@ typedef struct pm {
unsigned int req_info_permission_1; /* 0x68 */
unsigned char res6[0x14];
unsigned int addr_match_2; /* 0x80 */
-} pm_t;
+};
#endif /*__ASSEMBLY__ */
/* Permission values for registers -Full fledged permissions to all */
diff --git a/include/asm-arm/arch-omap3/mem.h b/include/asm-arm/arch-omap3/mem.h
index 6f0f90b..5b9ac75 100644
--- a/include/asm-arm/arch-omap3/mem.h
+++ b/include/asm-arm/arch-omap3/mem.h
@@ -29,12 +29,12 @@
#define CS1 0x1 /* mirror CS1 regs appear offset 0x30 from CS0 */
#ifndef __ASSEMBLY__
-typedef enum {
+enum {
STACKED = 0,
IP_DDR = 1,
COMBO_DDR = 2,
IP_SDR = 3,
-} mem_t;
+};
#endif /* __ASSEMBLY__ */
#define EARLY_INIT 1
diff --git a/include/asm-arm/arch-omap3/omap3.h b/include/asm-arm/arch-omap3/omap3.h
index fa8f46d..6459d99 100644
--- a/include/asm-arm/arch-omap3/omap3.h
+++ b/include/asm-arm/arch-omap3/omap3.h
@@ -79,10 +79,10 @@
#ifndef __ASSEMBLY__
-typedef struct s32ktimer {
+struct s32ktimer {
unsigned char res[0x10];
unsigned int s32k_cr; /* 0x10 */
-} s32ktimer_t;
+};
#endif /* __ASSEMBLY__ */
@@ -95,14 +95,14 @@ typedef struct s32ktimer {
#define OMAP34XX_GPIO6_BASE 0x49058000
#ifndef __ASSEMBLY__
-typedef struct gpio {
+struct gpio {
unsigned char res1[0x34];
unsigned int oe; /* 0x34 */
unsigned int datain; /* 0x38 */
unsigned char res2[0x54];
unsigned int cleardataout; /* 0x90 */
unsigned int setdataout; /* 0x94 */
-} gpio_t;
+};
#endif /* __ASSEMBLY__ */
#define GPIO0 (0x1 << 0)
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 72a4c89..61629f8 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -300,7 +300,7 @@
#define CONFIG_SYS_JFFS2_NUM_BANKS 1
#ifndef __ASSEMBLY__
-extern gpmc_t *gpmc_cfg_base;
+extern struct gpmc *gpmc_cfg;
extern unsigned int boot_flash_base;
extern volatile unsigned int boot_flash_env_addr;
extern unsigned int boot_flash_off;
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index f1e1e6a..9f0f34b 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -292,7 +292,7 @@
#define CONFIG_SYS_JFFS2_NUM_BANKS 1
#ifndef __ASSEMBLY__
-extern gpmc_t *gpmc_cfg_base;
+extern struct gpmc *gpmc_cfg;
extern unsigned int boot_flash_base;
extern volatile unsigned int boot_flash_env_addr;
extern unsigned int boot_flash_off;
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index 67620e9..07a031b 100644
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -285,7 +285,7 @@
#define CONFIG_SYS_JFFS2_NUM_BANKS 1
#ifndef __ASSEMBLY__
-extern gpmc_t *gpmc_cfg_base;
+extern struct gpmc *gpmc_cfg;
extern unsigned int boot_flash_base;
extern volatile unsigned int boot_flash_env_addr;
extern unsigned int boot_flash_off;
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index 6e3657b..1cfd7e9 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -289,7 +289,7 @@
#define CONFIG_SYS_JFFS2_NUM_BANKS 1
#ifndef __ASSEMBLY__
-extern gpmc_t *gpmc_cfg_base;
+extern struct gpmc *gpmc_cfg;
extern unsigned int boot_flash_base;
extern volatile unsigned int boot_flash_env_addr;
extern unsigned int boot_flash_off;
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index 43249bd..61a41e7 100644
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -297,7 +297,7 @@
#define CONFIG_SYS_JFFS2_NUM_BANKS 1
#ifndef __ASSEMBLY__
-extern gpmc_t *gpmc_cfg_base;
+extern struct gpmc *gpmc_cfg;
extern unsigned int boot_flash_base;
extern volatile unsigned int boot_flash_env_addr;
extern unsigned int boot_flash_off;
diff --git a/include/configs/omap3_zoom2.h b/include/configs/omap3_zoom2.h
index 8d3c38d..03f92f5 100644
--- a/include/configs/omap3_zoom2.h
+++ b/include/configs/omap3_zoom2.h
@@ -252,7 +252,7 @@
#define CONFIG_SYS_FLASH_WRITE_TOUT (100 * CONFIG_SYS_HZ)
#ifndef __ASSEMBLY__
-extern gpmc_t *gpmc_cfg_base;
+extern struct gpmc *gpmc_cfg;
extern unsigned int boot_flash_base;
extern volatile unsigned int boot_flash_env_addr;
extern unsigned int boot_flash_off;