From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6957b699b374b8053c8de66a0e61a489c982bb34
Date: Fri, 22 Feb 2019 17:28:47 +0000 [thread overview]
Message-ID: <20190222172847.BFA5584FDD4@people01.i.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 6967 bytes --]
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 "IPFire 2.x development tree".
The branch, next has been updated
via 6957b699b374b8053c8de66a0e61a489c982bb34 (commit)
via 710153a89cf95ed2cf0c1440969dc03f89758790 (commit)
from 4a25ada199d26bf5da93c05150c6d85b82efce74 (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 6957b699b374b8053c8de66a0e61a489c982bb34
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Feb 22 18:02:45 2019 +0100
kernel: apu leds: add more id's
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 710153a89cf95ed2cf0c1440969dc03f89758790
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Feb 22 18:01:18 2019 +0100
partresize: add "apu1" for apus with new bios.
-----------------------------------------------------------------------
Summary of changes:
src/initscripts/system/partresize | 2 +-
src/patches/linux/linux-4.14-apu_leds.patch | 42 ++++++++++++++++-------------
2 files changed, 24 insertions(+), 20 deletions(-)
Difference in files:
diff --git a/src/initscripts/system/partresize b/src/initscripts/system/partresize
index f3e3c0f0d..e2df11ee0 100644
--- a/src/initscripts/system/partresize
+++ b/src/initscripts/system/partresize
@@ -36,7 +36,7 @@ case "${1}" in
fi
IFS= read -r DMI_PRODUCT_NAME < /sys/class/dmi/id/product_name;
case ${DMI_PRODUCT_NAME} in
- APU|apu[2-4]|PC\ Engines\ apu[1-4] )
+ APU|apu[1-4]|PC\ Engines\ apu[1-4] )
scon="on";
;;
esac
diff --git a/src/patches/linux/linux-4.14-apu_leds.patch b/src/patches/linux/linux-4.14-apu_leds.patch
index dc63fd261..7013f6e6a 100644
--- a/src/patches/linux/linux-4.14-apu_leds.patch
+++ b/src/patches/linux/linux-4.14-apu_leds.patch
@@ -1,6 +1,6 @@
-diff -Naur linux-4.14.101.org/arch/x86/Kconfig linux-4.14.101/arch/x86/Kconfig
---- linux-4.14.101.org/arch/x86/Kconfig 2019-02-15 09:08:56.000000000 +0100
-+++ linux-4.14.101/arch/x86/Kconfig 2019-02-18 22:24:00.682722072 +0100
+diff -Naur linux-4.14.102.org/arch/x86/Kconfig linux-4.14.102/arch/x86/Kconfig
+--- linux-4.14.102.org/arch/x86/Kconfig 2019-02-20 10:20:56.000000000 +0100
++++ linux-4.14.102/arch/x86/Kconfig 2019-02-22 17:56:37.185202293 +0100
@@ -2715,6 +2715,7 @@
- AC adapter status updates
- Battery status updates
@@ -28,10 +28,10 @@ diff -Naur linux-4.14.101.org/arch/x86/Kconfig linux-4.14.101/arch/x86/Kconfig
config AMD_NB
def_bool y
depends on CPU_SUP_AMD && PCI
-diff -Naur linux-4.14.101.org/arch/x86/platform/apu/apu2-led.c linux-4.14.101/arch/x86/platform/apu/apu2-led.c
---- linux-4.14.101.org/arch/x86/platform/apu/apu2-led.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.14.101/arch/x86/platform/apu/apu2-led.c 2019-02-18 22:30:08.503059825 +0100
-@@ -0,0 +1,183 @@
+diff -Naur linux-4.14.102.org/arch/x86/platform/apu/apu2-led.c linux-4.14.102/arch/x86/platform/apu/apu2-led.c
+--- linux-4.14.102.org/arch/x86/platform/apu/apu2-led.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14.102/arch/x86/platform/apu/apu2-led.c 2019-02-22 17:58:52.795665744 +0100
+@@ -0,0 +1,185 @@
+/*
+ * LEDs driver for PCEngines apu2/3/4
+ *
@@ -178,7 +178,9 @@ diff -Naur linux-4.14.101.org/arch/x86/platform/apu/apu2-led.c linux-4.14.101/ar
+ if (!product || ( strcmp(product, "PC Engines apu2") &&
+ strcmp(product, "PC Engines apu3") &&
+ strcmp(product, "PC Engines apu4") &&
-+ strcmp(product, "apu2") ) ) // apu2 on early bios relases
++ strcmp(product, "apu2") &&
++ strcmp(product, "apu3") &&
++ strcmp(product, "apu4") ) )
+ goto out;
+
+ printk(KERN_INFO "%s: system is recognized as \"%s %s\"\n",
@@ -215,10 +217,10 @@ diff -Naur linux-4.14.101.org/arch/x86/platform/apu/apu2-led.c linux-4.14.101/ar
+MODULE_AUTHOR("Arne Fitzenreiter");
+MODULE_DESCRIPTION("PCEngines apu2/3/4 LED driver");
+MODULE_LICENSE("GPL");
-diff -Naur linux-4.14.101.org/arch/x86/platform/apu/apu-led.c linux-4.14.101/arch/x86/platform/apu/apu-led.c
---- linux-4.14.101.org/arch/x86/platform/apu/apu-led.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.14.101/arch/x86/platform/apu/apu-led.c 2019-02-18 22:24:00.686721439 +0100
-@@ -0,0 +1,181 @@
+diff -Naur linux-4.14.102.org/arch/x86/platform/apu/apu-led.c linux-4.14.102/arch/x86/platform/apu/apu-led.c
+--- linux-4.14.102.org/arch/x86/platform/apu/apu-led.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14.102/arch/x86/platform/apu/apu-led.c 2019-02-22 17:57:45.062504777 +0100
+@@ -0,0 +1,183 @@
+/*
+ * LEDs driver for PCEngines apu
+ *
@@ -363,7 +365,9 @@ diff -Naur linux-4.14.101.org/arch/x86/platform/apu/apu-led.c linux-4.14.101/arc
+ goto out;
+
+ product = dmi_get_system_info(DMI_PRODUCT_NAME);
-+ if (!product || strcmp(product, "APU"))
++ if (!product || ( strcmp(product, "APU") &&
++ strcmp(product, "apu1") &&
++ strcmp(product, "PC Engines apu1") ))
+ goto out;
+
+ printk(KERN_INFO "%s: system is recognized as \"%s %s\"\n",
@@ -400,15 +404,15 @@ diff -Naur linux-4.14.101.org/arch/x86/platform/apu/apu-led.c linux-4.14.101/arc
+MODULE_AUTHOR("Christian Herzog");
+MODULE_DESCRIPTION("PCEngines apu LED driver");
+MODULE_LICENSE("GPL");
-diff -Naur linux-4.14.101.org/arch/x86/platform/apu/Makefile linux-4.14.101/arch/x86/platform/apu/Makefile
---- linux-4.14.101.org/arch/x86/platform/apu/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.14.101/arch/x86/platform/apu/Makefile 2019-02-18 22:24:00.686721439 +0100
+diff -Naur linux-4.14.102.org/arch/x86/platform/apu/Makefile linux-4.14.102/arch/x86/platform/apu/Makefile
+--- linux-4.14.102.org/arch/x86/platform/apu/Makefile 1970-01-01 01:00:00.000000000 +0100
++++ linux-4.14.102/arch/x86/platform/apu/Makefile 2019-02-22 17:56:37.185202293 +0100
@@ -0,0 +1,2 @@
+obj-$(CONFIG_APULED) += apu-led.o
+obj-$(CONFIG_APU2LED) += apu2-led.o
-diff -Naur linux-4.14.101.org/arch/x86/platform/Makefile linux-4.14.101/arch/x86/platform/Makefile
---- linux-4.14.101.org/arch/x86/platform/Makefile 2019-02-15 09:08:56.000000000 +0100
-+++ linux-4.14.101/arch/x86/platform/Makefile 2019-02-18 22:24:00.686721439 +0100
+diff -Naur linux-4.14.102.org/arch/x86/platform/Makefile linux-4.14.102/arch/x86/platform/Makefile
+--- linux-4.14.102.org/arch/x86/platform/Makefile 2019-02-20 10:20:56.000000000 +0100
++++ linux-4.14.102/arch/x86/platform/Makefile 2019-02-22 17:56:37.185202293 +0100
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
# Platform specific code goes here
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2019-02-22 17:28 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190222172847.BFA5584FDD4@people01.i.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox