OMAP3: Add support for OMAP3 die ID
PATCH v4 1/1 OMAP3: Add support for OMAP3 die ID
Read and store OMAP3 die ID in U-Boot environment.
---
Changes in v4:
- Update commit message, remove 'serial'
- Rebase against U-Bootmainline commit 3c92217732edfc0016c3cbdc828471d013d23a36 'Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx'
This patch replaces '[PATCH v4] OMAP3: Add serial number based on die ID'
Changes in v3:
- Rename 'serial#' to 'dieid#'
- Rebase against U-Boot mainline commit 00cc5595a7caac8066b408774383a956c2e26797 'lcd: Fix compilation warning in common/lcd.c'
This patch replaces all older versions of this patch (which where part of OMAP3 5/7 patch series)
Changes in v2:
- Rename 'serial' to 'serial#'
- Don't copy from a memory to an other, instead just update the pointer
board/omap3/beagle/beagle.c | 2 ++ board/omap3/evm/evm.c | 2 ++ board/omap3/overo/overo.c | 2 ++ board/omap3/pandora/pandora.c | 2 ++ board/omap3/zoom1/zoom1.c | 1 + cpu/arm_cortexa8/omap3/sys_info.c | 26 ++++++++++++++++++++++++++ include/asm-arm/arch-omap3/cpu.h | 13 +++++++++++++ include/asm-arm/arch-omap3/omap3.h | 1 + include/asm-arm/arch-omap3/sys_proto.h | 1 + 9 files changed, 50 insertions(+)
cpu/arm_cortexa8/omap3/sys_info.c +26 -0
@@ -36,6 +36,32 @@ static gpmc_csx_t *gpmc_cs_base = (gpmc_static sdrc_t *sdrc_base = (sdrc_t *)OMAP34XX_SDRC_BASE ;static ctrl_t *ctrl_base = (ctrl_t *)OMAP34XX_CTRL_BASE ; +/***************************************************************** +* dieid_num_r(void) - read and set die ID +*****************************************************************/ +void dieid_num_r (void ) +{ +ctrl_id_t *id_base = (ctrl_id_t *)OMAP34XX_ID_L4_IO_BASE ; +char *uid_s, die_id[34 ]; +u32 id[4 ]; + +memset (die_id,0 ,sizeof (die_id)); + + uid_s =getenv ("dieid#" ); + +if (uid_s ==NULL ) { + id[3 ] =readl (&id_base->die_id_0); + id[2 ] =readl (&id_base->die_id_1); + id[1 ] =readl (&id_base->die_id_2); + id[0 ] =readl (&id_base->die_id_3); +sprintf (die_id,"%08x%08x%08x%08x" , id[0 ], id[1 ], id[2 ], id[3 ]); +setenv ("dieid#" , die_id); + uid_s = die_id; + } + +printf ("Die ID #%s\n" , uid_s); +} +/****************************************** * get_cpu_type(void) - extract cpu info ******************************************/
include/asm-arm/arch-omap3/cpu.h +13 -0
@@ -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
include/asm-arm/arch-omap3/omap3.h +1 -0
@@ -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
board/omap3/overo/overo.c +2 -0
@@ -60,6 +60,8 @@ int misc_init_r(void) {power_init_r (); +dieid_num_r (); +return 0 ; }
board/omap3/beagle/beagle.c +2 -0
@@ -116,6 +116,8 @@ int misc_init_r(void)beagle_identify (); +dieid_num_r (); +return 0 ; }
board/omap3/evm/evm.c +2 -0
@@ -68,6 +68,8 @@ int misc_init_r(void)setup_net_chip ();#endif +dieid_num_r (); +return 0 ; }
include/asm-arm/arch-omap3/sys_proto.h +1 -0
@@ -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
board/omap3/pandora/pandora.c +2 -0
@@ -77,6 +77,8 @@ int misc_init_r(void)writel (GPIO28 , &gpio5_base->setdataout);writel (GPIO4 , &gpio6_base->setdataout); +dieid_num_r (); +return 0 ; }
board/omap3/zoom1/zoom1.c +1 -0
@@ -61,6 +61,7 @@ int board_init(void)int misc_init_r (void ) {power_init_r (); +dieid_num_r ();return 0 ; }