Updated README file and fixed config for kernel 3.4.43

diff --git a/README b/README
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c900b36f48ac92199768f5bb9eb516e45e524af1 100644 (file)
--- a/README
+++ b/README
@@ -0,0 +1,5 @@
+
+upstream sources:
+    https://github.com/cubieboard2/linux-sunxi
+      branch sunxi-3.4-cb2
+    http://space.nurdspace.nl/~buzz/cubie2_kernel/cubie2kernel_config

diff --git a/config-3.4.43-cubieboard2_20130822 b/config-3.4.43-cubieboard2_20130822
index 40180cbf937aa2f72159b14719e1e461fd137075..87ea8e60a67d4a5a54242f66d02d698138965712 100644 (file)
--- a/config-3.4.43-cubieboard2_20130822
+++ b/config-3.4.43-cubieboard2_20130822
@@ -1,10 +1,9 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.3.0 Kernel Configuration
+# Linux/arm 3.4.43 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_HAVE_SCHED_CLOCK=y
 CONFIG_GENERIC_GPIO=y
 # CONFIG_ARCH_USES_GETTIMEOFFSET is not set
 CONFIG_GENERIC_CLOCKEVENTS=y
@@ -26,6 +25,7 @@ CONFIG_ZONE_DMA=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_NEED_MACH_IO_H=y
 CONFIG_NEED_MACH_MEMORY_H=y
 CONFIG_GENERIC_BUG=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -41,9 +41,11 @@ CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
 CONFIG_DEFAULT_HOSTNAME="cubieboard2"
 CONFIG_SWAP=y
@@ -60,17 +62,15 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y
 # IRQ subsystem
 #
 CONFIG_GENERIC_HARDIRQS=y
-CONFIG_HAVE_SPARSE_IRQ=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_IRQ_DOMAIN=y
-# CONFIG_SPARSE_IRQ is not set
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
 
 #
 # RCU Subsystem
 #
 CONFIG_TREE_PREEMPT_RCU=y
 CONFIG_PREEMPT_RCU=y
-# CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
 # CONFIG_RCU_FAST_NO_HZ is not set
@@ -134,12 +134,14 @@ CONFIG_SLAB=y
 # CONFIG_PROFILING is not set
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
+# CONFIG_JUMP_LABEL is not set
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
 
 #
 # GCOV-based kernel profiling
@@ -183,6 +185,8 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_SYSV68_PARTITION is not set
+# CONFIG_SUNXI_NAND411_PARTITION is not set
+# CONFIG_SUNXI_NAND311_PARTITION is not set
 
 #
 # IO Schedulers
@@ -199,7 +203,7 @@ CONFIG_DEFAULT_IOSCHED="deadline"
 # CONFIG_INLINE_SPIN_LOCK_BH is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQ is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_UNLOCK is not set
+CONFIG_UNINLINE_SPIN_UNLOCK=y
 # CONFIG_INLINE_SPIN_UNLOCK_BH is not set
 # CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
 # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
@@ -230,8 +234,6 @@ CONFIG_FREEZER=y
 CONFIG_MMU=y
 # CONFIG_ARCH_INTEGRATOR is not set
 # CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_SUN6I is not set
-CONFIG_ARCH_SUN7I=y
 # CONFIG_ARCH_VERSATILE is not set
 # CONFIG_ARCH_VEXPRESS is not set
 # CONFIG_ARCH_AT91 is not set
@@ -264,13 +266,17 @@ CONFIG_ARCH_SUN7I=y
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_PICOXCELL is not set
+# CONFIG_ARCH_SUN3I is not set
+# CONFIG_ARCH_SUN4I is not set
+# CONFIG_ARCH_SUN5I is not set
+CONFIG_ARCH_SUN7I=y
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PXA is not set
 # CONFIG_ARCH_MSM is not set
 # CONFIG_ARCH_SHMOBILE is not set
 # CONFIG_ARCH_RPC is not set
 # CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_S3C24XX is not set
 # CONFIG_ARCH_S3C64XX is not set
 # CONFIG_ARCH_S5P64X0 is not set
 # CONFIG_ARCH_S5PC100 is not set
@@ -293,10 +299,13 @@ CONFIG_ARCH_SUN7I=y
 #
 
 #
-# Allwinner Platform Type
+# Allwinner's sunxi options
 #
-# CONFIG_AW_FPGA_PLATFORM is not set
-CONFIG_AW_ASIC_PLATFORM=y
+CONFIG_SW_DEBUG_UART=0
+CONFIG_SUNXI_MULTIPLATFORM=y
+CONFIG_SUNXI_MALI_RESERVED_MEM=y
+CONFIG_SUNXI_SCALING_MIN=60
+CONFIG_PLAT_SUNXI=y
 
 #
 # Processor Type
