diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-03-15 22:09:18 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-03-15 22:09:18 +0100 |
| commit | 06ecf088478aed889a4153978c2e30fb02cf41ea (patch) | |
| tree | c4b0722478298cb50127fabf9b3b4bce1a80b371 /include | |
| parent | cd309029f2b8a1a09c484c5766e897b8791c7cfe (diff) | |
| parent | e6a6a704151c2d7e4a7b485545b48a6020ccca17 (diff) | |
| download | u-boot-imx-06ecf088478aed889a4153978c2e30fb02cf41ea.zip u-boot-imx-06ecf088478aed889a4153978c2e30fb02cf41ea.tar.gz u-boot-imx-06ecf088478aed889a4153978c2e30fb02cf41ea.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-omap3/cpu.h | 13 | ||||
| -rw-r--r-- | include/asm-arm/arch-omap3/omap3.h | 1 | ||||
| -rw-r--r-- | include/asm-arm/arch-omap3/sys_proto.h | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/include/asm-arm/arch-omap3/cpu.h b/include/asm-arm/arch-omap3/cpu.h index 5b344f8..c544e0c 100644 --- a/include/asm-arm/arch-omap3/cpu.h +++ b/include/asm-arm/arch-omap3/cpu.h @@ -60,6 +60,19 @@ typedef struct ctrl { #define OMAP3525 0x4c00 #define OMAP3530 0x0c00 +#ifndef __ASSEMBLY__ +typedef struct ctrl_id { + unsigned char res1[0x4]; + unsigned int idcode; /* 0x04 */ + unsigned int prod_id; /* 0x08 */ + unsigned char res2[0x0C]; + unsigned int die_id_0; /* 0x18 */ + 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 */ #define DEVICE_MASK (0x7 << 8) #define SYSBOOT_MASK 0x1F diff --git a/include/asm-arm/arch-omap3/omap3.h b/include/asm-arm/arch-omap3/omap3.h index 02e36d7..8c9656f 100644 --- a/include/asm-arm/arch-omap3/omap3.h +++ b/include/asm-arm/arch-omap3/omap3.h @@ -43,6 +43,7 @@ */ #define OMAP34XX_CORE_L4_IO_BASE 0x48000000 #define OMAP34XX_WAKEUP_L4_IO_BASE 0x48300000 +#define OMAP34XX_ID_L4_IO_BASE 0x4830A200 #define OMAP34XX_L4_PER 0x49000000 #define OMAP34XX_L4_IO_BASE OMAP34XX_CORE_L4_IO_BASE diff --git a/include/asm-arm/arch-omap3/sys_proto.h b/include/asm-arm/arch-omap3/sys_proto.h index ab3e168..8b554bb 100644 --- a/include/asm-arm/arch-omap3/sys_proto.h +++ b/include/asm-arm/arch-omap3/sys_proto.h @@ -66,5 +66,6 @@ void sdelay(unsigned long); void make_cs1_contiguous(void); void omap_nand_switch_ecc(int); void power_init_r(void); +void dieid_num_r(void); #endif |