diff options
| author | andy.hu <andy.hu@starfivetech.com> | 2023-03-17 13:29:01 +0300 |
|---|---|---|
| committer | andy.hu <andy.hu@starfivetech.com> | 2023-03-17 13:29:01 +0300 |
| commit | 6be2d0ba531e9ece412cc58545d01ff654563e20 (patch) | |
| tree | a383aaf09dbb7fed9ae392e9a5c1e0333119d9af | |
| parent | 0f9bab35b0e3b445e2d322707b9659d7537d7e8c (diff) | |
| parent | fc2ce6b33e997ec8dbaffc43f35125052d39224a (diff) | |
| download | u-boot-6be2d0ba531e9ece412cc58545d01ff654563e20.tar.xz | |
Merge branch 'CR_4094_evb_515_uboot_logo_keith.zhao' into 'jh7110-master'
CR_4094 display: update uboot logo display function:
See merge request sdk/u-boot!42
| -rw-r--r-- | board/starfive/evb/starfive_evb.c | 3 | ||||
| -rw-r--r-- | include/configs/starfive-evb.h | 4 | ||||
| -rw-r--r-- | include/configs/starfive-visionfive.h | 8 | ||||
| -rwxr-xr-x | tools/logos/starfive.bmp | bin | 0 -> 1536056 bytes |
4 files changed, 13 insertions, 2 deletions
diff --git a/board/starfive/evb/starfive_evb.c b/board/starfive/evb/starfive_evb.c index c219252b09..dc02aad206 100644 --- a/board/starfive/evb/starfive_evb.c +++ b/board/starfive/evb/starfive_evb.c @@ -18,6 +18,7 @@ #include <asm/arch/gpio.h> #include <bmp_logo.h> #include <video.h> +#include <splash.h> enum chip_type_t { CHIP_A = 0, @@ -318,7 +319,7 @@ int board_late_init(void) if (ret) return ret; - ret = video_bmp_display(dev, (ulong)&bmp_logo_bitmap[0], 0, 0, false); + ret = video_bmp_display(dev, (ulong)&bmp_logo_bitmap[0], BMP_ALIGN_CENTER, BMP_ALIGN_CENTER, true); if (ret) goto err; diff --git a/include/configs/starfive-evb.h b/include/configs/starfive-evb.h index d9f1e9aeb2..ffe90264f2 100644 --- a/include/configs/starfive-evb.h +++ b/include/configs/starfive-evb.h @@ -202,5 +202,9 @@ #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_VIDEO_LOGO +#define CONFIG_BMP_16BPP +#define CONFIG_BMP_24BPP +#define CONFIG_BMP_32BPP + #endif /* _STARFIVE_EVB_H */ diff --git a/include/configs/starfive-visionfive.h b/include/configs/starfive-visionfive.h index a7561a15b7..b732cc3122 100644 --- a/include/configs/starfive-visionfive.h +++ b/include/configs/starfive-visionfive.h @@ -141,5 +141,11 @@ #define memcpy_fromio(a, c, l) memcpy((a), (c), (l)) #define memcpy_toio(c, a, l) memcpy((c), (a), (l)) -#endif /* _STARFIVE_VISIONFIVE_H */ +#define CONFIG_VIDEO_BMP_LOGO +#define CONFIG_VIDEO_LOGO +#define CONFIG_BMP_16BPP +#define CONFIG_BMP_24BPP +#define CONFIG_BMP_32BPP + +#endif /* _STARFIVE_EVB_H */ diff --git a/tools/logos/starfive.bmp b/tools/logos/starfive.bmp Binary files differnew file mode 100755 index 0000000000..d18bf78f76 --- /dev/null +++ b/tools/logos/starfive.bmp |