@@ -345,6 +354,7 @@ CONFIG_MULTI_IRQ_HANDLER=y
 # CONFIG_ARM_ERRATA_754322 is not set
 # CONFIG_ARM_ERRATA_754327 is not set
 # CONFIG_ARM_ERRATA_764369 is not set
+# CONFIG_ARM_ERRATA_775420 is not set
 CONFIG_ARM_GIC=y
 # CONFIG_FIQ_DEBUGGER is not set
 
@@ -372,7 +382,6 @@ CONFIG_SCHED_SMT=y
 CONFIG_HAVE_ARM_SCU=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_HAVE_ARM_TWD=y
-CONFIG_AW_TIME_DELAY=y
 CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_2G is not set
 # CONFIG_VMSPLIT_1G is not set
@@ -444,25 +453,29 @@ CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_BENCHMARK is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_FANTASY is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_BENCHMARK=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 # CONFIG_CPU_FREQ_GOV_INTERACTIVE is not set
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_GOV_FANTASYS=y
+# CONFIG_CPU_FREQ_GOV_FANTASY is not set
 CONFIG_CPU_FREQ_USR_EVNT_NOTIFY=y
 CONFIG_CPU_FREQ_DVFS=y
-# CONFIG_CPU_FREQ_DVFS_HW is not set
-CONFIG_CPU_FREQ_EARLYSUSPEND=y
+
+#
+# ARM CPU frequency scaling drivers
+#
+# CONFIG_ARM_EXYNOS4210_CPUFREQ is not set
+# CONFIG_ARM_EXYNOS4X12_CPUFREQ is not set
+# CONFIG_ARM_EXYNOS5250_CPUFREQ is not set
 # CONFIG_CPU_IDLE is not set
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 
 #
 # Floating point emulation
@@ -492,19 +505,12 @@ CONFIG_HAVE_AOUT=y
 #
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
-CONFIG_PM_WATCHDOG_TIMEOUT=y
 CONFIG_HAS_WAKELOCK=y
-CONFIG_HAS_EARLYSUSPEND=y
 CONFIG_WAKELOCK=y
-CONFIG_WAKELOCK_STAT=y
-CONFIG_USER_WAKELOCK=y
-CONFIG_EARLYSUSPEND=y
-CONFIG_EARLYSUSPEND_DELAY=y
-# CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set
-# CONFIG_CONSOLE_EARLYSUSPEND is not set
-CONFIG_FB_EARLYSUSPEND=y
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
 # CONFIG_PM_RUNTIME is not set
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
@@ -596,6 +602,7 @@ CONFIG_NF_CONNTRACK=y
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_PROCFS=y
 CONFIG_NF_CONNTRACK_EVENTS=y
+# CONFIG_NF_CONNTRACK_TIMEOUT is not set
 # CONFIG_NF_CONNTRACK_TIMESTAMP is not set
 # CONFIG_NF_CT_PROTO_DCCP is not set
 CONFIG_NF_CT_PROTO_GRE=y
@@ -612,6 +619,7 @@ CONFIG_NF_CONNTRACK_PPTP=y
 # CONFIG_NF_CONNTRACK_SIP is not set
 # CONFIG_NF_CONNTRACK_TFTP is not set
 CONFIG_NF_CT_NETLINK=y
+# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
 CONFIG_NETFILTER_TPROXY=y
 CONFIG_NETFILTER_XTABLES=y
 
@@ -632,6 +640,7 @@ CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
 # CONFIG_NETFILTER_XT_TARGET_HL is not set
 CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
 # CONFIG_NETFILTER_XT_TARGET_LED is not set
+# CONFIG_NETFILTER_XT_TARGET_LOG is not set
 # CONFIG_NETFILTER_XT_TARGET_MARK is not set
 CONFIG_NETFILTER_XT_TARGET_NFLOG=y
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
@@ -706,7 +715,6 @@ CONFIG_IP_NF_MATCH_TTL=y
 CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_TARGET_REJECT=y
 CONFIG_IP_NF_TARGET_REJECT_SKERR=y
-CONFIG_IP_NF_TARGET_LOG=y
 # CONFIG_IP_NF_TARGET_ULOG is not set
 CONFIG_NF_NAT=y
 CONFIG_NF_NAT_NEEDED=y
@@ -746,7 +754,6 @@ CONFIG_IP6_NF_IPTABLES=y
 # CONFIG_IP6_NF_MATCH_RPFILTER is not set
 # CONFIG_IP6_NF_MATCH_RT is not set
 # CONFIG_IP6_NF_TARGET_HL is not set
-CONFIG_IP6_NF_TARGET_LOG=y
 CONFIG_IP6_NF_FILTER=y
 CONFIG_IP6_NF_TARGET_REJECT=y
 CONFIG_IP6_NF_TARGET_REJECT_SKERR=y
@@ -783,6 +790,8 @@ CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
 CONFIG_BQL=y
+CONFIG_HAVE_BPF_JIT=y
+# CONFIG_BPF_JIT is not set
 
 #
 # Network testing
