From fc0e674725a2575f6e6946fe9da052b58ddc303c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8F=AF=E4=BA=AE?= Date: Thu, 22 May 2025 16:57:19 +0800 Subject: [PATCH] v1.2.7 --- .../uboot-2021.10/common/spl/spl_spi_nand_tiny.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/source/uboot-2021.10/common/spl/spl_spi_nand_tiny.c b/source/uboot-2021.10/common/spl/spl_spi_nand_tiny.c index 9cfeb0e2c..734173aca 100644 --- a/source/uboot-2021.10/common/spl/spl_spi_nand_tiny.c +++ b/source/uboot-2021.10/common/spl/spl_spi_nand_tiny.c @@ -274,10 +274,8 @@ static int spi_nand_show_logo(struct spinand_device *spinand) } ret = spi_nand_load_logo(spinand, &dst, &len); -#ifndef CONFIG_USERID_SUPPORT if (ret) goto out; -#endif if (dst[1] == 'P' || dst[2] == 'N' || dst[3] == 'G') aic_png_decode(dst, len); @@ -286,10 +284,8 @@ static int spi_nand_show_logo(struct spinand_device *spinand) else pr_err("Invaild logo file format, need a png/jpeg image\n"); -#ifndef CONFIG_USERID_SUPPORT out: aicfb_update_ui_layer(dev); -#endif aicfb_startup_panel(dev); 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_ARGS_ADDR); -#ifdef CONFIG_VIDEO_ARTINCHIP - spi_nand_show_logo(spinand); -#endif - err = spi_nand_load_image(spl_image, spinand, offset); if (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); /* 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; + } } #endif offset = CONFIG_SYS_SPI_NAND_U_BOOT_OFFS;