mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2026-01-28 01:47:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "qca: Made machid and soc_hw_version as default env"

Browse source
This commit is contained in:
Linux Build Service Account 2020-08-07 09:35:40 -07:00 • committed by Gerrit - the friendly Code Review server
commit 7a58dc5d41
2 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
board/qca/arm/common/env.c
View file

@ -128,4 +128,28 @@ int board_mmc_env_init(qca_mmc mmc_host)
}
return ret;
}
void set_platform_specific_default_env(void)
{
uint32_t soc_ver_major, soc_ver_minor, soc_version;
uint32_t machid;
uint32_t soc_hw_version;
int ret;
machid = smem_get_board_platform_type();
if (machid != 0)
setenv_addr("machid", (void *)machid);
soc_hw_version = get_soc_hw_version();
if (soc_hw_version)
setenv_hex("soc_hw_version", (unsigned long)soc_hw_version);
ret = ipq_smem_get_socinfo_version((uint32_t *)&soc_version);
if (!ret) {
soc_ver_major = SOCINFO_VERSION_MAJOR(soc_version);
soc_ver_minor = SOCINFO_VERSION_MINOR(soc_version);
setenv_ulong("soc_version_major", (unsigned long)soc_ver_major);
setenv_ulong("soc_version_minor", (unsigned long)soc_ver_minor);
}
}
#endif

14
board/qca/arm/ipq807x/ipq807x.c
View file

@ -1793,20 +1793,6 @@ void run_tzt(void *address)
execute_tzt(address);
}
void set_platform_specific_default_env(void)
{
uint32_t soc_ver_major, soc_ver_minor, soc_version;
int ret;
ret = ipq_smem_get_socinfo_version((uint32_t *)&soc_version);
if (!ret) {
soc_ver_major = SOCINFO_VERSION_MAJOR(soc_version);
soc_ver_minor = SOCINFO_VERSION_MINOR(soc_version);
setenv_ulong("soc_version_major", (unsigned long)soc_ver_major);
setenv_ulong("soc_version_minor", (unsigned long)soc_ver_minor);
}
}
void sdi_disable(void)
{
qca_scm_sdi();