diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-04-30 23:01:08 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-04-30 23:01:08 +0200 |
| commit | ccb71dfac94d4a9ef161a59a51b4f31d7d9e4747 (patch) | |
| tree | 78cfc03a11b67fddaf1168bcec19a710016bdb5d /include/asm-arm/arch-omap3 | |
| parent | bf2ba6d46e1046e54e1de30b4df40e384a355195 (diff) | |
| parent | a1e5f93185d0d85a4b3fad3b6c743cddcd373b0c (diff) | |
| download | u-boot-imx-ccb71dfac94d4a9ef161a59a51b4f31d7d9e4747.zip u-boot-imx-ccb71dfac94d4a9ef161a59a51b4f31d7d9e4747.tar.gz u-boot-imx-ccb71dfac94d4a9ef161a59a51b4f31d7d9e4747.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/asm-arm/arch-omap3')
| -rw-r--r-- | include/asm-arm/arch-omap3/omap3.h | 22 | ||||
| -rw-r--r-- | include/asm-arm/arch-omap3/sys_proto.h | 4 |
2 files changed, 9 insertions, 17 deletions
diff --git a/include/asm-arm/arch-omap3/omap3.h b/include/asm-arm/arch-omap3/omap3.h index 8c9656f..7c11019 100644 --- a/include/asm-arm/arch-omap3/omap3.h +++ b/include/asm-arm/arch-omap3/omap3.h @@ -167,24 +167,20 @@ typedef struct gpio { * 343x real hardware: * ES1 = rev 0 * - * 343x code defines: - * ES1 = 0+1 = 1 - * ES1 = 1+1 = 1 + * ES2 onwards, the value maps to contents of IDCODE register [31:28]. */ -#define CPU_3430_ES1 1 -#define CPU_3430_ES2 2 +#define CPU_3XX_ES10 0 +#define CPU_3XX_ES20 1 +#define CPU_3XX_ES21 2 +#define CPU_3XX_ES30 3 +#define CPU_3XX_ES31 4 +#define CPU_3XX_MAX_REV (CPU_3XX_ES31 + 1) + +#define CPU_3XX_ID_SHIFT 28 #define WIDTH_8BIT 0x0000 #define WIDTH_16BIT 0x1000 /* bit pos for 16 bit in gpmc */ -/* SDP definitions according to FPGA Rev. Is this OK?? */ -#define SDP_3430_V1 0x1 -#define SDP_3430_V2 0x2 - -/* EVM definitions */ -#define OMAP3EVM_V1 0x1 -#define OMAP3EVM_V2 0x2 - /* I2C power management companion definitions */ #define PWRMGT_ADDR_ID1 0x48 #define PWRMGT_ADDR_ID2 0x49 diff --git a/include/asm-arm/arch-omap3/sys_proto.h b/include/asm-arm/arch-omap3/sys_proto.h index 8b554bb..7361d08 100644 --- a/include/asm-arm/arch-omap3/sys_proto.h +++ b/include/asm-arm/arch-omap3/sys_proto.h @@ -22,8 +22,6 @@ #define _SYS_PROTO_H_ typedef struct { - u32 board_type_v1; - u32 board_type_v2; u32 mtype; char *board_string; char *nand_string; @@ -46,8 +44,6 @@ u32 get_sysboot_value(void); u32 is_gpmc_muxed(void); u32 get_gpmc0_type(void); u32 get_gpmc0_width(void); -u32 get_board_type(void); -void display_board_info(u32); u32 get_sdr_cs_size(u32); u32 get_sdr_cs_offset(u32); u32 is_running_in_sdram(void); |