leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

omap3: omap_die_id support

Browse Source 
This replaces the previous get_dieid definition with omap_die_id, that matches
the common omap_die_id definition.

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Paul Kocialkowski 2015-08-27 19:37:09 +02:00 committed by Tom Rini
parent 72931b15e7
commit b50a768528
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm/cpu/armv7/omap3/sys_info.c
View File

@ -42,17 +42,14 @@ static char *rev_s_37xx[CPU_37XX_MAX_REV] = {
"1.2"};
#endif /* CONFIG_DISPLAY_CPUINFO */
/*****************************************************************
* get_dieid(u32 *id) - read die ID
*****************************************************************/
void get_dieid(u32 *id)
void omap_die_id(unsigned int *die_id)
{
struct ctrl_id *id_base = (struct ctrl_id *)OMAP34XX_ID_L4_IO_BASE;
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);
die_id[0] = readl(&id_base->die_id_0);
die_id[1] = readl(&id_base->die_id_1);
die_id[2] = readl(&id_base->die_id_2);
die_id[3] = readl(&id_base->die_id_3);
}
/*****************************************************************
@ -68,7 +65,7 @@ void dieid_num_r(void)
uid_s = getenv("dieid#");
if (uid_s == NULL) {
get_dieid(id);
omap_die_id(id);
sprintf(die_id, "%08x%08x%08x%08x", id[0], id[1], id[2], id[3]);
setenv("dieid#", die_id);
uid_s = die_id;

1
arch/arm/include/asm/arch-omap3/sys_proto.h
View File

@ -70,7 +70,6 @@ void make_cs1_contiguous(void);
void omap_nand_switch_ecc(uint32_t, uint32_t);
void power_init_r(void);
void dieid_num_r(void);
void get_dieid(u32 *id);
void do_omap3_emu_romcode_call(u32 service_id, u32 parameters);
void omap3_set_aux_cr_secure(u32 acr);
u32 warm_reset(void);

6
board/lge/sniper/sniper.c
View File

@ -92,9 +92,9 @@ int board_init(void)
int misc_init_r(void)
{
unsigned char keypad_matrix[64] = { 0 };
unsigned int die_id[4] = { 0 };
char serial_string[17] = { 0 };
char reboot_mode[2] = { 0 };
u32 dieid[4] = { 0 };
unsigned char keys[3];
unsigned char data = 0;
@ -140,11 +140,11 @@ int misc_init_r(void)
/* Serial number */
get_dieid((u32 *)&dieid);
omap_die_id(die_id);
if (!getenv("serial#")) {
snprintf(serial_string, sizeof(serial_string),
"%08x%08x", dieid[0], dieid[3]);
"%08x%08x", die_id[0], die_id[3]);
setenv("serial#", serial_string);
}

6
board/ti/beagle/beagle.c
View File

@ -507,10 +507,10 @@ int misc_init_r(void)
#endif
if (generate_fake_mac) {
u32 id[4];
unsigned int die_id[4] = { 0 };
get_dieid(id);
usb_fake_mac_from_die_id(id);
omap_die_id(die_id);
usb_fake_mac_from_die_id(die_id);
}
return 0;