[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-247-g3e1a7125d
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-247-g3e1a7125d
|
From: Sébastien S. <ss...@us...> - 2021-04-19 09:58:53
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 3e1a7125d86efa00825efac160d3a3e2c84fcf8d (commit)
from b61898a9e9028e5f65f4338bbf9bf325ad069051 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3e1a7125d86efa00825efac160d3a3e2c84fcf8d
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Apr 19 11:55:05 2021 +0200
[LINUX] 4.19: add Armadeus tux logo
-----------------------------------------------------------------------
Summary of changes:
...15-armadeus-logo-add_armadeus-project_tux.patch | 70 +++++++++++-----------
1 file changed, 35 insertions(+), 35 deletions(-)
copy patches/linux/{4.1.mx6_legacy => 4.19}/0015-armadeus-logo-add_armadeus-project_tux.patch (97%)
diff --git a/patches/linux/4.1.mx6_legacy/0015-armadeus-logo-add_armadeus-project_tux.patch b/patches/linux/4.19/0015-armadeus-logo-add_armadeus-project_tux.patch
similarity index 97%
copy from patches/linux/4.1.mx6_legacy/0015-armadeus-logo-add_armadeus-project_tux.patch
copy to patches/linux/4.19/0015-armadeus-logo-add_armadeus-project_tux.patch
index e83516c8f..59d595a21 100644
--- a/patches/linux/4.1.mx6_legacy/0015-armadeus-logo-add_armadeus-project_tux.patch
+++ b/patches/linux/4.19/0015-armadeus-logo-add_armadeus-project_tux.patch
@@ -1,11 +1,11 @@
-Index: linux-imx_3.14.52_1.1.0_ga/drivers/video/logo/Kconfig
+Index: linux-4.19.188/drivers/video/logo/Kconfig
===================================================================
---- linux-imx_3.14.52_1.1.0_ga.orig/drivers/video/logo/Kconfig
-+++ linux-imx_3.14.52_1.1.0_ga/drivers/video/logo/Kconfig
-@@ -82,4 +82,11 @@ config LOGO_M32R_CLUT224
- depends on M32R
- default y
-
+--- linux-4.19.188.orig/drivers/video/logo/Kconfig
++++ linux-4.19.188/drivers/video/logo/Kconfig
+@@ -67,4 +67,11 @@ config LOGO_SUPERH_CLUT224
+ depends on SUPERH
+ default y
+
+config LOGO_ARMADEUS_CLUT224
+ bool "224-color Armadeus Linux logo"
+ depends on ARM
@@ -14,49 +14,49 @@ Index: linux-imx_3.14.52_1.1.0_ga/drivers/video/logo/Kconfig
+ Choose this if you want to have the Armadeus Tux as boot logo
+
endif # LOGO
-Index: linux-imx_3.14.52_1.1.0_ga/drivers/video/logo/logo.c
+Index: linux-4.19.188/drivers/video/logo/logo.c
===================================================================
---- linux-imx_3.14.52_1.1.0_ga.orig/drivers/video/logo/logo.c
-+++ linux-imx_3.14.52_1.1.0_ga/drivers/video/logo/logo.c
-@@ -111,6 +111,10 @@ const struct linux_logo * __init_refok f
- /* M32R Linux logo */
- logo = &logo_m32r_clut224;
+--- linux-4.19.188.orig/drivers/video/logo/logo.c
++++ linux-4.19.188/drivers/video/logo/logo.c
+@@ -99,6 +99,10 @@ const struct linux_logo * __ref fb_find_
+ /* SuperH Linux logo */
+ logo = &logo_superh_clut224;
#endif
+#ifdef CONFIG_LOGO_ARMADEUS_CLUT224
+ /* Armadeus Linux logo */
+ logo = &logo_armadeus_clut224;
+#endif
- }
- return logo;
+ }
+ return logo;
}
-Index: linux-imx_3.14.52_1.1.0_ga/include/linux/linux_logo.h
+Index: linux-4.19.188/include/linux/linux_logo.h
===================================================================
---- linux-imx_3.14.52_1.1.0_ga.orig/include/linux/linux_logo.h
-+++ linux-imx_3.14.52_1.1.0_ga/include/linux/linux_logo.h
-@@ -35,6 +35,7 @@ struct linux_logo {
+--- linux-4.19.188.orig/include/linux/linux_logo.h
++++ linux-4.19.188/include/linux/linux_logo.h
+@@ -33,6 +33,7 @@ struct linux_logo {
+ const unsigned char *data;
+ };
+
++extern const struct linux_logo logo_armadeus_clut224;
extern const struct linux_logo logo_linux_mono;
extern const struct linux_logo logo_linux_vga16;
extern const struct linux_logo logo_linux_clut224;
-+extern const struct linux_logo logo_armadeus_clut224;
- extern const struct linux_logo logo_blackfin_vga16;
- extern const struct linux_logo logo_blackfin_clut224;
- extern const struct linux_logo logo_dec_clut224;
-Index: linux-imx_3.14.52_1.1.0_ga/drivers/video/logo/Makefile
+Index: linux-4.19.188/drivers/video/logo/Makefile
===================================================================
---- linux-imx_3.14.52_1.1.0_ga.orig/drivers/video/logo/Makefile
-+++ linux-imx_3.14.52_1.1.0_ga/drivers/video/logo/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_LOGO_SUPERH_MONO) += logo_
- obj-$(CONFIG_LOGO_SUPERH_VGA16) += logo_superh_vga16.o
- obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o
- obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o
+--- linux-4.19.188.orig/drivers/video/logo/Makefile
++++ linux-4.19.188/drivers/video/logo/Makefile
+@@ -2,6 +2,7 @@
+ # Makefile for the Linux logos
+
+ obj-$(CONFIG_LOGO) += logo.o
+obj-$(CONFIG_LOGO_ARMADEUS_CLUT224) += logo_armadeus_clut224.o
-
- obj-$(CONFIG_SPU_BASE) += logo_spe_clut224.o
-
-Index: linux-imx_3.14.52_1.1.0_ga/drivers/video/logo/logo_armadeus_clut224.ppm
+ obj-$(CONFIG_LOGO_LINUX_MONO) += logo_linux_mono.o
+ obj-$(CONFIG_LOGO_LINUX_VGA16) += logo_linux_vga16.o
+ obj-$(CONFIG_LOGO_LINUX_CLUT224) += logo_linux_clut224.o
+Index: linux-4.19.188/drivers/video/logo/logo_armadeus_clut224.ppm
===================================================================
--- /dev/null
-+++ linux-imx_3.14.52_1.1.0_ga/drivers/video/logo/logo_armadeus_clut224.ppm
++++ linux-4.19.188/drivers/video/logo/logo_armadeus_clut224.ppm
@@ -0,0 +1,19205 @@
+P3
+# CREATOR: The GIMP's PNM Filter Version 1.0
hooks/post-receive
--
armadeus
|