aboutsummaryrefslogtreecommitdiffstats
path: root/main/linux-rpi
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2017-11-21 10:40:32 +0200
committerTimo Teräs <timo.teras@iki.fi>2017-11-21 10:40:32 +0200
commit02a4ca2fd9ae2f3df7aa5053150f9d555fcc44d5 (patch)
tree8dfd40647552d00aefc53c239ae6b4d5f260280f /main/linux-rpi
parent88e86f738211ea5478417811d7e9e1ea7ef3cb51 (diff)
downloadaports-02a4ca2fd9ae2f3df7aa5053150f9d555fcc44d5.tar.bz2
aports-02a4ca2fd9ae2f3df7aa5053150f9d555fcc44d5.tar.xz
main/linux-rpi: fix config
Diffstat (limited to 'main/linux-rpi')
-rw-r--r--main/linux-rpi/APKBUILD4
-rw-r--r--main/linux-rpi/config-rpi.armhf6
-rw-r--r--main/linux-rpi/config-rpi2.armhf6
3 files changed, 10 insertions, 6 deletions
diff --git a/main/linux-rpi/APKBUILD b/main/linux-rpi/APKBUILD
index 25b1b81d79..6c11d37417 100644
--- a/main/linux-rpi/APKBUILD
+++ b/main/linux-rpi/APKBUILD
@@ -197,6 +197,6 @@ sha512sums="bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a
31c665e1ce6f78f2322891e13db1b3712884082dedf5bdf056b83b7207feaecde5bdf5ffda145275e10c17e1e221be78aed8d50a7cf581378537f7e7346de3cd rpi-4.9.63-alpine.patch
36724ba56cb8fdf3a3d347cffb67ae1cc3d7b1052d526b6b5134ebf6baae9f9724b586c97833453dc7697ab24699426f0749af78b6a80be36967a80033a0cf40 gpio-mcp23s08-pullups.patch
501c91bf2538a18102da59bbccc3097f9c3c90079acc0e946ff075074160c09b8a66934e5ce5470e170f0e4f93d114709a95230367426d0bb7ea02c4bdf4cc9b issue-4973.patch
-abad98f8fc2d02bfdba72f210cea611cb3740767245e2143165ca41846dbe4707f5359245a0ebe63157837d88d0b9e48f437b8da91fac3472f64eff8a572681b config-rpi.armhf
-1d933074e16e08dfcca97cb3f5c30c378be32127421691de28db0a35c98344ca7a3b1d270c578f65bd3c6518c02630bc2b492ebc172343e1f0212980d570d312 config-rpi2.armhf
+dd84624bedfd624d7051d833241b83b96d4c4b9943e7969130ec35cdd86a35b98fc2ebd48d84ddb97115ebfb9a59b84b3b01ea48aca78ae8f8ad8d534f8b36fa config-rpi.armhf
+031ce381e602f37bfab73e774475b1f323945b59d83c2177e63ce77b3d7ca2119e67d48f1a79b51bf66412c8ebf75353b71d400c6a1efb9d6c3ca4665f5c017d config-rpi2.armhf
a8e7f434c325c9dd7a9109efecad408e42a50ecd1391cb0c7d1d7de79609caee007486c8a6538231c74bdc5d7b84cbca053958e1b239bc0507e6d3598ace383a markdt"
diff --git a/main/linux-rpi/config-rpi.armhf b/main/linux-rpi/config-rpi.armhf
index 3f2fa2b729..222e3defb9 100644
--- a/main/linux-rpi/config-rpi.armhf
+++ b/main/linux-rpi/config-rpi.armhf
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.9.58 Kernel Configuration
+# Linux/arm 4.9.63 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -1016,6 +1016,7 @@ CONFIG_BRIDGE=m
CONFIG_BRIDGE_IGMP_SNOOPING=y
# CONFIG_BRIDGE_VLAN_FILTERING is not set
CONFIG_HAVE_NET_DSA=y
+# CONFIG_NET_DSA is not set
CONFIG_VLAN_8021Q=m
CONFIG_VLAN_8021Q_GVRP=y
# CONFIG_VLAN_8021Q_MVRP is not set
@@ -2112,7 +2113,6 @@ CONFIG_GAMEPORT_L4=m
# Character devices
#
CONFIG_BRCM_CHAR_DRIVERS=y
-CONFIG_BCM_VC_CMA=y
CONFIG_BCM2708_VCMEM=y
CONFIG_BCM_VCIO=y
CONFIG_BCM_VC_SM=y
@@ -2407,6 +2407,7 @@ CONFIG_W1_SLAVE_DS2423=m
CONFIG_W1_SLAVE_DS2431=m
CONFIG_W1_SLAVE_DS2433=m
# CONFIG_W1_SLAVE_DS2433_CRC is not set
+# CONFIG_W1_SLAVE_DS2438 is not set
CONFIG_W1_SLAVE_DS2760=m
CONFIG_W1_SLAVE_DS2780=m
CONFIG_W1_SLAVE_DS2781=m
@@ -4624,6 +4625,7 @@ CONFIG_ARM_GIC_MAX_NR=1
# Performance monitor support
#
CONFIG_ARM_PMU=y
+CONFIG_RPI_AXIPERF=m
# CONFIG_RAS is not set
#
diff --git a/main/linux-rpi/config-rpi2.armhf b/main/linux-rpi/config-rpi2.armhf
index bab671e537..9d2c244253 100644
--- a/main/linux-rpi/config-rpi2.armhf
+++ b/main/linux-rpi/config-rpi2.armhf
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.9.58 Kernel Configuration
+# Linux/arm 4.9.63 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -1102,6 +1102,7 @@ CONFIG_BRIDGE=m
CONFIG_BRIDGE_IGMP_SNOOPING=y
# CONFIG_BRIDGE_VLAN_FILTERING is not set
CONFIG_HAVE_NET_DSA=y
+# CONFIG_NET_DSA is not set
CONFIG_VLAN_8021Q=m
CONFIG_VLAN_8021Q_GVRP=y
# CONFIG_VLAN_8021Q_MVRP is not set
@@ -2204,7 +2205,6 @@ CONFIG_GAMEPORT_L4=m
# Character devices
#
CONFIG_BRCM_CHAR_DRIVERS=y
-CONFIG_BCM_VC_CMA=y
CONFIG_BCM2708_VCMEM=y
CONFIG_BCM_VCIO=y
CONFIG_BCM_VC_SM=y
@@ -2500,6 +2500,7 @@ CONFIG_W1_SLAVE_DS2423=m
CONFIG_W1_SLAVE_DS2431=m
CONFIG_W1_SLAVE_DS2433=m
# CONFIG_W1_SLAVE_DS2433_CRC is not set
+# CONFIG_W1_SLAVE_DS2438 is not set
CONFIG_W1_SLAVE_DS2760=m
CONFIG_W1_SLAVE_DS2780=m
CONFIG_W1_SLAVE_DS2781=m
@@ -4713,6 +4714,7 @@ CONFIG_ARM_GIC_MAX_NR=1
# Performance monitor support
#
CONFIG_ARM_PMU=y
+CONFIG_RPI_AXIPERF=m
# CONFIG_RAS is not set
#