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

Merge "Merge remote-tracking branch origin/win.coretech.1.0 into HEAD"

Browse source
This commit is contained in:
Linux Build Service Account 2021-08-18 04:40:05 -07:00 • committed by Gerrit - the friendly Code Review server
commit d4ac2d38d5
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -214,11 +214,9 @@ int board_init(void)
#endif
}
#endif
if (sfi->flash_type != SMEM_BOOT_NO_FLASH) {
ret = ipq_board_usb_init();
if (ret < 0) {
printf("WARN: ipq_board_usb_init failed\n");
}
ret = ipq_board_usb_init();
if (ret < 0) {
printf("WARN: ipq_board_usb_init failed\n");
}
#ifndef CONFIG_IPQ9574_RUMI

6
board/qca/arm/ipq806x/ipq806x.c
View file

@ -949,6 +949,12 @@ int ipq_board_usb_init(void)
int i;
unsigned int ipq_base;
uint32_t flash_type;
/*Return if it is recovery path*/
if (ipq_smem_get_boot_flash(&flash_type) < 0)
return -1;
/* Configure the usb core clock */
usb_ss_core_clock_config(0, 1, 5, 32);
/* Configure the usb core clock */

2
common/cmd_ubi.c
View file

@ -486,6 +486,8 @@ int ubi_part(char *part_name, const char *vid_header_offset)
if (ubi_initialized) {
ubi_exit();
del_mtd_partitions(ubi_dev.mtd_info);
put_mtd_device(ubi_dev.mtd_info);
ubi_initialized = 0;
}
/*