@@ -851,7 +860,7 @@ CONFIG_EXTRA_FIRMWARE=""
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPI=y
-# CONFIG_DMA_SHARED_BUFFER is not set
+CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_SYNC=y
 # CONFIG_SW_SYNC is not set
 # CONFIG_CONNECTOR is not set
@@ -873,12 +882,16 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_MG_DISK is not set
 # CONFIG_BLK_DEV_RBD is not set
+# CONFIG_SUN7I_LIBNAND is not set
 
 #
 # Misc devices
 #
 # CONFIG_SENSORS_LIS3LV02D is not set
 # CONFIG_AD525X_DPOT is not set
+# CONFIG_SUN4I_VIBRATOR is not set
+# CONFIG_SUN4I_GPIO_UGLY is not set
+# CONFIG_SUNXI_DBGREG is not set
 # CONFIG_ATMEL_PWM is not set
 # CONFIG_ICS932S401 is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
@@ -896,6 +909,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 # CONFIG_UID_STAT is not set
 # CONFIG_BMP085 is not set
 # CONFIG_USB_SWITCH_FSA9480 is not set
+CONFIG_SUNXI_PWM=m
 # CONFIG_C2PORT is not set
 
 #
@@ -1023,6 +1037,7 @@ CONFIG_ETHERNET=y
 # CONFIG_NET_VENDOR_BROADCOM is not set
 # CONFIG_NET_CALXEDA_XGMAC is not set
 # CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CIRRUS is not set
 # CONFIG_DM9000 is not set
 # CONFIG_DNET is not set
 # CONFIG_NET_VENDOR_FARADAY is not set
@@ -1036,14 +1051,13 @@ CONFIG_NET_VENDOR_MICROCHIP=y
 # CONFIG_NET_VENDOR_SEEQ is not set
 # CONFIG_NET_VENDOR_SMSC is not set
 # CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_SUNXI is not set
-CONFIG_NET_VENDOR_SUN7I=y
-CONFIG_SUN7I_EMAC=y
+# CONFIG_SUNXI_EMAC is not set
 CONFIG_PHYLIB=y
 
 #
 # MII PHY device drivers
 #
+# CONFIG_AMD_PHY is not set
 # CONFIG_MARVELL_PHY is not set
 # CONFIG_DAVICOM_PHY is not set
 # CONFIG_QSEMI_PHY is not set
@@ -1089,6 +1103,7 @@ CONFIG_USB_NET_RNDIS_HOST=m
 # CONFIG_USB_NET_ZAURUS is not set
 # CONFIG_USB_NET_CX82310_ETH is not set
 # CONFIG_USB_NET_KALMIA is not set
+# CONFIG_USB_NET_QMI_WWAN is not set
 # CONFIG_USB_NET_INT51X1 is not set
 # CONFIG_USB_IPHETH is not set
 # CONFIG_USB_SIERRA_NET is not set
@@ -1106,22 +1121,24 @@ CONFIG_ATH_COMMON=m
 # CONFIG_ATH_DEBUG is not set
 CONFIG_ATH9K_HW=m
 CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
 CONFIG_ATH9K=m
 # CONFIG_ATH9K_AHB is not set
 # CONFIG_ATH9K_DEBUGFS is not set
 CONFIG_ATH9K_RATE_CONTROL=y
-CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_HTC is not set
 CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 CONFIG_CARL9170_WPC=y
 CONFIG_ATH6KL=m
+# CONFIG_ATH6KL_SDIO is not set
+# CONFIG_ATH6KL_USB is not set
 # CONFIG_ATH6KL_DEBUG is not set
 # CONFIG_B43 is not set
-# CONFIG_BCM4330 is not set
 # CONFIG_B43LEGACY is not set
 # CONFIG_BCMDHD is not set
 # CONFIG_BRCMFMAC is not set
+# CONFIG_BCM4330 is not set
 # CONFIG_HOSTAP is not set
 # CONFIG_IWM is not set
 CONFIG_LIBERTAS=m
@@ -1148,6 +1165,7 @@ CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
 CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
+# CONFIG_RTLWIFI_DEBUG is not set
 CONFIG_RTL8192C_COMMON=m
 # CONFIG_WL1251 is not set
 # CONFIG_WL12XX_MENU is not set
@@ -1159,13 +1177,13 @@ CONFIG_RTL8192CU_SW=m
 CONFIG_RTL8188EU=m
 # CONFIG_RTL8189ES is not set
 # CONFIG_RTL8723AS is not set
+# CONFIG_RTXX7X_SW is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
 #
 # CONFIG_WAN is not set
 # CONFIG_ISDN is not set
-# CONFIG_PHONE is not set
 
 #
 # Input device support
@@ -1186,8 +1204,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
 # CONFIG_INPUT_KEYRESET is not set
-CONFIG_INPUT_INIT_CTP=y
-CONFIG_INPUT_DEVICE=m
 
 #
 # Input Device Drivers
