Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi
index 7a194a4a9d9a34c6c3a49630161d7a4cac62db82..7a1018c4c2502bf9ec5464393ce528e93bd944ec 100644 (file)
--- a/config/kernel/kernel.config.armv5tel-ipfire-multi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-multi
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.38 Kernel Configuration
+# Linux/arm 4.14.40 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -3040,6 +3040,7 @@ CONFIG_INPUT_YEALINK=m
 CONFIG_INPUT_CM109=m
 # CONFIG_INPUT_REGULATOR_HAPTIC is not set
 CONFIG_INPUT_RETU_PWRBUTTON=m
+CONFIG_INPUT_AXP20X_PEK=m
 CONFIG_INPUT_TWL4030_PWRBUTTON=m
 CONFIG_INPUT_TWL4030_VIBRA=m
 CONFIG_INPUT_TWL6040_VIBRA=m
@@ -3398,6 +3399,7 @@ CONFIG_GPIO_GENERIC=y
 #
 # CONFIG_GPIO_74XX_MMIO is not set
 # CONFIG_GPIO_ALTERA is not set
+CONFIG_GPIO_AXP209=y
 # CONFIG_GPIO_DWAPB is not set
 # CONFIG_GPIO_EXAR is not set
 # CONFIG_GPIO_FTGPIO010 is not set
@@ -3510,6 +3512,10 @@ CONFIG_BATTERY_88PM860X=m
 # CONFIG_BATTERY_SBS is not set
 # CONFIG_CHARGER_SBS is not set
 # CONFIG_BATTERY_BQ27XXX is not set
+CONFIG_CHARGER_AXP20X=m
+CONFIG_BATTERY_AXP20X=m
+CONFIG_AXP20X_POWER=m
+# CONFIG_AXP288_FUEL_GAUGE is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_MAX1721X is not set
@@ -3815,7 +3821,8 @@ CONFIG_MFD_SUN4I_GPADC=y
 # CONFIG_MFD_BCM590XX is not set
 # CONFIG_MFD_BD9571MWV is not set
 # CONFIG_MFD_AC100 is not set
-# CONFIG_MFD_AXP20X_I2C is not set
+CONFIG_MFD_AXP20X=y
+CONFIG_MFD_AXP20X_I2C=y
 # CONFIG_MFD_AXP20X_RSB is not set
 # CONFIG_MFD_CROS_EC is not set
 # CONFIG_MFD_ASIC3 is not set
@@ -3918,6 +3925,7 @@ CONFIG_REGULATOR_88PM8607=y
 # CONFIG_REGULATOR_ACT8865 is not set
 # CONFIG_REGULATOR_AD5398 is not set
 CONFIG_REGULATOR_ANATOP=y
+CONFIG_REGULATOR_AXP20X=m
 # CONFIG_REGULATOR_DA9210 is not set
 # CONFIG_REGULATOR_DA9211 is not set
 # CONFIG_REGULATOR_FAN53555 is not set
@@ -6164,6 +6172,7 @@ CONFIG_EXTCON=y
 # Extcon Device Drivers
 #
 # CONFIG_EXTCON_ADC_JACK is not set
+# CONFIG_EXTCON_AXP288 is not set
 # CONFIG_EXTCON_GPIO is not set
 # CONFIG_EXTCON_MAX3355 is not set
 # CONFIG_EXTCON_RT8973A is not set
@@ -6216,6 +6225,8 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 #
 # CONFIG_AD7291 is not set
 # CONFIG_AD799X is not set
+CONFIG_AXP20X_ADC=m
+# CONFIG_AXP288_ADC is not set
 # CONFIG_BERLIN2_ADC is not set
 # CONFIG_CC10001_ADC is not set
 # CONFIG_ENVELOPE_DETECTOR is not set

diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi
index e303eeb34f79a46da35c2b95f567e88629de8bd1..1b6139c6bbf4d30349095f9f2e3c71d6b994b068 100644 (file)
--- a/config/rootfiles/common/armv5tel/linux-multi
+++ b/config/rootfiles/common/armv5tel/linux-multi
@@ -898,6 +898,7 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/i2c/muxes/i2c-mux-reg.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/iio
 #lib/modules/KVER-ipfire-multi/kernel/drivers/iio/adc
