Changes in Makefile

c17ee635fd3a482b2ad2bf5e269755c2eae5f25e - Merge drm/drm-fixes into drm-misc-fixes

Mon, 23 Feb 2026 10:09:45 +0100

Merge drm/drm-fixes into drm-misc-fixes7.0-rc1 was just released, let's merge it to kick the new release cycle.Signed-off-by: Maxime Ripard List of files: /linux/drivers/video/logo/Makefile

8b3c75a39cc3cde78332f0e10898104a5e1e2807 - Merge tag 'fbdev-for-7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev

Sat, 14 Feb 2026 20:54:12 +0100

Merge tag 'fbdev-for-7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdevPull fbdev updates from Helge Deller: "It's now easily possible to replace the framebuffer penguin boot logo with an own logo at compile time (Vincent Mailhol) The hyperv framebuffer driver has been removed, since the hyperv DRM driver now seems to provide equal functionality. Various console_conditional_schedule() calls across the console drivers (fbcon, printk, vt) have been removed since they are no longer necessary. All other patches are either fixes in au1100fb, au1200fb, ffb, rivafb, vt8500lcdfb and of_display_timing, or minor cleanups in the fbcon and omapfb drivers"* tag 'fbdev-for-7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev: (32 commits) fbcon: Declare struct fb_info.fbcon_par as of type struct fbcon_par fbcon: Remove struct fbcon_display.inverse fbdev: au1200fb: Fix a memory leak in au1200fb_drv_probe() fbdev: ffb: fix corrupted video output on Sun FFB1 fbdev: of_display_timing: Fix device node reference leak in of_get_display_timings() staging: fbtft: Make framebuffer registration message debug-only staging: fbtft: Fix build failure when CONFIG_FB_DEVICE=n fbdev: au1100fb: Check return value of clk_enable() in .resume() printk, vt, fbcon: Remove console_conditional_schedule() fbdev: fix fb_pad_unaligned_buffer mask fbdev: of: display_timing: fix refcount leak in of_get_display_timings() fbdev: vt8500lcdfb: fix missing dma_free_coherent() video/logo: don't select LOGO_LINUX_MONO and LOGO_LINUX_VGA16 by default video/logo: move logo selection logic to Kconfig video/logo: remove logo_mac_clut224 sh: defconfig: remove CONFIG_LOGO_SUPERH_* newport_con: depend on LOGO_LINUX_CLUT224 instead of LOGO_SGI_CLUT224 video/logo: allow custom logo video/logo: add a type parameter to the logo makefile function video/logo: remove orphan .pgm Makefile rule ... List of files: /linux/drivers/video/logo/Makefile

ac6d088b3b20f9efb883e8302288276db3bdc2b8 - video/logo: move logo selection logic to Kconfig

Thu, 08 Jan 2026 20:04:55 +0100

video/logo: move logo selection logic to KconfigNow that the path to the logo file can be directly entered in Kbuild,there is no more need to handle all the logo file selection in theMakefile and the C files.The only exception is the logo_spe_clut224 which is only used by theCell processor (found for example in the Playstation 3) [1]. Thisextra logo uses its own different image which shows up on a separateline just below the normal logo. Because the extra logo uses adifferent image, it can not be factorized under the custom logo logic.Move all the logo file selection logic to Kbuild (except from thelogo_spe_clut224.ppm), this done, clean-up the C code to only leaveone entry for each logo type (monochrome, 16-colors and 224-colors).[1] Cell SPE logosLink: https://lore.kernel.org/all/20070710122702.765654000@pademelon.sonytel.be/Signed-off-by: Vincent Mailhol Signed-off-by: Helge Deller List of files: /linux/drivers/video/logo/Makefile

3092718e1280fcbdfc4f4b4a3258be8992a0c244 - video/logo: remove logo_mac_clut224

Thu, 08 Jan 2026 20:04:54 +0100

video/logo: remove logo_mac_clut224The logo_mac_clut224 depends on the runtime value MACH_IS_MAC beingtrue to be displayed. This makes that logo a one-of-a-kind, as it isthe only one whose selection can not be decided at compile time.This dynamic logo selection logic conflicts with our upcoming plans tosimplify the logo selection code.Considering that the logo_mac_clut224 is only used by the Macintosh68k, a machine whose sales ended some thirty years ago and which thusrepresents a very small user base, it is preferable to resolve theconflict in favour of code simplicity.Remove the logo_mac_clut224 so that the logo selection can bestatically determined at compile time.The users who wish to continue using that logo can still download itfrom [1] and add: CONFIG_LOGO_LINUX_CLUT224=y CONFIG_LOGO_LINUX_CLUT224_FILE="/path/to/logo_mac_clut224.ppm"to their configuration file to restore it.[1] logo_mac_clut224.ppm fileLink: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/plain/drivers/video/logo/logo_mac_clut224.ppm?h=v6.18Signed-off-by: Vincent Mailhol Signed-off-by: Helge Deller List of files: /linux/drivers/video/logo/Makefile