@@ -1212,11 +1228,12 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_SAMSUNG is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_OMAP4 is not set
 # CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_SUN7I_KEYPAD is not set
-# CONFIG_KEYBOARD_SW_KEYBOARD is not set
-# CONFIG_IR_SUN6I is not set
-CONFIG_IR_SUN7I=y
+# CONFIG_KEYBOARD_SUN4IKEYPAD is not set
+# CONFIG_KEYBOARD_SUN4I_KEYBOARD is not set
+# CONFIG_KEYBOARD_HV2605_KEYBOARD is not set
+# CONFIG_IR_SUNXI is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=y
 CONFIG_MOUSE_PS2_ALPS=y
@@ -1232,12 +1249,11 @@ CONFIG_MOUSE_SERIAL=y
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_MOUSE_GPIO is not set
 # CONFIG_MOUSE_SYNAPTICS_I2C is not set
+# CONFIG_MOUSE_SYNAPTICS_USB is not set
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 # CONFIG_INPUT_MISC is not set
-# CONFIG_INPUT_GYR is not set
-# CONFIG_INPUT_E_COMPASS is not set
 
 #
 # Hardware I/O ports
@@ -1250,6 +1266,7 @@ CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_ALTERA_PS2 is not set
 # CONFIG_SERIO_PS2MULT is not set
 # CONFIG_GAMEPORT is not set
+# CONFIG_GSENSOR is not set
 
 #
 # Character devices
@@ -1275,6 +1292,7 @@ CONFIG_DEVKMEM=y
 #
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_SUNXI=y
 CONFIG_SERIAL_8250_NR_UARTS=1
 CONFIG_SERIAL_8250_RUNTIME_UARTS=1
 CONFIG_SERIAL_8250_EXTENDED=y
@@ -1282,7 +1300,6 @@ CONFIG_SERIAL_8250_EXTENDED=y
 # CONFIG_SERIAL_8250_SHARE_IRQ is not set
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
 # CONFIG_SERIAL_8250_RSA is not set
-CONFIG_SERIAL_8250_SUNXI=y
 
 #
 # Non-8250 serial port support
@@ -1298,7 +1315,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_ALTERA_UART is not set
 # CONFIG_SERIAL_IFX6X60 is not set
 # CONFIG_SERIAL_XILINX_PS_UART is not set
-# CONFIG_SERIAL_SW is not set
 # CONFIG_HVC_DCC is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_HW_RANDOM is not set
@@ -1307,11 +1323,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_TCG_TPM is not set
 # CONFIG_DCC_TTY is not set
 # CONFIG_RAMOOPS is not set
-# CONFIG_DMA_TEST_DRIVER is not set
-# CONFIG_SUN7I_GPIO_TEST is not set
-CONFIG_SUN7I_G2D=y
-# CONFIG_SUNXI_TIMER_TEST is not set
-# CONFIG_SUNXI_PHYS_MEM_ALLOCATOR is not set
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
@@ -1333,8 +1344,8 @@ CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_PCA_PLATFORM is not set
 # CONFIG_I2C_PXA_PCI is not set
 # CONFIG_I2C_SIMTEC is not set
-CONFIG_I2C_SUN7I=y
-# CONFIG_SUN7I_I2C_PRINT_TRANSFER_INFO is not set
+CONFIG_I2C_SUNXI=y
+# CONFIG_SUNXI_IIC_PRINT_TRANSFER_INFO is not set
 # CONFIG_I2C_XILINX is not set
 
 #
@@ -1365,9 +1376,6 @@ CONFIG_SPI_MASTER=y
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PL022 is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
-CONFIG_SPI_SUN7I=y
-# CONFIG_SUN7I_SPI_NDMA is not set
-# CONFIG_SUN7I_SPI_NORFLASH is not set
 # CONFIG_SPI_XILINX is not set
 # CONFIG_SPI_DESIGNWARE is not set
 
@@ -1376,6 +1384,7 @@ CONFIG_SPI_SUN7I=y
 #
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
+# CONFIG_HSI is not set
 
 #
 # PPS support
@@ -1393,7 +1402,7 @@ CONFIG_SPI_SUN7I=y
 #
 # Enable Device Drivers -> PPS to see the PTP clock options.
 #
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIOLIB=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
@@ -1404,6 +1413,7 @@ CONFIG_GPIO_GENERIC=y
 #
 CONFIG_GPIO_GENERIC_PLATFORM=y
 # CONFIG_GPIO_PL061 is not set
+# CONFIG_GPIO_SUNXI is not set
 
 #
 # I2C GPIO expanders:
@@ -1441,21 +1451,23 @@ CONFIG_AW_AXP=y
 CONFIG_AW_AXP20=y
 CONFIG_AXP_CHARGEINIT=y
 CONFIG_AXP_CHGCHANGE=y
