Merge tag 'u-boot-atmel-fixes-2019.07-b' of https://gitlab.denx.de/u-boot/custodians/u-boot-atmel
Second set of u-boot-atmel fixes for 2019.07 cycle
This commit is contained in:
@@ -29,7 +29,7 @@ void at91_pda_detect(void)
|
||||
|
||||
ret = w1_get_bus(AT91_PDA_EEPROM_DEFAULT_BUS, &bus);
|
||||
if (ret)
|
||||
return;
|
||||
goto pda_detect_err;
|
||||
|
||||
for (device_find_first_child(bus, &dev);
|
||||
dev;
|
||||
@@ -41,7 +41,7 @@ void at91_pda_detect(void)
|
||||
ret = w1_eeprom_read_buf(dev, AT91_PDA_EEPROM_ID_OFFSET,
|
||||
(u8 *)buf, AT91_PDA_EEPROM_ID_LENGTH);
|
||||
if (ret)
|
||||
return;
|
||||
goto pda_detect_err;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -61,6 +61,8 @@ void at91_pda_detect(void)
|
||||
printf("PDA TM5000 detected\n");
|
||||
break;
|
||||
}
|
||||
|
||||
pda_detect_err:
|
||||
env_set("pda", (const char *)buf);
|
||||
}
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user