dfa6ce636cb8faeaef02b09c973400a410004edf - video/logo: allow custom logo

Thu, 08 Jan 2026 20:04:51 +0100

video/logo: allow custom logoSome people like to replace the default Tux boot logo by an image oftheir own. There exist a few tutorials here [1] and there [2]. Butthis requires modifying the source tree which is a bit cumbersome.Add a string entry in Kbuild for each of the logo categories(monochrome, 16-colors, 224-colors). The string entry takes a path toa .pbm or .ppm image allowing the user to more easily provide a customlogo without having to modify the sources.Add an help entry with a short hint on how to convert images to theportable pixmap file format.Update the Makefile accordingly. When converted to .c file, the logowill have one of these fixed file name: - logo_linux_mono.c - logo_linux_vga16.c - logo_linux_clut224.c:depending on the image type and this regardless of the name of the.pgm/.ppm source filename. This will allow for further simplificationsin an upcoming change.[1] ArmadeuS Project wiki -- Linux Boot LogoLink: https://www.armadeus.org/wiki/index.php?title=Linux_Boot_Logo[2] Timesys -- How To Use a Custom Boot Logo / Splash ScreenLink: https://linuxlink.timesys.com/docs/wiki/engineering/HOWTO_Use_a_custom_boot_logoSigned-off-by: Vincent Mailhol Signed-off-by: Helge Deller List of files: /linux/drivers/video/logo/Makefile

a7aa2b512b141afe638b715f7b84c1588cdc9845 - video/logo: add a type parameter to the logo makefile function

Thu, 08 Jan 2026 20:04:50 +0100

video/logo: add a type parameter to the logo makefile functionWhen translating a portable pixmap file into a .c file, the pnmtologotool expects to receive the image type (either mono, vga16 or clut224)as an argument under the -t option.Currently, this information is stored in the file name. Because wewill allow for custom logo in an upcoming change, it is preferable todecouple the image name from its type.Add a new $2 parameter to the Makefile logo function which containsthe image type.Update all the individual targets to provide this new argument.Signed-off-by: Vincent Mailhol Signed-off-by: Helge Deller List of files: /linux/drivers/video/logo/Makefile

672b35216282199fa2906fb32697a25a686a1adc - video/logo: remove orphan .pgm Makefile rule

Thu, 08 Jan 2026 20:04:49 +0100

video/logo: remove orphan .pgm Makefile ruleThe kernel has no actual grey-scale logos. And looking at the githistory, it seems that there never was one (or maybe there was in thepre-git history? I did not check that far…)Remove the Makefile rule for the .pgm grey scale images.Signed-off-by: Vincent Mailhol Reviewed-by: Geert Uytterhoeven Signed-off-by: Helge Deller List of files: /linux/drivers/video/logo/Makefile

8dd06ef34b6e2f41b29fbf5fc1663780f2524285 - Merge branch 'next' into for-linus

Sat, 06 Jun 2020 19:45:37 +0200

Merge branch 'next' into for-linusPrepare input updates for 5.8 merge window. List of files: /linux/drivers/video/logo/Makefile

d053cf0d771f6547cb0537759a9af63cf402908d - Merge branch 'for-5.8' into for-linus

Mon, 01 Jun 2020 10:15:16 +0200

Merge branch 'for-5.8' into for-linus List of files: /linux/drivers/video/logo/Makefile

0fdc50dfab47d525b71a9f0d8310746cdc0c09c5 - Merge tag 'v5.6' into next

Tue, 12 May 2020 21:18:21 +0200

Merge tag 'v5.6' into nextSync up with mainline to get device tree and other changes. List of files: /linux/drivers/video/logo/Makefile

c9f289701540baeef9ac7c9977d67a7259f404db - Merge branch 'for-5.7/appleir' into for-linus

Wed, 01 Apr 2020 12:26:12 +0200

Merge branch 'for-5.7/appleir' into for-linus- small code cleanups in hid-appleir from Lucas Tanure List of files: /linux/drivers/video/logo/Makefile

