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-12 03:58:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "bootqca: Avoiding SPI NOR being read as psudo-NAND"

Browse source
This commit is contained in:
Linux Build Service Account 2018-06-06 10:07:48 -07:00 • committed by Gerrit - the friendly Code Review server
commit 9f318b6fca
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
board/qca/arm/common/cmd_bootqca.c
View file

@ -444,10 +444,6 @@ static int do_boot_signedimg(cmd_tbl_t *cmdtp, int flag, int argc, char *const a
if (debug) {
printf("Using nand device %d\n", CONFIG_SPI_FLASH_INFO_IDX);
}
snprintf(runcmd, sizeof(runcmd),
"nand device %d", CONFIG_SPI_FLASH_INFO_IDX);
run_command(runcmd, 0);
} else if (sfi->flash_type == SMEM_BOOT_NAND_FLASH) {
if (debug) {
printf("Using nand device 0\n");
@ -527,9 +523,10 @@ static int do_boot_signedimg(cmd_tbl_t *cmdtp, int flag, int argc, char *const a
* Kernel is in a separate partition
*/
snprintf(runcmd, sizeof(runcmd),
/* NOR is treated as psuedo NAND */
"nand read 0x%x 0x%llx 0x%llx && ",
request, sfi->hlos.offset, sfi->hlos.size);
"sf probe &&"
"sf read 0x%x 0x%x 0x%x && ",
CONFIG_SYS_LOAD_ADDR,
(uint)sfi->hlos.offset, (uint)sfi->hlos.size);
if (debug)
printf("%s", runcmd);