-CONFIG_AW_AXP20_COU=y
-# CONFIG_AW_AXP20_OCV is not set
 # CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_AXP152 is not set
 # CONFIG_PDA_POWER is not set
 # CONFIG_TEST_POWER is not set
 # CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
 # CONFIG_BATTERY_SBS is not set
 # CONFIG_BATTERY_BQ27x00 is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_BATTERY_ANDROID is not set
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_MANAGER is not set
+# CONFIG_CHARGER_SMB347 is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -1464,10 +1476,6 @@ CONFIG_HWMON=y
 # Native drivers
 #
 # CONFIG_SENSORS_MMA7660 is not set
-# CONFIG_SENSORS_MMA865x is not set
-# CONFIG_SENSORS_MMA8452 is not set
-# CONFIG_SENSORS_AFA750 is not set
-# CONFIG_SENSORS_KIONIX_ACCEL is not set
 # CONFIG_SENSORS_AD7314 is not set
 # CONFIG_SENSORS_AD7414 is not set
 # CONFIG_SENSORS_AD7418 is not set
@@ -1522,6 +1530,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_MAX6639 is not set
 # CONFIG_SENSORS_MAX6642 is not set
 # CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_MCP3021 is not set
 # CONFIG_SENSORS_NTC_THERMISTOR is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
@@ -1571,7 +1580,6 @@ CONFIG_WATCHDOG=y
 # CONFIG_DW_WATCHDOG is not set
 # CONFIG_MPCORE_WATCHDOG is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
-CONFIG_SUNXI_WDT=y
 
 #
 # USB-based Watchdog Cards
@@ -1603,11 +1611,13 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_TPS6105X is not set
 # CONFIG_TPS65010 is not set
 # CONFIG_TPS6507X is not set
+# CONFIG_MFD_TPS65217 is not set
 # CONFIG_MFD_TPS6586X is not set
 # CONFIG_MFD_TPS65910 is not set
 # CONFIG_MFD_TPS65912_I2C is not set
 # CONFIG_MFD_TPS65912_SPI is not set
 # CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6040_CORE is not set
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TMIO is not set
@@ -1632,7 +1642,9 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_ABX500_CORE is not set
 # CONFIG_EZX_PCAP is not set
 # CONFIG_MFD_WL1273_CORE is not set
+# CONFIG_MFD_TPS65090 is not set
 # CONFIG_MFD_AAT2870_CORE is not set
+# CONFIG_MFD_RC5T583 is not set
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR_DUMMY is not set
@@ -1640,17 +1652,17 @@ CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
 # CONFIG_REGULATOR_GPIO is not set
-# CONFIG_REGULATOR_BQ24022 is not set
+# CONFIG_REGULATOR_AD5398 is not set
+# CONFIG_REGULATOR_ISL6271A is not set
 # CONFIG_REGULATOR_MAX1586 is not set
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
 # CONFIG_REGULATOR_MAX8952 is not set
 # CONFIG_REGULATOR_LP3971 is not set
 # CONFIG_REGULATOR_LP3972 is not set
+# CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
-# CONFIG_REGULATOR_ISL6271A is not set
-# CONFIG_REGULATOR_AD5398 is not set
 # CONFIG_REGULATOR_TPS6524X is not set
 CONFIG_MEDIA_SUPPORT=y
 
@@ -1684,6 +1696,7 @@ CONFIG_IR_LIRC_CODEC=y
 # CONFIG_IR_REDRAT3 is not set
 # CONFIG_IR_STREAMZAP is not set
 # CONFIG_RC_LOOPBACK is not set
+# CONFIG_IR_GPIO_CIR is not set
 # CONFIG_MEDIA_ATTACH is not set
 CONFIG_MEDIA_TUNER=y
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
@@ -1824,29 +1837,45 @@ CONFIG_VIDEO_EM28XX_RC=y
 # CONFIG_USB_S2255 is not set
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 # CONFIG_V4L_MEM2MEM_DRIVERS is not set
-CONFIG_VIDEO_SUN7I_CEDAR=m
-CONFIG_VIDEO_DECODER_SUN7I=m
-# CONFIG_VIDEO_CSI_SUNXI is not set
-# CONFIG_AW_TSC is not set
-# CONFIG_SUN7I_TVD is not set
+CONFIG_VIDEO_CSI_SUN4I=y
+# CONFIG_CSI_OV7670 is not set
+# CONFIG_CSI_GT2005 is not set
+# CONFIG_CSI_GC0308 is not set
+# CONFIG_CSI_HI704 is not set
+# CONFIG_CSI_SP0838 is not set
+# CONFIG_CSI_MT9M112 is not set
+# CONFIG_CSI_MT9M113 is not set
+# CONFIG_CSI_OV2655 is not set
+# CONFIG_CSI_HI253 is not set
+# CONFIG_CSI_MT9D112 is not set
+# CONFIG_CSI_GC0307 is not set
+# CONFIG_CSI_OV5640 is not set
 # CONFIG_RADIO_ADAPTERS is not set
