sunxi: add upstream patches and update config
This commit is contained in:
parent
3ddd91de71
commit
e52ac7890c
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 5.4.75 Kernel Configuration
|
||||
# Linux/arm 5.4.78 Kernel Configuration
|
||||
#
|
||||
|
||||
#
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm64 5.4.75 Kernel Configuration
|
||||
# Linux/arm64 5.4.78 Kernel Configuration
|
||||
#
|
||||
|
||||
#
|
||||
@ -588,6 +588,7 @@ CONFIG_KVM_ARM_HOST=y
|
||||
CONFIG_KVM_ARM_PMU=y
|
||||
CONFIG_KVM_INDIRECT_VECTORS=y
|
||||
CONFIG_VHOST_NET=m
|
||||
CONFIG_VHOST_SCSI=m
|
||||
# CONFIG_VHOST_VSOCK is not set
|
||||
CONFIG_VHOST=m
|
||||
# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
|
||||
@ -2253,6 +2254,12 @@ CONFIG_DM_SWITCH=m
|
||||
CONFIG_DM_LOG_WRITES=m
|
||||
CONFIG_DM_INTEGRITY=m
|
||||
CONFIG_DM_ZONED=m
|
||||
CONFIG_TARGET_CORE=m
|
||||
CONFIG_TCM_IBLOCK=m
|
||||
CONFIG_TCM_FILEIO=m
|
||||
CONFIG_TCM_PSCSI=m
|
||||
CONFIG_LOOPBACK_TARGET=m
|
||||
CONFIG_ISCSI_TARGET=m
|
||||
CONFIG_NETDEVICES=y
|
||||
CONFIG_MII=y
|
||||
CONFIG_NET_CORE=y
|
||||
@ -5619,6 +5626,7 @@ CONFIG_USB_F_UVC=m
|
||||
CONFIG_USB_F_MIDI=m
|
||||
CONFIG_USB_F_HID=m
|
||||
CONFIG_USB_F_PRINTER=m
|
||||
CONFIG_USB_F_TCM=m
|
||||
CONFIG_USB_CONFIGFS=m
|
||||
CONFIG_USB_CONFIGFS_SERIAL=y
|
||||
CONFIG_USB_CONFIGFS_ACM=y
|
||||
@ -5639,6 +5647,7 @@ CONFIG_USB_CONFIGFS_F_MIDI=y
|
||||
CONFIG_USB_CONFIGFS_F_HID=y
|
||||
CONFIG_USB_CONFIGFS_F_UVC=y
|
||||
CONFIG_USB_CONFIGFS_F_PRINTER=y
|
||||
CONFIG_USB_CONFIGFS_F_TCM=y
|
||||
CONFIG_USB_ZERO=m
|
||||
# CONFIG_USB_ZERO_HNPTEST is not set
|
||||
CONFIG_USB_AUDIO=m
|
||||
@ -5653,6 +5662,7 @@ CONFIG_USB_FUNCTIONFS_ETH=y
|
||||
CONFIG_USB_FUNCTIONFS_RNDIS=y
|
||||
CONFIG_USB_FUNCTIONFS_GENERIC=y
|
||||
CONFIG_USB_MASS_STORAGE=m
|
||||
CONFIG_USB_GADGET_TARGET=m
|
||||
CONFIG_USB_G_SERIAL=m
|
||||
CONFIG_USB_MIDI_GADGET=m
|
||||
CONFIG_USB_G_PRINTER=m
|
||||
@ -6040,6 +6050,7 @@ CONFIG_XEN_GRANT_DEV_ALLOC=m
|
||||
CONFIG_SWIOTLB_XEN=y
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
# CONFIG_XEN_PVCALLS_BACKEND is not set
|
||||
CONFIG_XEN_SCSI_BACKEND=m
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
CONFIG_XEN_EFI=y
|
||||
CONFIG_XEN_AUTO_XLATE=y
|
||||
@ -8011,12 +8022,3 @@ CONFIG_STRICT_DEVMEM=y
|
||||
# CONFIG_ARM64_RELOC_TEST is not set
|
||||
# CONFIG_CORESIGHT is not set
|
||||
# end of Kernel hacking
|
||||
|
||||
## LinuxIO - iSCSI Target modules
|
||||
CONFIG_TARGET_CORE=m
|
||||
CONFIG_ISCSI_TARGET=m
|
||||
CONFIG_TCM_IBLOCK=m
|
||||
CONFIG_TCM_FILEIO=m
|
||||
CONFIG_TCM_PSCSI=m
|
||||
CONFIG_TCM_USER2=m
|
||||
|
||||
|
||||
3630
patch/kernel/sunxi-legacy/patch-5.4.75-76.patch
Normal file
3630
patch/kernel/sunxi-legacy/patch-5.4.75-76.patch
Normal file
File diff suppressed because it is too large
Load Diff
29
patch/kernel/sunxi-legacy/patch-5.4.76-77.patch
Normal file
29
patch/kernel/sunxi-legacy/patch-5.4.76-77.patch
Normal file
@ -0,0 +1,29 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 842ed84118107..2e24b568b93fd 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1,7 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
VERSION = 5
|
||||
PATCHLEVEL = 4
|
||||
-SUBLEVEL = 76
|
||||
+SUBLEVEL = 77
|
||||
EXTRAVERSION =
|
||||
NAME = Kleptomaniac Octopus
|
||||
|
||||
diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
|
||||
index f808c5fa9838c..3f0b8e2ef3d46 100644
|
||||
--- a/drivers/powercap/powercap_sys.c
|
||||
+++ b/drivers/powercap/powercap_sys.c
|
||||
@@ -367,9 +367,9 @@ static void create_power_zone_common_attributes(
|
||||
&dev_attr_max_energy_range_uj.attr;
|
||||
if (power_zone->ops->get_energy_uj) {
|
||||
if (power_zone->ops->reset_energy_uj)
|
||||
- dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
|
||||
+ dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUSR;
|
||||
else
|
||||
- dev_attr_energy_uj.attr.mode = S_IRUGO;
|
||||
+ dev_attr_energy_uj.attr.mode = S_IRUSR;
|
||||
power_zone->zone_dev_attrs[count++] =
|
||||
&dev_attr_energy_uj.attr;
|
||||
}
|
||||
5869
patch/kernel/sunxi-legacy/patch-5.4.77-78.patch
Normal file
5869
patch/kernel/sunxi-legacy/patch-5.4.77-78.patch
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user