shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'odroidn2-4.9.y'

Browse Source 
Change-Id: I267031488f3591696fc7ddc09db95433a93d9b61
This commit is contained in:
Mauro (mdrjr) Ribeiro
2019-06-05 21:50:52 -03:00
parent 49f23079ff f4efd33486
commit 37982180ee
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm64/configs/odroidn2_defconfig
View File

@@ -128,12 +128,12 @@ CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
CONFIG_CGROUPS=y
CONFIG_CGROUP_DEBUG=y
CONFIG_CGROUP_FREEZER=y
# CONFIG_CGROUP_PIDS is not set
CONFIG_CGROUP_PIDS=y
CONFIG_CGROUP_DEVICE=y
CONFIG_CPUSETS=y
CONFIG_PROC_PID_CPUSET=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_CGROUP_SCHEDTUNE=y
# CONFIG_CGROUP_SCHEDTUNE is not set
CONFIG_PAGE_COUNTER=y
CONFIG_MEMCG=y
# CONFIG_MEMCG_SWAP is not set
@@ -781,7 +781,7 @@ CONFIG_NETFILTER_XTABLES=m
#
CONFIG_NETFILTER_XT_MARK=m
CONFIG_NETFILTER_XT_CONNMARK=m
# CONFIG_NETFILTER_XT_SET is not set
CONFIG_NETFILTER_XT_SET=m
#
# Xtables targets

28
arch/arm64/configs/odroidn2_spibios_defconfig
View File

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 4.9.141 Kernel Configuration
# Linux/arm64 4.9.177 Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y
@@ -112,6 +112,8 @@ CONFIG_RCU_STALL_COMMON=y
CONFIG_BUILD_BIN2C=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=15
CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
CONFIG_GENERIC_SCHED_CLOCK=y
CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
CONFIG_CGROUPS=y
@@ -161,7 +163,7 @@ CONFIG_MULTIUSER=y
CONFIG_SYSFS_SYSCALL=y
# CONFIG_SYSCTL_SYSCALL is not set
# CONFIG_KALLSYMS is not set
# CONFIG_PRINTK is not set
CONFIG_PRINTK=y
# CONFIG_BUG is not set
CONFIG_ELF_CORE=y
# CONFIG_BASE_FULL is not set
@@ -880,6 +882,11 @@ CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_VECM=y
#
# CONFIG_AMLOGIC_MEDIA_ALGORITHM is not set
#
# Amlogic Camera Support
#
# CONFIG_AMLOGIC_VIDEOIN_MANAGER is not set
#
# Amlogic DTV driver
#
@@ -978,6 +985,7 @@ CONFIG_AMLOGIC_DMC_MONITOR=y
CONFIG_AMLOGIC_MEMORY_EXTEND=y
CONFIG_AMLOGIC_RAMDUMP=y
CONFIG_AMLOGIC_CMA=y
# CONFIG_AMLOGIC_VMAP is not set
CONFIG_AMLOGIC_GPIO_IRQ=y
#
@@ -1563,6 +1571,7 @@ CONFIG_LEGACY_PTY_COUNT=32
# CONFIG_SERIAL_NONSTANDARD is not set
# CONFIG_N_GSM is not set
# CONFIG_TRACE_SINK is not set
CONFIG_LDISC_AUTOLOAD=y
CONFIG_DEVMEM=y
CONFIG_DEVKMEM=y
@@ -1600,7 +1609,6 @@ CONFIG_HW_RANDOM=y
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
# CONFIG_HW_RANDOM_VIRTIO is not set
CONFIG_HW_RANDOM_MESON=y
# CONFIG_R3964 is not set
#
# PCMCIA character devices
@@ -1683,7 +1691,6 @@ CONFIG_SPI_BITBANG=y
CONFIG_SPI_GPIO=y
# CONFIG_SPI_FSL_SPI is not set
CONFIG_SPI_MESON_SPICC=y
# CONFIG_SPI_MESON_SPIFC is not set
# CONFIG_SPI_OC_TINY is not set
# CONFIG_SPI_PL022 is not set
# CONFIG_SPI_PXA2XX_PCI is not set
@@ -2968,14 +2975,8 @@ CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
CONFIG_INOTIFY_USER=y
CONFIG_FANOTIFY=y
CONFIG_QUOTA=y
# CONFIG_QUOTA_NETLINK_INTERFACE is not set
# CONFIG_PRINT_QUOTA_WARNING is not set
# CONFIG_QUOTA_DEBUG is not set
CONFIG_QUOTA_TREE=y
# CONFIG_QFMT_V1 is not set
CONFIG_QFMT_V2=y
CONFIG_QUOTACTL=y
# CONFIG_QUOTA is not set
# CONFIG_QUOTACTL is not set
CONFIG_AUTOFS4_FS=y
CONFIG_FUSE_FS=y
# CONFIG_CUSE is not set
@@ -3116,7 +3117,10 @@ CONFIG_NLS_ISO8859_1=y
#
# printk and dmesg options
#
# CONFIG_PRINTK_TIME is not set
CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_BOOT_PRINTK_DELAY is not set
# CONFIG_DYNAMIC_DEBUG is not set
#
# Compile-time checks and compiler options