diff options
| author | Tom Rini <trini@konsulko.com> | 2021-12-28 19:28:31 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-12-28 19:28:31 +0300 |
| commit | 87a9aa604de8a4a50642e25b88af328ab375893b (patch) | |
| tree | 863b4beef53827cddf2813dd7627aaa0bac62cda /scripts | |
| parent | 111a8b57354bb5aff55635502a0cdf74cb63e835 (diff) | |
| parent | 92302ab1a279859824ec0f2e3864be44e883bff9 (diff) | |
| download | u-boot-87a9aa604de8a4a50642e25b88af328ab375893b.tar.xz | |
Merge tag 'video-next-20211228' of https://source.denx.de/u-boot/custodians/u-boot-video into next
- various fixes to the sandbox display support
- support for showing a logo without splash screen config
- support for BMP drawing to depths other than 16bpp
- tests for the different types of supported BMP images
- support showing a logo when running coreboot via qemu
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.lib | 21 | ||||
| -rwxr-xr-x | scripts/build-cb.sh | 19 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
3 files changed, 40 insertions, 1 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index b4e63bc0ca..77ad282bbe 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -374,6 +374,27 @@ cmd_S_ttf= \ $(obj)/%.S: $(src)/%.ttf $(call cmd,S_ttf) +# Splash logos +# --------------------------------------------------------------------------- + +# Generate an assembly file to wrap the splash data +quiet_cmd_S_splash= TTF $@ +# Modified for U-Boot +cmd_S_splash= \ +( \ + echo '.section .rodata.splash.init,"a"'; \ + echo '.balign 16'; \ + echo '.global __splash_$(*F)_begin'; \ + echo '__splash_$(*F)_begin:'; \ + echo '.incbin "$<" '; \ + echo '__splash_$(*F)_end:'; \ + echo '.global __splash_$(*F)_end'; \ + echo '.balign 16'; \ +) > $@ + +$(obj)/%.S: $(src)/%.bmp + $(call cmd,S_splash) + # EFI applications # A Makefile target *.efi is built as EFI application. # A Makefile target *_efi.S wraps *.efi as built-in EFI application. diff --git a/scripts/build-cb.sh b/scripts/build-cb.sh new file mode 100755 index 0000000000..1da708fb6e --- /dev/null +++ b/scripts/build-cb.sh @@ -0,0 +1,19 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0+ +# +# Sample script to build a disk image suitable for use with coreboot. The image +# includes a kernel and initrd. +# +# YOU WILL NEED to modify this for your needs, e.g. select a kernel. +# +# Run this with: +# qemu-system-i386 -bios coreboot.rom -drive file=disk.img,if=virtio + +qemu-img create -f raw disk.img 120M +mkfs.ext2 -F disk.img +sudo mkdir -p /mnt/rootfs +sudo mount -o loop disk.img /mnt/rootfs +sudo mkdir -p /mnt/rootfs/boot +sudo cp /boot/vmlinuz /mnt/rootfs/boot/. +sudo cp /boot/initrd.img /mnt/rootfs/boot/. +sudo umount /mnt/rootfs diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 428667b438..79f03d1636 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -2127,7 +2127,6 @@ CONFIG_VERY_BIG_RAM CONFIG_VIDEO_BCM2835 CONFIG_VIDEO_BMP_LOGO CONFIG_VIDEO_DA8XX -CONFIG_VIDEO_LOGO CONFIG_VSC7385_ENET CONFIG_VSC7385_IMAGE CONFIG_VSC7385_IMAGE_SIZE |