+#lib/modules/KVER-ipfire-multi/kernel/drivers/iio/adc/axp20x_adc.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/iio/adc/meson_saradc.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/iio/adc/sun4i-gpadc-iio.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/iio/adc/twl4030-madc.ko
@@ -921,6 +922,7 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/matrix-keymap.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/misc
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/misc/ati_remote2.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/input/misc/axp20x-pek.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/misc/cm109.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/misc/gpio-beeper.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/input/misc/keyspan_remote.ko
@@ -2159,6 +2161,9 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/power/supply
 #lib/modules/KVER-ipfire-multi/kernel/drivers/power/supply/88pm860x_battery.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/power/supply/88pm860x_charger.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/power/supply/axp20x_ac_power.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/power/supply/axp20x_battery.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/power/supply/axp20x_usb_power.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/power/supply/generic-adc-battery.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/power/supply/twl4030_charger.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/power/supply/twl4030_madc_battery.ko
@@ -2171,6 +2176,8 @@ lib/modules/KVER-ipfire-multi
 #lib/modules/KVER-ipfire-multi/kernel/drivers/pwm/pwm-sun4i.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/pwm/pwm-twl-led.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/pwm/pwm-twl.ko
+#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator
+#lib/modules/KVER-ipfire-multi/kernel/drivers/regulator/axp20x-regulator.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-88pm80x.ko
 #lib/modules/KVER-ipfire-multi/kernel/drivers/rtc/rtc-88pm860x.ko

diff --git a/config/rootfiles/packages/nagios_nrpe b/config/rootfiles/packages/nagios_nrpe
index 89f74c92d1cc513631393119582427309d534119..1da6c3bafcf21055918f4217f8367250cd98f72b 100644 (file)
--- a/config/rootfiles/packages/nagios_nrpe
+++ b/config/rootfiles/packages/nagios_nrpe
@@ -1,5 +1,6 @@
 etc/nagios
 etc/nagios/nrpe.cfg
+etc/rc.d/init.d/nrpe
 #root/.rnd
 #usr/bin/nrpe-uninstall
 usr/bin/nrpe

diff --git a/lfs/linux b/lfs/linux
index 76e847813142b5d154324b137e1a3300f99b1d99..5db41c434d0ccb39bd922dfe7ae99e9587e9a826 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -144,6 +144,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 ifeq "$(KCFG)" "-kirkwood"
 #      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.10-mv_cesa_disable_failing_hmac_sha1.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14.40-kirkwood-dtb.patch
 endif
 
 ifeq "$(KCFG)" "-multi"

diff --git a/src/patches/linux/linux-4.14.40-kirkwood-dtb.patch b/src/patches/linux/linux-4.14.40-kirkwood-dtb.patch
new file mode 100644 (file)
index 0000000..f3c8820
--- /dev/null
+++ b/src/patches/linux/linux-4.14.40-kirkwood-dtb.patch
@@ -0,0 +1,59 @@
+diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
+index 4a512d8..f550bba 100644
+--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
++++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
+@@ -5,7 +5,7 @@
+ #include "kirkwood-6281.dtsi"
+ 
+ / {
+-      model = "Iomega Iconnect";
++      model = "Iomega iConnect";
+       compatible = "iom,iconnect-1.1", "iom,iconnect", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+ 
+       memory {
+@@ -85,37 +85,37 @@
+               pinctrl-names = "default";
+ 
+               led-level {
+-                      label = "led_level";
++                      label = "iconnect::led_level";
+                       gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+                       default-state = "on";
+               };
+               power-blue {
+-                      label = "power:blue";
++                      label = "iconnect:blue:power";
+                       gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+                       default-state = "keep";
+               };
+               power-red {
+-                      label = "power:red";
++                      label = "iconnect:red:power";
+                       gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
+               };
+               usb1 {
+-                      label = "usb1:blue";
++                      label = "iconnect:blue:usb_1";
+                       gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;
+               };
+               usb2 {
+-                      label = "usb2:blue";
++                      label = "iconnect:blue:usb_2";
+                       gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+               };
+               usb3 {
+-                      label = "usb3:blue";
++                      label = "iconnect:blue:usb_3";
+                       gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
+               };
+               usb4 {
+-                      label = "usb4:blue";
++                      label = "iconnect:blue:usb_4";
+                       gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
+               };
+               otb {
+-                      label = "otb:blue";
++                      label = "iconnect:blue:otb";
+                       gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>;
+               };
+       };