+# CONFIG_AUDIO_ENGINE is not set
 # CONFIG_PA_CONTROL is not set
 
 #
 # Graphics support
 #
 CONFIG_DRM=y
+CONFIG_DRM_MALI=m
+# CONFIG_DRM_UDL is not set
 CONFIG_ION=y
-CONFIG_ION_SUNXI_CARVEOUT_SIZE=360
+CONFIG_MALI=m
+CONFIG_MALI400=m
+# CONFIG_MALI400_DEBUG is not set
+# CONFIG_MALI400_GPU_UTILIZATION is not set
+CONFIG_UMP=m
+# CONFIG_UMP_DEBUG is not set
 # CONFIG_VGASTATE is not set
 CONFIG_VIDEO_OUTPUT_CONTROL=y
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FB_DDC is not set
 # CONFIG_FB_BOOT_VESA_SUPPORT is not set
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_CFB_FILLRECT=m
+CONFIG_FB_CFB_COPYAREA=m
+CONFIG_FB_CFB_IMAGEBLIT=m
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
 # CONFIG_FB_SYS_FILLRECT is not set
 # CONFIG_FB_SYS_COPYAREA is not set
@@ -1863,9 +1892,11 @@ CONFIG_FB_MODE_HELPERS=y
 #
 # Frame buffer hardware drivers
 #
-CONFIG_LYCHEE_FB_SUN7I=y
-CONFIG_LYCHEE_LCD_SUN7I=y
-CONFIG_LYCHEE_HDMI_SUN7I=y
+CONFIG_FB_SUNXI=m
+CONFIG_FB_SUNXI_RESERVED_MEM=y
+CONFIG_FB_SUNXI_UMP=y
+# CONFIG_FB_SUNXI_LCD is not set
+# CONFIG_HDMI_CEC is not set
 # CONFIG_FB_ARMCLCD is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_SMSCUFX is not set
@@ -1873,6 +1904,7 @@ CONFIG_LYCHEE_HDMI_SUN7I=y
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_BROADSHEET is not set
+# CONFIG_EXYNOS_VIDEO is not set
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
@@ -1924,16 +1956,16 @@ CONFIG_SND_USB=y
 # CONFIG_SND_USB_CAIAQ is not set
 # CONFIG_SND_USB_6FIRE is not set
 CONFIG_SND_SOC=y
-CONFIG_SND_SUN7I_SOC_CODEC=y
-CONFIG_SND_SUN7I_SOC_HDMIAUDIO=y
-CONFIG_SND_SUN7I_SOC_SPDIF=y
-CONFIG_SND_SUN7I_SOC_I2S_INTERFACE=y
+CONFIG_SOUND_SUNXI=m
+CONFIG_SND_SUNXI_SOC_CODEC=m
+CONFIG_SND_SUNXI_SOC_HDMIAUDIO=m
+CONFIG_SND_SUNXI_SOC_SPDIF=m
 CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_ALL_CODECS is not set
 # CONFIG_SOUND_PRIME is not set
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
-CONFIG_HID_BATTERY_STRENGTH=y
+# CONFIG_HID_BATTERY_STRENGTH is not set
 # CONFIG_HIDRAW is not set
 # CONFIG_UHID is not set
 
@@ -1983,22 +2015,24 @@ CONFIG_HID_MONTEREY=y
 # CONFIG_HID_PICOLCD is not set
 # CONFIG_HID_PRIMAX is not set
 # CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_SAITEK is not set
 # CONFIG_HID_SAMSUNG is not set
 # CONFIG_HID_SONY is not set
 # CONFIG_HID_SPEEDLINK is not set
 # CONFIG_HID_SUNPLUS is not set
 # CONFIG_HID_GREENASIA is not set
 # CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_TIVO is not set
 # CONFIG_HID_TOPSEED is not set
 # CONFIG_HID_THRUSTMASTER is not set
 # CONFIG_HID_ZEROPLUS is not set
 # CONFIG_HID_ZYDACRON is not set
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=y
-CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
 # CONFIG_USB_ARCH_HAS_XHCI is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=y
 # CONFIG_USB_DEBUG is not set
 # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
@@ -2020,24 +2054,21 @@ CONFIG_USB_DEVICE_CLASS=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
-# CONFIG_USB_EHCI_MV is not set
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1760_HCD is not set
 # CONFIG_USB_ISP1362_HCD is not set
 CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_HCD_PLATFORM is not set
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_R8A66597_HCD is not set
-CONFIG_USB_SW_SUN7I_HCD=y
-CONFIG_USB_SW_SUN7I_HCD0=y
-CONFIG_USB_SW_SUN7I_HCI=y
-CONFIG_USB_SW_SUN7I_EHCI0=y
-CONFIG_USB_SW_SUN7I_EHCI1=y
-CONFIG_USB_SW_SUN7I_OHCI0=y
-CONFIG_USB_SW_SUN7I_OHCI1=y
+CONFIG_USB_SUNXI_EHCI=y
+CONFIG_USB_SUNXI_OHCI=y
+CONFIG_USB_SUNXI_COMMON=y
 # CONFIG_USB_MUSB_HDRC is not set
 # CONFIG_USB_RENESAS_USBHS is not set
 
