Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-29 08:01:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Second set of u-boot-atmel fixes for 2019.07 cycle

Browse source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJdGaVcAAoJEB6zHgIOrC/Ic1oH/3Hu55HbHVnA2QqRof/o6RnZ
 VNJQ11+Zs7QA7TIMT/Z5j9ohX0pEkVPQziD9zAL1rz7WJ/laYkPh8wqsKWmfFD2j
 2mCCnf8/vGvST8fiSv0BQ6cqozdMwdQjQ08Eqw0srJhCzqj/I8o8MNlts+OAXNIM
 CyT7LdIr/QSO05zDYxFibki4qs7Q5S8WXbtjsmbAAYajcet5w5+hEZRAD2YXuUv8
 TBuBWz6bgcSLbV7E7YXexoffgIha2K3ETAxWraKZLcc96MNLL054uBraa3dmybqZ
 +0+PHIOcNk2JR4BQmUHCoNgEuKTBPlayxZ3hVUzWzUwot4gBRRUFu/pbnRtLcF4=
 =RzN7
 -----END PGP SIGNATURE-----

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:
Tom Rini 2019-07-01 07:31:26 -04:00
commit 5c74868c9f
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
board/atmel/common/board.c
View file

@ -29,7 +29,7 @@ void at91_pda_detect(void)
ret = w1_get_bus(AT91_PDA_EEPROM_DEFAULT_BUS, &bus); ret = w1_get_bus(AT91_PDA_EEPROM_DEFAULT_BUS, &bus);
if (ret) if (ret)
return; goto pda_detect_err;
for (device_find_first_child(bus, &dev); for (device_find_first_child(bus, &dev);
dev; dev;
@ -41,7 +41,7 @@ void at91_pda_detect(void)
ret = w1_eeprom_read_buf(dev, AT91_PDA_EEPROM_ID_OFFSET, ret = w1_eeprom_read_buf(dev, AT91_PDA_EEPROM_ID_OFFSET,
(u8 *)buf, AT91_PDA_EEPROM_ID_LENGTH); (u8 *)buf, AT91_PDA_EEPROM_ID_LENGTH);
if (ret) if (ret)
return; goto pda_detect_err;
break; break;
} }
} }
@ -61,6 +61,8 @@ void at91_pda_detect(void)
printf("PDA TM5000 detected\n"); printf("PDA TM5000 detected\n");
break; break;
} }
pda_detect_err:
env_set("pda", (const char *)buf); env_set("pda", (const char *)buf);
} }
#else #else