a4654e9bde4ecedb4921e6c8fe2088114bdff1b3 - Merge branch 'x86/kdump' into locking/kcsan, to resolve conflicts

Sat, 21 Mar 2020 09:23:40 +0100

Merge branch 'x86/kdump' into locking/kcsan, to resolve conflictsConflicts: arch/x86/purgatory/MakefileSigned-off-by: Ingo Molnar List of files: /linux/drivers/video/logo/Makefile

ff36e78fdb251b9fa65028554689806961e011eb - Merge drm/drm-next into drm-intel-next-queued

Tue, 25 Feb 2020 18:29:58 +0100

Merge drm/drm-next into drm-intel-next-queuedSome DSI and VBT pending patches from Hans will applycleanly and with less ugly conflicts if they are rebuilton top of other patches that recently landed on drm-next.Reference: https://patchwork.freedesktop.org/series/70952/Cc: Hans de Goede Signed-off-by: Rodrigo Vivi

546121b65f47384e11ec1fa2e55449fc9f4846b2 - Merge tag 'v5.6-rc3' into sched/core, to pick up fixes and dependent patches

Mon, 24 Feb 2020 11:36:09 +0100

Merge tag 'v5.6-rc3' into sched/core, to pick up fixes and dependent patchesSigned-off-by: Ingo Molnar List of files: /linux/drivers/video/logo/Makefile

c95baf12f5077419db01313ab61c2aac007d40cd - Merge drm-intel-next-queued into gvt-next

Thu, 20 Feb 2020 09:23:37 +0100

Merge drm-intel-next-queued into gvt-nextBackmerge to pull inhttps://patchwork.freedesktop.org/patch/353621/?series=73544&rev=1Signed-off-by: Zhenyu Wang List of files: /linux/drivers/video/logo/Makefile

28f2aff1caa4997f58ca31179cad1b4a84a62827 - Merge v5.6-rc2 into drm-misc-next

Mon, 17 Feb 2020 10:34:34 +0100

Merge v5.6-rc2 into drm-misc-nextLyude needs some patches in 5.6-rc2 and we didn't bring drm-misc-nextforward yet, so it looks like a good occasion.Signed-off-by: Maxime Ripard List of files: /linux/drivers/video/logo/Makefile

28336be568bb473d16ba80db0801276fb4f1bbe5 - Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflicts

Mon, 30 Dec 2019 08:10:51 +0100

Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflictsConflicts: init/main.c lib/Kconfig.debugSigned-off-by: Ingo Molnar List of files: /linux/drivers/video/logo/Makefile

74c12ee02af109adcde36ec184fa59c0afb0edaa - Merge v5.6-rc1 into drm-misc-fixes

Wed, 12 Feb 2020 14:08:59 +0100

Merge v5.6-rc1 into drm-misc-fixesWe're based on v5.6, need v5.6-rc1 at least. :)Signed-off-by: Maarten Lankhorst List of files: /linux/drivers/video/logo/Makefile

1b32b72b27341cafe5f1c8e3ebd26387a8faf664 - Merge tag 'v5.6-rc1' into arm/fixes

Tue, 11 Feb 2020 23:48:22 +0100

Merge tag 'v5.6-rc1' into arm/fixesLinux 5.6-rc1Merging in to avoid fixes pull request diffstats being noisy due tobeing based on -rc1.Signed-off-by: Olof Johansson List of files: /linux/drivers/video/logo/Makefile

89a47dd1af8fdda667938ec190d9595d55d7ec6f - Merge tag 'kbuild-v5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Mon, 10 Feb 2020 01:05:50 +0100

Merge tag 'kbuild-v5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuildPull more Kbuild updates from Masahiro Yamada: - fix randconfig to generate a sane .config - rename hostprogs-y / always to hostprogs / always-y, which are more natual syntax. - optimize scripts/kallsyms - fix yes2modconfig and mod2yesconfig - make multiple directory targets ('make foo/ bar/') work* tag 'kbuild-v5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: kbuild: make multiple directory targets work kconfig: Invalidate all symbols after changing to y or m. kallsyms: fix type of kallsyms_token_table[] scripts/kallsyms: change table to store (strcut sym_entry *) scripts/kallsyms: rename local variables in read_symbol() kbuild: rename hostprogs-y/always to hostprogs/always-y kbuild: fix the document to use extra-y for vmlinux.lds kconfig: fix broken dependency in randconfig-generated .config List of files: /linux/drivers/video/logo/Makefile