tz/linuxOS_D21X
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.2.7

Browse Source
This commit is contained in:
刘可亮 2025-05-22 16:57:19 +08:00
parent 555bdd4943
commit fc0e674725
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/uboot-2021.10/common/spl/spl_spi_nand_tiny.c
View File

@ -274,10 +274,8 @@ static int spi_nand_show_logo(struct spinand_device *spinand)
} }
ret = spi_nand_load_logo(spinand, &dst, &len); ret = spi_nand_load_logo(spinand, &dst, &len);
#ifndef CONFIG_USERID_SUPPORT
if (ret) if (ret)
goto out; goto out;
#endif
if (dst[1] == 'P' || dst[2] == 'N' || dst[3] == 'G') if (dst[1] == 'P' || dst[2] == 'N' || dst[3] == 'G')
aic_png_decode(dst, len); aic_png_decode(dst, len);
@ -286,10 +284,8 @@ static int spi_nand_show_logo(struct spinand_device *spinand)
else else
pr_err("Invaild logo file format, need a png/jpeg image\n"); pr_err("Invaild logo file format, need a png/jpeg image\n");
#ifndef CONFIG_USERID_SUPPORT
out: out:
aicfb_update_ui_layer(dev); aicfb_update_ui_layer(dev);
#endif
aicfb_startup_panel(dev); aicfb_startup_panel(dev);
return ret; return ret;
@ -307,10 +303,6 @@ static int spi_nand_load_image_os(struct spl_image_info *spl_image,
CONFIG_SYS_SPL_WRITE_SIZE, &retlen, (void *) CONFIG_SYS_SPL_WRITE_SIZE, &retlen, (void *)
CONFIG_SYS_SPL_ARGS_ADDR); CONFIG_SYS_SPL_ARGS_ADDR);
#ifdef CONFIG_VIDEO_ARTINCHIP
spi_nand_show_logo(spinand);
#endif
err = spi_nand_load_image(spl_image, spinand, offset); err = spi_nand_load_image(spl_image, spinand, offset);
if (err) if (err)
return err; return err;
@ -352,8 +344,12 @@ static int spl_spi_nand_load_image(struct spl_image_info *spl_image,
ret = spi_nand_load_image_os(spl_image, spinand, offset); ret = spi_nand_load_image_os(spl_image, spinand, offset);
/* Double check after linux image is loaded. */ /* Double check after linux image is loaded. */
if (!ret && !spl_start_uboot()) if (!ret && !spl_start_uboot()) {
#ifdef CONFIG_VIDEO_ARTINCHIP
spi_nand_show_logo(spinand);
#endif
return 0; return 0;
}
} }
#endif #endif
offset = CONFIG_SYS_SPI_NAND_U_BOOT_OFFS; offset = CONFIG_SYS_SPI_NAND_U_BOOT_OFFS;