xilinx: Do not call private env_get_location() when !ENV_IS_NOWHERE
Private function for finding out location of environment is not working when ENV_IS_NOWHERE is disabled. The reason is that current fallback is ENVL_UNKNOWN when CONFIG_ENV_IS_NOWHERE is not enabled. The code could be updated like this - return ENVL_NOWHERE; + if (IS_ENABLED(CONFIG_ENV_IS_NOWHERE)) + return ENVL_NOWHERE; + return ENVL_UNKNOWN; But then boot is still not working because ENVL_UNKNOWN has no driver and env_init() returns -ENODEV. That's why it is better not to define board specific env_get_location() because then weak env_get_location() is used which is going over env_locations[] and returning locations which are actually enabled in u-boot instance. Signed-off-by: Michal Simek <michal.simek@amd.com> Link: https://lore.kernel.org/r/830b9c93d30688cfa8a5cbb0388e79deb7731f29.1711107795.git.michal.simek@amd.com
This commit is contained in:
@@ -372,6 +372,7 @@ void reset_cpu(void)
|
||||
{
|
||||
}
|
||||
|
||||
#if defined(CONFIG_ENV_IS_NOWHERE)
|
||||
enum env_location env_get_location(enum env_operation op, int prio)
|
||||
{
|
||||
u8 bootmode = versal_net_get_bootmode();
|
||||
@@ -401,3 +402,4 @@ enum env_location env_get_location(enum env_operation op, int prio)
|
||||
return ENVL_NOWHERE;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
@@ -291,6 +291,7 @@ void reset_cpu(void)
|
||||
{
|
||||
}
|
||||
|
||||
#if defined(CONFIG_ENV_IS_NOWHERE)
|
||||
enum env_location env_get_location(enum env_operation op, int prio)
|
||||
{
|
||||
u32 bootmode = versal_get_bootmode();
|
||||
@@ -320,3 +321,4 @@ enum env_location env_get_location(enum env_operation op, int prio)
|
||||
return ENVL_NOWHERE;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
@@ -588,6 +588,7 @@ int mmc_get_env_dev(void)
|
||||
return bootseq;
|
||||
}
|
||||
|
||||
#if defined(CONFIG_ENV_IS_NOWHERE)
|
||||
enum env_location env_get_location(enum env_operation op, int prio)
|
||||
{
|
||||
u32 bootmode = zynqmp_get_bootmode();
|
||||
@@ -621,6 +622,7 @@ enum env_location env_get_location(enum env_operation op, int prio)
|
||||
return ENVL_NOWHERE;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_SET_DFU_ALT_INFO)
|
||||
|
||||
|
Reference in New Issue
Block a user