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

Merge "ipq807x: uboot: spi : code clean up"

Browse source
This commit is contained in:
Linux Build Service Account 2017-12-21 03:57:58 -08:00 • committed by Gerrit - the friendly Code Review server
commit 4ffdd3caaf
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
board/qca/arm/common/board_init.c
View file

@ -135,10 +135,11 @@ int board_init(void)
printf("BUG: unsupported flash type : %d\n", sfi->flash_type);
BUG();
}
if (sfi->flash_type == SMEM_BOOT_SPI_FLASH) {
#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
saveenv = sf_saveenv;
env_name_spec = sf_env_name_spec;
#endif
#ifdef CONFIG_QCA_MMC
} else if (sfi->flash_type == SMEM_BOOT_MMC_FLASH) {
saveenv = mmc_saveenv;

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

@ -16,9 +16,12 @@
#include <environment.h>
extern void nand_env_relocate_spec(void);
extern void sf_env_relocate_spec(void);
extern int nand_env_init(void);
#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
extern void sf_env_relocate_spec(void);
extern int sf_env_init(void);
#endif
#ifdef CONFIG_QCA_MMC
extern int mmc_env_init(void);
@ -42,7 +45,9 @@ int env_init(void)
&sfi.flash_density);
if (sfi.flash_type == SMEM_BOOT_SPI_FLASH) {
#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
ret = sf_env_init();
#endif
#ifdef CONFIG_QCA_MMC
} else if (sfi.flash_type == SMEM_BOOT_MMC_FLASH) {
ret = mmc_env_init();
@ -66,8 +71,10 @@ void env_relocate_spec(void)
if (sfi.flash_type == SMEM_BOOT_NO_FLASH) {
set_default_env("!flashless boot");
#ifdef CONFIG_ENV_IS_IN_SPI_FLASH
} else if (sfi.flash_type == SMEM_BOOT_SPI_FLASH) {
sf_env_relocate_spec();
#endif
#ifdef CONFIG_QCA_MMC
} else if (sfi.flash_type == SMEM_BOOT_MMC_FLASH) {
mmc_env_relocate_spec();