|
@@ -53,15 +53,14 @@ static int setup_flash_device(void)
|
|
|
|
|
|
env_flash = dev_get_uclass_priv(new);
|
|
|
#else
|
|
|
+ if (env_flash)
|
|
|
+ spi_flash_free(env_flash);
|
|
|
|
|
|
+ env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
|
|
|
+ CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE);
|
|
|
if (!env_flash) {
|
|
|
- env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS,
|
|
|
- CONFIG_ENV_SPI_CS,
|
|
|
- CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE);
|
|
|
- if (!env_flash) {
|
|
|
- env_set_default("spi_flash_probe() failed", 0);
|
|
|
- return -EIO;
|
|
|
- }
|
|
|
+ env_set_default("spi_flash_probe() failed", 0);
|
|
|
+ return -EIO;
|
|
|
}
|
|
|
#endif
|
|
|
return 0;
|