@@ -2071,7 +2102,6 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_KARMA is not set
 # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
 # CONFIG_USB_STORAGE_ENE_UB6250 is not set
-# CONFIG_USB_UAS is not set
 # CONFIG_USB_LIBUSUAL is not set
 
 #
@@ -2103,6 +2133,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=m
 # CONFIG_USB_SERIAL_IR is not set
 # CONFIG_USB_SERIAL_EDGEPORT is not set
 # CONFIG_USB_SERIAL_EDGEPORT_TI is not set
+# CONFIG_USB_SERIAL_F81232 is not set
 # CONFIG_USB_SERIAL_GARMIN is not set
 # CONFIG_USB_SERIAL_IPW is not set
 # CONFIG_USB_SERIAL_IUU is not set
@@ -2111,6 +2142,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=m
 # CONFIG_USB_SERIAL_KLSI is not set
 # CONFIG_USB_SERIAL_KOBIL_SCT is not set
 # CONFIG_USB_SERIAL_MCT_U232 is not set
+# CONFIG_USB_SERIAL_METRO is not set
 # CONFIG_USB_SERIAL_MOS7720 is not set
 # CONFIG_USB_SERIAL_MOS7840 is not set
 # CONFIG_USB_SERIAL_MOTOROLA is not set
@@ -2166,8 +2198,12 @@ CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_VBUS_DRAW=250
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-CONFIG_USB_SW_SUN7I_UDC0=y
-CONFIG_USB_GADGET_DUALSPEED=y
+# CONFIG_USB_FUSB300 is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_NET2272 is not set
+# CONFIG_USB_DUMMY_HCD is not set
 # CONFIG_USB_ZERO is not set
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_ETH is not set
@@ -2194,13 +2230,6 @@ CONFIG_USB_G_ANDROID=y
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ULPI is not set
 # CONFIG_NOP_USB_XCEIV is not set
-CONFIG_USB_SW_SUN7I_USB=y
-CONFIG_USB_SW_SUN7I_USB_MANAGER=y
-# CONFIG_USB_SW_SUN7I_USB0_NULL is not set
-# CONFIG_USB_SW_SUN7I_USB0_DEVICE_ONLY is not set
-# CONFIG_USB_SW_SUN7I_USB0_HOST_ONLY is not set
-CONFIG_USB_SW_SUN7I_USB0_OTG=y
-CONFIG_USB_SW_SUN7I_USB_DEBUG=y
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_UNSAFE_RESUME=y
@@ -2226,11 +2255,21 @@ CONFIG_MMC_BLOCK_MINORS=16
 # CONFIG_MMC_SDHCI_PXAV3 is not set
 # CONFIG_MMC_SDHCI_PXAV2 is not set
 # CONFIG_MMC_DW is not set
-CONFIG_MMC_SUN7I=y
+CONFIG_MMC_SUNXI_NEW=y
 # CONFIG_MMC_DEBUG_SUNXI is not set
 CONFIG_MMC_PRE_DBGLVL_SUNXI=3
 # CONFIG_MMC_VUB300 is not set
 # CONFIG_MMC_USHC is not set
+
+#
+# MMC/SD/SDIO Card Power Management Drivers
+#
+# CONFIG_MMC_SUNXI_POWER_CONTROL is not set
+
+#
+# SUNXI MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_SUNXI is not set
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
@@ -2246,6 +2285,7 @@ CONFIG_LEDS_SUNXI=y
 # CONFIG_LEDS_LP5521 is not set
 # CONFIG_LEDS_LP5523 is not set
 # CONFIG_LEDS_PCA955X is not set
+# CONFIG_LEDS_PCA9633 is not set
 # CONFIG_LEDS_DAC124S085 is not set
 # CONFIG_LEDS_REGULATOR is not set
 # CONFIG_LEDS_BD2802 is not set
@@ -2261,13 +2301,14 @@ CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+# CONFIG_LEDS_TRIGGER_CPU is not set
 CONFIG_LEDS_TRIGGER_GPIO=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_LEDS_TRIGGER_SLEEP=y
 
 #
 # iptables trigger is under Netfilter config (LED target)
 #
+# CONFIG_SWITCH is not set
 # CONFIG_ACCESSIBILITY is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
@@ -2282,10 +2323,6 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_INTF_ALARM=y
-CONFIG_RTC_INTF_ALARM_DEV=y
-# CONFIG_RTC_ALARM_CLOCK_WAKEUP is not set
-# CONFIG_RTC_ALARM_SHUTDOWN_WAKEUP is not set
 # CONFIG_RTC_DRV_TEST is not set
 
 #
