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 01d61d15493fe7ff4ed8198dd8abdf57b97eefc6 (commit) via 4d4f36ef55f31acff042029a00e7d09fac94df03 (commit) from 83490805a4777090cf62be5b18ff0dd7abdc29c4 (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 01d61d15493fe7ff4ed8198dd8abdf57b97eefc6 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Sep 20 13:03:34 2015 +0200
network_functions.pl: fix ip_address_in_network for x86_64
calculation of last address must use only 32bit of inverted netmask.
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 4d4f36ef55f31acff042029a00e7d09fac94df03 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Sep 20 12:46:12 2015 +0200
kernel: Update pcengines apu led patch for x86_64
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/cfgroot/network-functions.pl | 5 ++- config/kernel/kernel.config.x86_64-ipfire | 35 ++----------------- lfs/linux | 2 +- ...10-apu_leds.patch => linux-3.14-apu_leds.patch} | 40 +++++++++++++--------- 4 files changed, 31 insertions(+), 51 deletions(-) rename src/patches/{linux-3.10-apu_leds.patch => linux-3.14-apu_leds.patch} (80%)
Difference in files: diff --git a/config/cfgroot/network-functions.pl b/config/cfgroot/network-functions.pl index 9dd752d..cb4ca3d 100644 --- a/config/cfgroot/network-functions.pl +++ b/config/cfgroot/network-functions.pl @@ -256,7 +256,7 @@ sub ip_address_in_network($$) { my ($network_bin, $netmask_bin) = &network2bin($network);
# Find end address - my $broadcast_bin = $network_bin ^ ~$netmask_bin; + my $broadcast_bin = $network_bin ^ (~$netmask_bin % 2 ** 32);
return (($address_bin ge $network_bin) && ($address_bin le $broadcast_bin)); } @@ -342,6 +342,9 @@ sub testsuite() { $result = &ip_address_in_network("10.0.1.4", "10.0.0.0/8"); assert($result);
+ $result = &ip_address_in_network("192.168.30.11", "192.168.30.0/255.255.255.0"); + assert($result); + return 0; }
diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index db38aae..902b9e1 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 f2a5391..b603b48 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.10-apu_leds.patch deleted file mode 100644 index 53d389a..0000000 --- a/src/patches/linux-3.10-apu_leds.patch +++ /dev/null @@ -1,215 +0,0 @@ -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 @@ - - AC adapter status updates - - Battery status updates - -+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 -@@ -0,0 +1,181 @@ -+/* -+ * LEDs driver for PCEngines apu -+ * -+ * Copyright (C) 2013 Christian Herzog daduke@daduke.org, based on -+ * Petr Leibman's leds-alix -+ * Hardware presence check added by Arne Fitzenreiter arne_f@ipfire.org -+ * Based on leds-wrap.c -+ * Hardware info taken from http://www.dpie.com/manuals/miniboards/kontron/KTD-S0043-0_KTA55_SoftwareGui... -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/module.h> -+#include <linux/init.h> -+#include <linux/platform_device.h> -+#include <linux/leds.h> -+#include <linux/err.h> -+#include <asm/io.h> -+#include <linux/dmi.h> -+ -+#define DRVNAME "apu-led" -+#define BASEADDR (0xFED801BD) -+#define LEDON (0x8) -+#define LEDOFF (0xC8) -+ -+static struct platform_device *pdev; -+unsigned int *p1; -+unsigned int *p2; -+unsigned int *p3; -+ -+static void apu_led_set_1(struct led_classdev *led_cdev, -+ enum led_brightness value) { -+ if (value) -+ iowrite8(LEDON, p1); -+ else -+ iowrite8(LEDOFF, p1); -+} -+ -+static void apu_led_set_2(struct led_classdev *led_cdev, -+ enum led_brightness value) { -+ if (value) -+ iowrite8(LEDON, p2); -+ else -+ iowrite8(LEDOFF, p2); -+} -+ -+static void apu_led_set_3(struct led_classdev *led_cdev, -+ enum led_brightness value) { -+ if (value) -+ iowrite8(LEDON, p3); -+ else -+ iowrite8(LEDOFF, p3); -+} -+ -+static struct led_classdev apu_led_1 = { -+ .name = "apu:1", -+ .brightness_set = apu_led_set_1, -+}; -+ -+static struct led_classdev apu_led_2 = { -+ .name = "apu:2", -+ .brightness_set = apu_led_set_2, -+}; -+ -+static struct led_classdev apu_led_3 = { -+ .name = "apu:3", -+ .brightness_set = apu_led_set_3, -+}; -+ -+ -+#ifdef CONFIG_PM -+static int apu_led_suspend(struct platform_device *dev, -+ pm_message_t state) -+{ -+ led_classdev_suspend(&apu_led_1); -+ led_classdev_suspend(&apu_led_2); -+ led_classdev_suspend(&apu_led_3); -+ return 0; -+} -+ -+static int apu_led_resume(struct platform_device *dev) -+{ -+ led_classdev_resume(&apu_led_1); -+ led_classdev_resume(&apu_led_2); -+ led_classdev_resume(&apu_led_3); -+ return 0; -+} -+#else -+#define apu_led_suspend NULL -+#define apu_led_resume NULL -+#endif -+ -+static int apu_led_probe(struct platform_device *pdev) -+{ -+ int ret; -+ -+ ret = led_classdev_register(&pdev->dev, &apu_led_1); -+ if (ret == 0) -+ { -+ ret = led_classdev_register(&pdev->dev, &apu_led_2); -+ if (ret >= 0) -+ { -+ ret = led_classdev_register(&pdev->dev, &apu_led_3); -+ if (ret < 0) -+ led_classdev_unregister(&apu_led_2); -+ } -+ if (ret < 0) -+ led_classdev_unregister(&apu_led_1); -+ } -+ return ret; -+} -+ -+static int apu_led_remove(struct platform_device *pdev) -+{ -+ led_classdev_unregister(&apu_led_1); -+ led_classdev_unregister(&apu_led_2); -+ led_classdev_unregister(&apu_led_3); -+ return 0; -+} -+ -+static struct platform_driver apu_led_driver = { -+ .probe = apu_led_probe, -+ .remove = apu_led_remove, -+ .suspend = apu_led_suspend, -+ .resume = apu_led_resume, -+ .driver = { -+ .name = DRVNAME, -+ .owner = THIS_MODULE, -+ }, -+}; -+ -+static int __init apu_led_init(void) -+{ -+ int ret=0; -+ const char *vendor, *product; -+ -+ vendor = dmi_get_system_info(DMI_SYS_VENDOR); -+ if (!vendor || strcmp(vendor, "PC Engines")) -+ goto out; -+ -+ product = dmi_get_system_info(DMI_PRODUCT_NAME); -+ if (!product || strcmp(product, "APU")) -+ goto out; -+ -+ printk(KERN_INFO "%s: system is recognized as "%s %s"\n", -+ KBUILD_MODNAME, vendor, product); -+ -+ ret = platform_driver_register(&apu_led_driver); -+ if (ret < 0) -+ goto out; -+ -+ pdev = platform_device_register_simple(DRVNAME, -1, NULL, 0); -+ if (IS_ERR(pdev)) { -+ ret = PTR_ERR(pdev); -+ platform_driver_unregister(&apu_led_driver); -+ goto out; -+ } -+ -+ p1 = ioremap(BASEADDR, 1); -+ p2 = ioremap(BASEADDR+1, 1); -+ p3 = ioremap(BASEADDR+2, 1); -+ -+out: -+ return ret; -+} -+ -+static void __exit apu_led_exit(void) -+{ -+ platform_device_unregister(pdev); -+ platform_driver_unregister(&apu_led_driver); -+} -+ -+module_init(apu_led_init); -+module_exit(apu_led_exit); -+ -+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 -@@ -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 -@@ -1,4 +1,5 @@ - # Platform specific code goes here -+obj-y += apu/ - obj-y += ce4100/ - obj-y += efi/ - obj-y += geode/ diff --git a/src/patches/linux-3.14-apu_leds.patch b/src/patches/linux-3.14-apu_leds.patch new file mode 100644 index 0000000..13d7c76 --- /dev/null +++ b/src/patches/linux-3.14-apu_leds.patch @@ -0,0 +1,223 @@ +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 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 ++ * ++ * Copyright (C) 2013 Christian Herzog daduke@daduke.org, based on ++ * Petr Leibman's leds-alix ++ * Hardware presence check added by Arne Fitzenreiter arne_f@ipfire.org ++ * Based on leds-wrap.c ++ * Hardware info taken from http://www.dpie.com/manuals/miniboards/kontron/KTD-S0043-0_KTA55_SoftwareGui... ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include <linux/kernel.h> ++#include <linux/module.h> ++#include <linux/init.h> ++#include <linux/platform_device.h> ++#include <linux/leds.h> ++#include <linux/err.h> ++#include <asm/io.h> ++#include <linux/dmi.h> ++ ++#define DRVNAME "apu-led" ++#define BASEADDR (0xFED801BD) ++#define LEDON (0x8) ++#define LEDOFF (0xC8) ++ ++static struct platform_device *pdev; ++unsigned int *p1; ++unsigned int *p2; ++unsigned int *p3; ++ ++static void apu_led_set_1(struct led_classdev *led_cdev, ++ enum led_brightness value) { ++ if (value) ++ iowrite8(LEDON, p1); ++ else ++ iowrite8(LEDOFF, p1); ++} ++ ++static void apu_led_set_2(struct led_classdev *led_cdev, ++ enum led_brightness value) { ++ if (value) ++ iowrite8(LEDON, p2); ++ else ++ iowrite8(LEDOFF, p2); ++} ++ ++static void apu_led_set_3(struct led_classdev *led_cdev, ++ enum led_brightness value) { ++ if (value) ++ iowrite8(LEDON, p3); ++ else ++ iowrite8(LEDOFF, p3); ++} ++ ++static struct led_classdev apu_led_1 = { ++ .name = "apu:1", ++ .brightness_set = apu_led_set_1, ++}; ++ ++static struct led_classdev apu_led_2 = { ++ .name = "apu:2", ++ .brightness_set = apu_led_set_2, ++}; ++ ++static struct led_classdev apu_led_3 = { ++ .name = "apu:3", ++ .brightness_set = apu_led_set_3, ++}; ++ ++ ++#ifdef CONFIG_PM ++static int apu_led_suspend(struct platform_device *dev, ++ pm_message_t state) ++{ ++ led_classdev_suspend(&apu_led_1); ++ led_classdev_suspend(&apu_led_2); ++ led_classdev_suspend(&apu_led_3); ++ return 0; ++} ++ ++static int apu_led_resume(struct platform_device *dev) ++{ ++ led_classdev_resume(&apu_led_1); ++ led_classdev_resume(&apu_led_2); ++ led_classdev_resume(&apu_led_3); ++ return 0; ++} ++#else ++#define apu_led_suspend NULL ++#define apu_led_resume NULL ++#endif ++ ++static int apu_led_probe(struct platform_device *pdev) ++{ ++ int ret; ++ ++ ret = led_classdev_register(&pdev->dev, &apu_led_1); ++ if (ret == 0) ++ { ++ ret = led_classdev_register(&pdev->dev, &apu_led_2); ++ if (ret >= 0) ++ { ++ ret = led_classdev_register(&pdev->dev, &apu_led_3); ++ if (ret < 0) ++ led_classdev_unregister(&apu_led_2); ++ } ++ if (ret < 0) ++ led_classdev_unregister(&apu_led_1); ++ } ++ return ret; ++} ++ ++static int apu_led_remove(struct platform_device *pdev) ++{ ++ led_classdev_unregister(&apu_led_1); ++ led_classdev_unregister(&apu_led_2); ++ led_classdev_unregister(&apu_led_3); ++ return 0; ++} ++ ++static struct platform_driver apu_led_driver = { ++ .probe = apu_led_probe, ++ .remove = apu_led_remove, ++ .suspend = apu_led_suspend, ++ .resume = apu_led_resume, ++ .driver = { ++ .name = DRVNAME, ++ .owner = THIS_MODULE, ++ }, ++}; ++ ++static int __init apu_led_init(void) ++{ ++ int ret=0; ++ const char *vendor, *product; ++ ++ vendor = dmi_get_system_info(DMI_SYS_VENDOR); ++ if (!vendor || strcmp(vendor, "PC Engines")) ++ goto out; ++ ++ product = dmi_get_system_info(DMI_PRODUCT_NAME); ++ if (!product || strcmp(product, "APU")) ++ goto out; ++ ++ printk(KERN_INFO "%s: system is recognized as "%s %s"\n", ++ KBUILD_MODNAME, vendor, product); ++ ++ ret = platform_driver_register(&apu_led_driver); ++ if (ret < 0) ++ goto out; ++ ++ pdev = platform_device_register_simple(DRVNAME, -1, NULL, 0); ++ if (IS_ERR(pdev)) { ++ ret = PTR_ERR(pdev); ++ platform_driver_unregister(&apu_led_driver); ++ goto out; ++ } ++ ++ p1 = ioremap(BASEADDR, 1); ++ p2 = ioremap(BASEADDR+1, 1); ++ p3 = ioremap(BASEADDR+2, 1); ++ ++out: ++ return ret; ++} ++ ++static void __exit apu_led_exit(void) ++{ ++ platform_device_unregister(pdev); ++ platform_driver_unregister(&apu_led_driver); ++} ++ ++module_init(apu_led_init); ++module_exit(apu_led_exit); ++ ++MODULE_AUTHOR("Christian Herzog"); ++MODULE_DESCRIPTION("PCEngines apu LED driver"); ++MODULE_LICENSE("GPL"); +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.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/ + obj-y += ce4100/ + obj-y += efi/ + obj-y += geode/
hooks/post-receive -- IPFire 2.x development tree