Skip to content

Integrate linux-guf/linux-5.15.29-guf-add-memlogo

GitBot requested to merge integrate/linux-guf/linux-5.15.29-guf-add-memlogo/into/kirkstone into kirkstone

Commit: seco-ne/kernel/linux-guf@971afb3b

fbdev: fbmem: Fix logo center image dx issue

Image.dx gets wrong value because of missing '()'.

If xres == logo->width and n == 1, image.dx = -16.

Signed-off-by: Guiling Deng greens9@163.com Fixes: 3d8b1933eb1c ("fbdev: fbmem: add config option to center the bootup logo") Cc: stable@vger.kernel.org # v5.0+ Signed-off-by: Helge Deller deller@gmx.de

--

Commit: seco-ne/kernel/linux-guf@518566e8

arm:dts:nallino: Add empty reserved-memory node

The 'reserved-memory' node must exist in device tree, so that we can apply the DT overlay to reserve memory for a custom logo.

--

Commit: seco-ne/kernel/linux-guf@492a65c2

arm:dts:imx6qdl-san: Add empty reserved-memory node

The 'reserved-memory' node must exist in device tree, so that we can apply the DT overlay to reserve memory for a custom logo.

--

Commit: seco-ne/kernel/linux-guf@e30bc118

logo: add mem logo

This is a fix for issue [746-000092] logo: Implement logo driver to show logo from RAM

If CONFIG_LOGO_SECO_MEMLOGO is set, logo driver will get logo memory address and size from dtb. And if this points to a correct data, logo, loaded into memory will be displayed. If some part of dtb node is missing or data in the memory is incorrect, a logo, which was selected by the driver before will be used.

It is also necessary to reserve memory to which logo is loaded.

Exampled dtb nodes: seco-memlogo { compatible = "seco,memlogo"; address = <0x14000000>; size = <74501>; };

   reserved-memory {
           #address-cells = <1>;
           #size-cells = <1>;
           ranges;

           logo_reserved: logo@14000000 {
                   reusable;
                   reg = <0x14000000 74501>;
           };
   };

Example script, which will generate logo from logo.png: WIDTH=492 HEIGHT=150 pngtopam logo.png > logo.ppm pnmpad -width $WIDTH -height $HEIGHT logo.ppm > logo_pad.ppm pnmcolormap 224 logo_pad.ppm > colormap pnmremap -floyd -plain -mapfile=colormap logo_pad.ppm > logo_plain.ppm seco-pnmtologo -t clut224 -o logo.dat -f bin logo_plain.ppm

Example command to load logo into memory from U-Boot: load mmc 1:3 0x14000000 logo.dat

Signed-off-by: Mikhail Vanyulin mikhail.vanyulin@rtsoft.de

Merge request reports