@@ -2346,7 +2383,7 @@ CONFIG_RTC_INTF_ALARM_DEV=y
 #
 # CONFIG_RTC_DRV_PL030 is not set
 # CONFIG_RTC_DRV_PL031 is not set
-CONFIG_RTC_DRV_SUN7I=y
+CONFIG_RTC_DRV_SUN4I=y
 # CONFIG_DMADEVICES is not set
 # CONFIG_AUXDISPLAY is not set
 # CONFIG_UIO is not set
@@ -2375,8 +2412,6 @@ CONFIG_STAGING=y
 # CONFIG_USB_SERIAL_QUATECH_USB2 is not set
 # CONFIG_VT6656 is not set
 # CONFIG_IIO is not set
-# CONFIG_XVMALLOC is not set
-# CONFIG_ZRAM is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_USB_ENESTORAGE is not set
 # CONFIG_BCM_WIMAX is not set
@@ -2403,23 +2438,26 @@ CONFIG_ANDROID_TIMED_OUTPUT=y
 # CONFIG_ANDROID_TIMED_GPIO is not set
 # CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
 CONFIG_ANDROID_SWITCH=y
-CONFIG_SWITCH_HEADSET=y
 CONFIG_ANDROID_SWITCH_GPIO=y
+# CONFIG_ANDROID_INTF_ALARM_DEV is not set
+# CONFIG_PHONE is not set
+# CONFIG_USB_WPAN_HCD is not set
 CONFIG_CLKDEV_LOOKUP=y
-CONFIG_HAVE_MACH_CLKDEV=y
 
 #
 # Hardware Spinlock drivers
 #
 # CONFIG_IOMMU_SUPPORT is not set
-# CONFIG_VIRT_DRIVERS is not set
-# CONFIG_PM_DEVFREQ is not set
-# CONFIG_GSENSOR is not set
-# CONFIG_NEW_GPIO is not set
 
 #
-# gpu
+# Remoteproc drivers (EXPERIMENTAL)
+#
+
+#
+# Rpmsg drivers (EXPERIMENTAL)
 #
+# CONFIG_VIRT_DRIVERS is not set
+# CONFIG_PM_DEVFREQ is not set
 
 #
 # File systems
@@ -2526,6 +2564,7 @@ CONFIG_CRAMFS=y
 # CONFIG_OMFS_FS is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX6FS_FS is not set
 # CONFIG_ROMFS_FS is not set
 # CONFIG_PSTORE is not set
 # CONFIG_SYSV_FS is not set
@@ -2541,6 +2580,7 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_DEBUG is not set
 # CONFIG_CEPH_FS is not set
 # CONFIG_CIFS is not set
 # CONFIG_NCP_FS is not set
@@ -2604,6 +2644,8 @@ CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_SHIRQ is not set
 # CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_HARDLOCKUP_DETECTOR_NMI is not set
+# CONFIG_HARDLOCKUP_DETECTOR_OTHER_CPU is not set
 # CONFIG_HARDLOCKUP_DETECTOR is not set
 # CONFIG_DETECT_HUNG_TASK is not set
 # CONFIG_SCHED_DEBUG is not set
@@ -2642,6 +2684,8 @@ CONFIG_DEBUG_LIST=y
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_RCU_CPU_STALL_VERBOSE=y
+# CONFIG_RCU_CPU_STALL_INFO is not set
+# CONFIG_RCU_TRACE is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
@@ -2649,7 +2693,6 @@ CONFIG_RCU_CPU_STALL_VERBOSE=y
 # CONFIG_LKDTM is not set
 # CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
 # CONFIG_FAULT_INJECTION is not set
-# CONFIG_SYSCTL_SYSCALL_CHECK is not set
 CONFIG_DEBUG_PAGEALLOC=y
 CONFIG_WANT_PAGE_DEBUG_FLAGS=y
 CONFIG_PAGE_POISONING=y
@@ -2672,9 +2715,9 @@ CONFIG_ARM_UNWIND=y
 CONFIG_DEBUG_USER=y
 # CONFIG_DEBUG_RODATA is not set
 CONFIG_DEBUG_LL=y
-# CONFIG_DEBUG_LL_UART_NONE is not set
+CONFIG_DEBUG_LL_UART_NONE=y
 # CONFIG_DEBUG_ICEDCC is not set
-CONFIG_DEBUG_AW_UART0=y
+# CONFIG_DEBUG_SEMIHOSTING is not set
 CONFIG_EARLY_PRINTK=y
 # CONFIG_OC_ETM is not set
 
@@ -2797,11 +2840,17 @@ CONFIG_CRYPTO_DEFLATE=y
 #
 CONFIG_BITREVERSE=y
 CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IO=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 # CONFIG_CRC_T10DIF is not set
 CONFIG_CRC_ITU_T=y
 CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
 # CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 # CONFIG_CRC8 is not set