From 4d4f36ef55f31acff042029a00e7d09fac94df03 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 20 Sep 2015 12:46:12 +0200 Subject: [PATCH] kernel: Update pcengines apu led patch for x86_64 Signed-off-by: Arne Fitzenreiter --- config/kernel/kernel.config.x86_64-ipfire | 35 +--------------- lfs/linux | 2 +- ...u_leds.patch => linux-3.14-apu_leds.patch} | 40 +++++++++++-------- 3 files changed, 27 insertions(+), 50 deletions(-) rename src/patches/{linux-3.10-apu_leds.patch => linux-3.14-apu_leds.patch} (80%) diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index db38aae8f3..902b9e1149 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.43-ipfire Kernel Configuration +# Linux/x86 3.14.43 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -359,28 +359,7 @@ CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_PARAVIRT_CLOCK=y CONFIG_NO_BOOTMEM=y # CONFIG_MEMTEST is not set -# CONFIG_M486 is not set -# CONFIG_M586 is not set -# CONFIG_M586TSC is not set -# CONFIG_M586MMX is not set -# CONFIG_M686 is not set -# CONFIG_MPENTIUMII is not set -# CONFIG_MPENTIUMIII is not set -# CONFIG_MPENTIUMM is not set -# CONFIG_MPENTIUM4 is not set -# CONFIG_MK6 is not set -# CONFIG_MK7 is not set # CONFIG_MK8 is not set -# CONFIG_MCRUSOE is not set -# CONFIG_MEFFICEON is not set -# CONFIG_MWINCHIPC6 is not set -# CONFIG_MWINCHIP3D is not set -# CONFIG_MELAN is not set -# CONFIG_MGEODEGX1 is not set -# CONFIG_MGEODE_LX is not set -# CONFIG_MCYRIXIII is not set -# CONFIG_MVIAC3_2 is not set -# CONFIG_MVIAC7 is not set # CONFIG_MPSC is not set # CONFIG_MCORE2 is not set # CONFIG_MATOM is not set @@ -429,12 +408,6 @@ CONFIG_MICROCODE_OLD_INTERFACE=y # CONFIG_MICROCODE_AMD_EARLY is not set # CONFIG_X86_MSR is not set CONFIG_X86_CPUID=y -# CONFIG_NOHIGHMEM is not set -# CONFIG_HIGHMEM4G is not set -# CONFIG_HIGHMEM64G is not set -# CONFIG_VMSPLIT_3G is not set -# CONFIG_VMSPLIT_2G is not set -# CONFIG_VMSPLIT_1G is not set CONFIG_ARCH_PHYS_ADDR_T_64BIT=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_DIRECT_GBPAGES=y @@ -444,7 +417,6 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 CONFIG_SELECT_MEMORY_MODEL=y -# CONFIG_FLATMEM_MANUAL is not set CONFIG_SPARSEMEM_MANUAL=y CONFIG_SPARSEMEM=y CONFIG_HAVE_MEMORY_PRESENT=y @@ -618,10 +590,6 @@ CONFIG_INTEL_IDLE=y # Bus options (PCI etc.) # CONFIG_PCI=y -# CONFIG_PCI_GOBIOS is not set -# CONFIG_PCI_GOMMCONFIG is not set -# CONFIG_PCI_GODIRECT is not set -# CONFIG_PCI_GOANY is not set CONFIG_PCI_DIRECT=y # CONFIG_PCI_MMCONFIG is not set CONFIG_PCI_XEN=y @@ -655,6 +623,7 @@ CONFIG_PCI_LABEL=y # PCI host controller drivers # CONFIG_ISA_DMA_API=y +CONFIG_APULED=y CONFIG_AMD_NB=y CONFIG_PCCARD=m CONFIG_PCMCIA=m diff --git a/lfs/linux b/lfs/linux index f2a53919c4..b603b48f23 100644 --- a/lfs/linux +++ b/lfs/linux @@ -158,7 +158,7 @@ endif cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.30_cs5535audio_fix_logspam_on_geos.patch # Add PC Engines APU led support - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10-apu_leds.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14-apu_leds.patch # Fix uevent PHYSDEVDRIVER cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.33_ipg-fix-driver-name.patch diff --git a/src/patches/linux-3.10-apu_leds.patch b/src/patches/linux-3.14-apu_leds.patch similarity index 80% rename from src/patches/linux-3.10-apu_leds.patch rename to src/patches/linux-3.14-apu_leds.patch index 53d389af1a..13d7c76101 100644 --- a/src/patches/linux-3.10-apu_leds.patch +++ b/src/patches/linux-3.14-apu_leds.patch @@ -1,22 +1,30 @@ -diff -Naur linux-3.10.33.org/arch/x86/Kconfig linux-3.10.33/arch/x86/Kconfig ---- linux-3.10.33.org/arch/x86/Kconfig 2014-03-07 06:58:45.000000000 +0100 -+++ linux-3.10.33/arch/x86/Kconfig 2014-03-17 17:02:46.703135023 +0100 -@@ -2199,6 +2199,12 @@ +diff -Naur linux-3.14.43.org/arch/x86/Kconfig linux-3.14.43/arch/x86/Kconfig +--- linux-3.14.43.org/arch/x86/Kconfig 2015-05-17 18:54:01.000000000 +0200 ++++ linux-3.14.43/arch/x86/Kconfig 2015-09-19 20:14:52.436654988 +0200 +@@ -2287,6 +2287,7 @@ - AC adapter status updates - Battery status updates ++ + config ALIX + bool "PCEngines ALIX System Support (LED setup)" + select GPIOLIB +@@ -2325,6 +2326,12 @@ + + endif # X86_32 + +config APULED + bool "PCEngines APU Led Support" + depends on DMI + ---help--- + This option enables system support for the PCEngines APU. + - config ALIX - bool "PCEngines ALIX System Support (LED setup)" - select GPIOLIB -diff -Naur linux-3.10.33.org/arch/x86/platform/apu/apu-led.c linux-3.10.33/arch/x86/platform/apu/apu-led.c ---- linux-3.10.33.org/arch/x86/platform/apu/apu-led.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.33/arch/x86/platform/apu/apu-led.c 2014-03-17 17:00:36.187188456 +0100 + config AMD_NB + def_bool y + depends on CPU_SUP_AMD && PCI +diff -Naur linux-3.14.43.org/arch/x86/platform/apu/apu-led.c linux-3.14.43/arch/x86/platform/apu/apu-led.c +--- linux-3.14.43.org/arch/x86/platform/apu/apu-led.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.14.43/arch/x86/platform/apu/apu-led.c 2015-09-19 20:12:20.520647636 +0200 @@ -0,0 +1,181 @@ +/* + * LEDs driver for PCEngines apu @@ -199,14 +207,14 @@ diff -Naur linux-3.10.33.org/arch/x86/platform/apu/apu-led.c linux-3.10.33/arch/ +MODULE_AUTHOR("Christian Herzog"); +MODULE_DESCRIPTION("PCEngines apu LED driver"); +MODULE_LICENSE("GPL"); -diff -Naur linux-3.10.33.org/arch/x86/platform/apu/Makefile linux-3.10.33/arch/x86/platform/apu/Makefile ---- linux-3.10.33.org/arch/x86/platform/apu/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ linux-3.10.33/arch/x86/platform/apu/Makefile 2014-03-17 17:05:19.245651480 +0100 +diff -Naur linux-3.14.43.org/arch/x86/platform/apu/Makefile linux-3.14.43/arch/x86/platform/apu/Makefile +--- linux-3.14.43.org/arch/x86/platform/apu/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-3.14.43/arch/x86/platform/apu/Makefile 2015-09-19 20:12:20.520647636 +0200 @@ -0,0 +1 @@ +obj-$(CONFIG_APULED) += apu-led.o -diff -Naur linux-3.10.33.org/arch/x86/platform/Makefile linux-3.10.33/arch/x86/platform/Makefile ---- linux-3.10.33.org/arch/x86/platform/Makefile 2014-03-07 06:58:45.000000000 +0100 -+++ linux-3.10.33/arch/x86/platform/Makefile 2014-03-17 14:53:15.078571307 +0100 +diff -Naur linux-3.14.43.org/arch/x86/platform/Makefile linux-3.14.43/arch/x86/platform/Makefile +--- linux-3.14.43.org/arch/x86/platform/Makefile 2015-05-17 18:54:01.000000000 +0200 ++++ linux-3.14.43/arch/x86/platform/Makefile 2015-09-19 20:12:20.520647636 +0200 @@ -1,4 +1,5 @@ # Platform specific code goes here +obj-y += apu/ -- 2.39.2