diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-01 07:31:26 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-01 07:31:26 -0400 |
| commit | 5c74868c9f82ffeb2ea3a51ae326eb3b4a03ccdb (patch) | |
| tree | 16378aabb7b7760fa37878b29fbb3cae2b4cde07 | |
| parent | 884512f7dbf9523c0f6ad6fcabf92b61f59f4330 (diff) | |
| parent | ad371d8cd111126ad844f257b723f2f9df45351b (diff) | |
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
| -rw-r--r-- | board/atmel/common/board.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/board/atmel/common/board.c b/board/atmel/common/board.c index fc300a4210..20c3b8c086 100644 --- a/board/atmel/common/board.c +++ b/board/atmel/common/board.c @@ -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 |