diff --git a/conf/machine/allwinner-a10.conf b/conf/machine/mele.conf
similarity index 83%
rename from conf/machine/allwinner-a10.conf
rename to conf/machine/mele.conf
index f47f90c..e445ccc 100644
--- a/conf/machine/allwinner-a10.conf
+++ b/conf/machine/mele.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
-#@NAME: Allwinner A10 machine
-#@DESCRIPTION: Machine configuration for the Allwinner A10 boards
+#@NAME: Mele a1000/a2000
+#@DESCRIPTION: Machine configuration for the Mele a1000 and a2000, base on allwinner a10 CPU
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
@@ -31,6 +31,4 @@ IMAGE_FSTYPES += "tar.bz2 squashfs a10-sdimg"
 # Guesswork
 SERIAL_CONSOLE = "115200 ttyS0"
 
-#EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x40000 -s 4096"
-
 MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"
diff --git a/conf/machine/olinuxino-a13.conf b/conf/machine/olinuxino-a13.conf
new file mode 100644
index 0000000..1c900c4
--- /dev/null
+++ b/conf/machine/olinuxino-a13.conf
@@ -0,0 +1,35 @@
+#@TYPE: Machine
+#@NAME: Olimex A13-OLinuXino Board
+#@DESCRIPTION: Machine configuration for the Olime A13-OLinuXino Board, base on allwinner a13 CPU
+#https://github.com/OLIMEX/OLINUXINO
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-input-keyboard"
+
+# Only has DVI connector for external screen
+GUI_MACHINE_CLASS = "bigscreen"
+
+DEFAULTTUNE="cortexa8hf-neon"
+
+require conf/machine/include/tune-cortexa8.inc
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux-libc-headers = "3.0.8"
+
+KERNEL_IMAGETYPE = "uImage"
+
+UBOOT_MACHINE = "a13_olinuxino"
+UBOOT_ENTRYPOINT = "0x40008000"
+UBOOT_LOADADDRESS = "0x40008000"
+
+SPL_BINARY = "sunxi-spl.bin"
+
+IMAGE_FSTYPES += "tar.bz2 squashfs a10-sdimg"
+
+# Guesswork
+SERIAL_CONSOLE = "115200 ttyS0"
+
+MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"
diff --git a/recipes-bsp/u-boot/u-boot_git.bb b/recipes-bsp/u-boot/u-boot_git.bb
index 2181a9c..fdf9cd5 100644
--- a/recipes-bsp/u-boot/u-boot_git.bb
+++ b/recipes-bsp/u-boot/u-boot_git.bb
@@ -3,15 +3,15 @@ require recipes-bsp/u-boot/u-boot.inc
 LICENSE = "GPL"
 
 # No patches for other machines yet
-COMPATIBLE_MACHINE = "allwinner-a10"
+COMPATIBLE_MACHINE = "(mele|olinuxino-a13)"
 
-DEFAULT_PREFERENCE_allwinner-a10 = "1"
+DEFAULT_PREFERENCE_mele= "1"
+DEFAULT_PREFERENCE_olinuxino-a13= "1"
 
-SRC_URI = "git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=git;branch=sunxi \
-          "
+SRC_URI = "git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=git;branch=sunxi"
 
-SRCREV = "b255c5fbe07afd488160ca67c1290955553a25e8"
-PR = "r3"
+SRCREV = "20efdee8e1e1807af7621e2dad0c23ba0b2186e7"
+PR = "r4"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
 
diff --git a/recipes-kernel/linux/linux-allwinner-git/csi/3.0.8-fix-csi-inline.patch b/recipes-kernel/linux/linux-allwinner-git/csi/3.0.8-fix-csi-inline.patch
deleted file mode 100644
index e60dc8b..0000000
--- a/recipes-kernel/linux/linux-allwinner-git/csi/3.0.8-fix-csi-inline.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/drivers/media/video/sun4i_csi/include/sun4i_csi_core.h b/drivers/media/video/sun4i_csi/include/sun4i_csi_core.h
-index 010814d..9e0e5f2 100755
---- a/drivers/media/video/sun4i_csi/include/sun4i_csi_core.h
-+++ b/drivers/media/video/sun4i_csi/include/sun4i_csi_core.h
-@@ -357,12 +357,12 @@ struct csi_dev {
- void  bsp_csi_open(struct csi_dev *dev);
- void  bsp_csi_close(struct csi_dev *dev);
- void  bsp_csi_configure(struct csi_dev *dev,__csi_conf_t *mode);
--void	inline  bsp_csi_set_buffer_address(struct csi_dev *dev,__csi_buf_t buf, u32 addr);
--u32		inline  bsp_csi_get_buffer_address(struct csi_dev *dev,__csi_buf_t buf);
-+void bsp_csi_set_buffer_address(struct csi_dev *dev,__csi_buf_t buf, u32 addr);
-+u32 bsp_csi_get_buffer_address(struct csi_dev *dev,__csi_buf_t buf);
- void  bsp_csi_double_buffer_enable(struct csi_dev *dev);
- void  bsp_csi_double_buffer_disable(struct csi_dev *dev);
--void	inline  bsp_csi_double_buffer_select_next(struct csi_dev *dev,__csi_double_buf_t type);
--void	inline  bsp_csi_double_buffer_get_status(struct csi_dev *dev,__csi_double_buf_status_t * status);
-+void bsp_csi_double_buffer_select_next(struct csi_dev *dev,__csi_double_buf_t type);
-+void bsp_csi_double_buffer_get_status(struct csi_dev *dev,__csi_double_buf_status_t * status);
- void  bsp_csi_capture_video_start(struct csi_dev *dev);
- void  bsp_csi_capture_video_stop(struct csi_dev *dev);
- void  bsp_csi_capture_picture(struct csi_dev *dev);
-@@ -371,7 +371,7 @@ void 	bsp_csi_set_size(struct csi_dev *dev, u32 length_h, u32 length_v, u32 buf_
- void 	bsp_csi_set_offset(struct csi_dev *dev,u32 start_h, u32 start_v);
- void  bsp_csi_int_enable(struct csi_dev *dev,__csi_int_t interrupt);
- void  bsp_csi_int_disable(struct csi_dev *dev,__csi_int_t interrupt);
--void 	inline 	bsp_csi_int_get_status(struct csi_dev *dev,__csi_int_status_t * status);
--void 	inline bsp_csi_int_clear_status(struct csi_dev *dev,__csi_int_t interrupt);
-+void bsp_csi_int_get_status(struct csi_dev *dev,__csi_int_status_t * status);
-+void bsp_csi_int_clear_status(struct csi_dev *dev,__csi_int_t interrupt);
- 
- #endif  /* _CSI_H_ */
diff --git a/recipes-kernel/linux/linux-allwinner_git.bb b/recipes-kernel/linux/linux-allwinner_git.bb
deleted file mode 100644
index 48af110..0000000
--- a/recipes-kernel/linux/linux-allwinner_git.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-require recipes-kernel/linux/linux.inc
-
-COMPATIBLE_MACHINE = "allwinner-a10"
-
-DESCRIPTION = "Linux kernel for Allwinner A10 boards"
-KERNEL_IMAGETYPE = "uImage"
-
-#DEFAULT_PREFERENCE = "-99"
-
-PV = "3.0.8+"
-SRCREV_pn-${PN} = "5080a650d1c91e6da2f29d4480bbf7e44b08cfad"
-
-FILESEXTRAPATHS := "${THISDIR}/${PN}-git"
-
-# The main PR is now using MACHINE_KERNEL_PR
-MACHINE_KERNEL_PR_append = "a"
-
-SRC_URI += "git://github.com/amery/linux-allwinner.git;protocol=git;branch=lichee-3.0.8-sun4i \
-            \
-            file://csi/3.0.8-fix-csi-inline.patch \
-            file://defconfig"
-
-S = "${WORKDIR}/git"
-
diff --git a/recipes-kernel/linux/linux/defconfig b/recipes-kernel/linux/linux/mele/defconfig
similarity index 100%
rename from recipes-kernel/linux/linux/defconfig
rename to recipes-kernel/linux/linux/mele/defconfig
diff --git a/recipes-kernel/linux/linux-allwinner-git/allwinner-a10/defconfig b/recipes-kernel/linux/linux/olinuxino-a13/defconfig
similarity index 86%
rename from recipes-kernel/linux/linux-allwinner-git/allwinner-a10/defconfig
rename to recipes-kernel/linux/linux/olinuxino-a13/defconfig
index e32c854..ba1c60c 100644
--- a/recipes-kernel/linux/linux-allwinner-git/allwinner-a10/defconfig
+++ b/recipes-kernel/linux/linux/olinuxino-a13/defconfig
@@ -1,9 +1,9 @@
 #
 # Automatically generated make config: don't edit
-# Linux/arm 3.0.8 Kernel Configuration
+# Linux/arm 3.0.42 Kernel Configuration
 #
 CONFIG_ARM=y
-CONFIG_CHIP_ID=1123
+CONFIG_CHIP_ID=1125
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_ARCH_USES_GETTIMEOFFSET is not set
 CONFIG_GENERIC_CLOCKEVENTS=y
@@ -72,7 +72,8 @@ CONFIG_TINY_RCU=y
 # CONFIG_PREEMPT_RCU is not set
 # CONFIG_RCU_TRACE is not set
 # CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=19
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
@@ -121,7 +122,7 @@ CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
-# CONFIG_ASHMEM is not set
+CONFIG_ASHMEM=y
 CONFIG_AIO=y
 # CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
@@ -245,7 +246,9 @@ CONFIG_MMU=y
 # CONFIG_ARCH_W90X900 is not set
 # CONFIG_ARCH_NUC93X is not set
 # CONFIG_ARCH_TEGRA is not set
-CONFIG_ARCH_SUN4I=y
+# CONFIG_ARCH_SUN3I is not set
+# CONFIG_ARCH_SUN4I is not set
+CONFIG_ARCH_SUN5I=y
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PXA is not set
 # CONFIG_ARCH_MSM is not set
@@ -271,6 +274,10 @@ CONFIG_ARCH_SUN4I=y
 #
 # System MMU
 #
+CONFIG_SW_DEBUG_UART=1
+# CONFIG_SUNXI_IGNORE_ATAG_MEM is not set
+CONFIG_SUNXI_MALI_RESERVED_MEM=y
+CONFIG_MACH_SUN5I=y
 
 #
 # Processor Type
@@ -319,9 +326,8 @@ CONFIG_ARM_AMBA=y
 #
 # Kernel Features
 #
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_2G is not set
@@ -380,9 +386,7 @@ CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # CPU Frequency scaling
 #
 # CONFIG_CPU_FREQ is not set
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_CPU_IDLE is not set
 
 #
 # Floating point emulation
@@ -409,16 +413,20 @@ CONFIG_BINFMT_MISC=y
 #
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
-# CONFIG_WAKELOCK is not set
+CONFIG_HAS_WAKELOCK=y
+CONFIG_HAS_EARLYSUSPEND=y
+CONFIG_WAKELOCK=y
+CONFIG_WAKELOCK_STAT=y
+CONFIG_USER_WAKELOCK=y
+CONFIG_EARLYSUSPEND=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_RUNTIME=y
+# CONFIG_PM_RUNTIME is not set
 CONFIG_PM=y
-CONFIG_PM_DEBUG=y
-# CONFIG_PM_ADVANCED_DEBUG is not set
-# CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_CAN_PM_TRACE=y
+# CONFIG_PM_DEBUG is not set
 # CONFIG_APM_EMULATION is not set
-CONFIG_PM_RUNTIME_CLK=y
 # CONFIG_SUSPEND_TIME is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_NET=y
@@ -457,7 +465,7 @@ CONFIG_INET_LRO=y
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_IPV6 is not set
-CONFIG_ANDROID_PARANOID_NETWORK=y
+# CONFIG_ANDROID_PARANOID_NETWORK is not set
 CONFIG_NET_ACTIVITY_STATS=y
 CONFIG_NETWORK_SECMARK=y
 # CONFIG_NETFILTER is not set
@@ -486,31 +494,7 @@ CONFIG_NET_PKTGEN=m
 # CONFIG_HAMRADIO is not set
 # CONFIG_CAN is not set
 # CONFIG_IRDA is not set
-CONFIG_BT=y
-CONFIG_BT_L2CAP=y
-CONFIG_BT_SCO=y
-CONFIG_BT_RFCOMM=y
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=y
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-# CONFIG_BT_HIDP is not set
-
-#
-# Bluetooth device drivers
-#
-# CONFIG_BT_HCIBTUSB is not set
-# CONFIG_BT_HCIBTSDIO is not set
-CONFIG_BT_HCIUART=y
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-# CONFIG_BT_HCIUART_ATH3K is not set
-CONFIG_BT_HCIUART_LL=y
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIBFUSB is not set
-# CONFIG_BT_HCIVHCI is not set
-# CONFIG_BT_MRVL is not set
+# CONFIG_BT is not set
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=y
 CONFIG_WEXT_CORE=y
@@ -527,13 +511,17 @@ CONFIG_CFG80211_WEXT=y
 CONFIG_WIRELESS_EXT_SYSFS=y
 # CONFIG_LIB80211 is not set
 # CONFIG_CFG80211_ALLOW_RECONNECT is not set
-# CONFIG_MAC80211 is not set
+CONFIG_MAC80211=y
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
 # CONFIG_WIMAX is not set
-CONFIG_RFKILL=y
-CONFIG_RFKILL_PM=y
-CONFIG_RFKILL_INPUT=y
+# CONFIG_RFKILL is not set
 # CONFIG_RFKILL_REGULATOR is not set
-CONFIG_SUNXI_RFKILL=y
 # CONFIG_NET_9P is not set
 # CONFIG_CAIF is not set
 
@@ -555,6 +543,7 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_SYNC is not set
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
 # CONFIG_MTD is not set
@@ -565,20 +554,21 @@ CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_CRYPTOLOOP=y
 # CONFIG_BLK_DEV_DRBD is not set
 # CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_UB=y
 CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=2
+CONFIG_BLK_DEV_RAM_COUNT=4
 CONFIG_BLK_DEV_RAM_SIZE=4096
 # CONFIG_BLK_DEV_XIP is not set
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-CONFIG_SUN4I_NANDFLASH=y
+CONFIG_SUN5I_NANDFLASH=y
+CONFIG_SUNXI_NAND=y
+# CONFIG_SUNXI_NAND_TEST is not set
 # CONFIG_SENSORS_LIS3LV02D is not set
 CONFIG_MISC_DEVICES=y
 # CONFIG_AD525X_DPOT is not set
-# CONFIG_SUN4I_VIBRATOR is not set
-CONFIG_SUNXI_DBGREG=m
-CONFIG_ANDROID_PMEM=y
+CONFIG_SUN4I_GPIO_UGLY=y
+# CONFIG_SUNXI_DBGREG is not set
 # CONFIG_INTEL_MID_PTI is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
 # CONFIG_APDS9802ALS is not set
@@ -590,21 +580,23 @@ CONFIG_ANDROID_PMEM=y
 # CONFIG_SENSORS_APDS990X is not set
 # CONFIG_HMC6352 is not set
 # CONFIG_SENSORS_AK8975 is not set
+# CONFIG_TI_DAC7512 is not set
 # CONFIG_UID_STAT is not set
 # CONFIG_BMP085 is not set
-# CONFIG_WL127X_RFKILL is not set
 # CONFIG_APANIC is not set
 
 #
 # EEPROM support
 #
 # CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_AT25 is not set
 # CONFIG_EEPROM_LEGACY is not set
 # CONFIG_EEPROM_93CX6 is not set
 
 #
 # Texas Instruments shared transport line discipline
 #
+# CONFIG_SENSORS_LIS3_SPI is not set
 # CONFIG_SENSORS_LIS3_I2C is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
@@ -653,7 +645,25 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_DH is not set
 # CONFIG_SCSI_OSD_INITIATOR is not set
 # CONFIG_ATA is not set
-# CONFIG_MD is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_AUTODETECT=y
+CONFIG_MD_LINEAR=y
+# CONFIG_MD_RAID0 is not set
+# CONFIG_MD_RAID1 is not set
+# CONFIG_MD_RAID10 is not set
+# CONFIG_MD_RAID456 is not set
+CONFIG_MD_MULTIPATH=y
+CONFIG_MD_FAULTY=y
+CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_CRYPT=y
+CONFIG_DM_SNAPSHOT=y
+CONFIG_DM_MIRROR=y
+CONFIG_DM_ZERO=y
+CONFIG_DM_MULTIPATH=y
+CONFIG_DM_MULTIPATH_QL=y
+CONFIG_DM_MULTIPATH_ST=y
 # CONFIG_TARGET_CORE is not set
 CONFIG_NETDEVICES=y
 # CONFIG_DUMMY is not set
@@ -683,18 +693,43 @@ CONFIG_PHYLIB=y
 # CONFIG_MICREL_PHY is not set
 # CONFIG_FIXED_PHY is not set
 # CONFIG_MDIO_BITBANG is not set
-# CONFIG_NET_ETHERNET is not set
+CONFIG_NET_ETHERNET=y
+# CONFIG_AX88796 is not set
+# CONFIG_SMC91X is not set
+# CONFIG_DM9000 is not set
+# CONFIG_ETHOC is not set
+# CONFIG_SMC911X is not set
+# CONFIG_SMSC911X is not set
+# CONFIG_DNET is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+# CONFIG_B44 is not set
+# CONFIG_KS8851 is not set
+# CONFIG_KS8851_MLL is not set
+# CONFIG_FTMAC100 is not set
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
 CONFIG_WLAN=y
+# CONFIG_LIBERTAS_THINFIRM is not set
+# CONFIG_AT76C50X_USB is not set
 # CONFIG_USB_ZD1201 is not set
+# CONFIG_RTL8187 is not set
+# CONFIG_MAC80211_HWSIM is not set
 # CONFIG_WIFI_CONTROL_FUNC is not set
 # CONFIG_ATH_COMMON is not set
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
 # CONFIG_BCM4329 is not set
 CONFIG_BCM4330=m
 # CONFIG_BCMDHD is not set
 # CONFIG_HOSTAP is not set
 # CONFIG_LIBERTAS is not set
+# CONFIG_RT2X00 is not set
 # CONFIG_MWIFIEX is not set
 CONFIG_RTL8192CU_SW=m
 
@@ -708,7 +743,6 @@ CONFIG_RTL8192CU_SW=m
 # CONFIG_USB_KAWETH is not set
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_USBNET is not set
-# CONFIG_USB_HSO is not set
 # CONFIG_USB_IPHETH is not set
 # CONFIG_WAN is not set
 
@@ -720,7 +754,7 @@ CONFIG_RTL8192CU_SW=m
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
-CONFIG_WEMAC_SUN4I=y
+# CONFIG_WEMAC_SUN4I is not set
 # CONFIG_ISDN is not set
 # CONFIG_PHONE is not set
 
@@ -739,10 +773,10 @@ CONFIG_INPUT_MOUSEDEV=y
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=y
+# CONFIG_INPUT_JOYDEV is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
-CONFIG_INPUT_KEYRESET=y
+# CONFIG_INPUT_KEYRESET is not set
 
 #
 # Input Device Drivers
@@ -765,46 +799,13 @@ CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYBOARD_SUN4IKEYPAD=m
 CONFIG_KEYBOARD_SUN4I_KEYBOARD=m
 CONFIG_KEYBOARD_HV2605_KEYBOARD=m
-CONFIG_IR_SUN4I=m
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-# CONFIG_MOUSE_PS2_ELANTECH is not set
-# CONFIG_MOUSE_PS2_SENTELIC is not set
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_BCM5974 is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_MOUSE_SYNAPTICS_I2C is not set
-CONFIG_INPUT_JOYSTICK=y
-# CONFIG_JOYSTICK_ANALOG is not set
-# CONFIG_JOYSTICK_A3D is not set
-# CONFIG_JOYSTICK_ADI is not set
-# CONFIG_JOYSTICK_COBRA is not set
-# CONFIG_JOYSTICK_GF2K is not set
-# CONFIG_JOYSTICK_GRIP is not set
-# CONFIG_JOYSTICK_GRIP_MP is not set
-# CONFIG_JOYSTICK_GUILLEMOT is not set
-# CONFIG_JOYSTICK_INTERACT is not set
-# CONFIG_JOYSTICK_SIDEWINDER is not set
-# CONFIG_JOYSTICK_TMDC is not set
-# CONFIG_JOYSTICK_IFORCE is not set
-# CONFIG_JOYSTICK_WARRIOR is not set
-# CONFIG_JOYSTICK_MAGELLAN is not set
-# CONFIG_JOYSTICK_SPACEORB is not set
-# CONFIG_JOYSTICK_SPACEBALL is not set
-# CONFIG_JOYSTICK_STINGER is not set
-# CONFIG_JOYSTICK_TWIDJOY is not set
-# CONFIG_JOYSTICK_ZHENHUA is not set
-# CONFIG_JOYSTICK_AS5011 is not set
-# CONFIG_JOYSTICK_JOYDUMP is not set
-# CONFIG_JOYSTICK_XPAD is not set
+# CONFIG_IR_SUN5I is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
 # CONFIG_TOUCHSCREEN_AD7879 is not set
 # CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
 # CONFIG_TOUCHSCREEN_BU21013 is not set
@@ -826,11 +827,14 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
 # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
 # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
 # CONFIG_TOUCHSCREEN_TSC2007 is not set
 # CONFIG_TOUCHSCREEN_W90X900 is not set
 # CONFIG_TOUCHSCREEN_ST1232 is not set
 # CONFIG_TOUCHSCREEN_TPS6507X is not set
 CONFIG_TOUCHSCREEN_GT801=m
+CONFIG_TOUCHSCREEN_GT811=m
+CONFIG_TOUCHSCREEN_GT818=m
 CONFIG_TOUCHSCREEN_SUN4I_TS=m
 CONFIG_TOUCHSCREEN_FT5X_TS=m
 CONFIG_TOUCHSCREEN_ZT8031=m
@@ -874,8 +878,8 @@ CONFIG_DEVMEM=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_SUNXI=y
-CONFIG_SERIAL_8250_NR_UARTS=8
-CONFIG_SERIAL_8250_RUNTIME_UARTS=8
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SERIAL_8250_EXTENDED is not set
 
 #
@@ -883,6 +887,8 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=8
 #
 # CONFIG_SERIAL_AMBA_PL010 is not set
 # CONFIG_SERIAL_AMBA_PL011 is not set
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX3107 is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_TIMBERDALE is not set
@@ -896,7 +902,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_DCC_TTY is not set
 # CONFIG_RAMOOPS is not set
-CONFIG_SUN4I_G2D=y
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
@@ -914,7 +919,7 @@ CONFIG_I2C_HELPER_AUTO=y
 # CONFIG_I2C_PCA_PLATFORM is not set
 # CONFIG_I2C_PXA_PCI is not set
 # CONFIG_I2C_SIMTEC is not set
-CONFIG_I2C_SUN4I=y
+CONFIG_I2C_SUN5I=y
 # CONFIG_SUNXI_IIC_PRINT_TRANSFER_INFO is not set
 
 #
@@ -930,7 +935,25 @@ CONFIG_I2C_SUN4I=y
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_SPI is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_PL022 is not set
+# CONFIG_SPI_PXA2XX_PCI is not set
+CONFIG_SPI_SUN5I=y
+CONFIG_SUN5I_SPI_NDMA=y
+# CONFIG_SPI_DESIGNWARE is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_TLE62X0 is not set
 
 #
 # PPS support
@@ -998,15 +1021,15 @@ CONFIG_REGULATOR=y
 # 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
 
 #
 # Multimedia core support
 #
-CONFIG_VIDEO_DEV=y
-CONFIG_VIDEO_V4L2_COMMON=y
+# CONFIG_VIDEO_DEV is not set
 # CONFIG_DVB_CORE is not set
-CONFIG_VIDEO_MEDIA=y
+# CONFIG_VIDEO_MEDIA is not set
 
 #
 # Multimedia drivers
@@ -1026,59 +1049,10 @@ CONFIG_IR_LIRC_CODEC=y
 # CONFIG_IR_REDRAT3 is not set
 # CONFIG_IR_STREAMZAP is not set
 # CONFIG_RC_LOOPBACK is not set
-# CONFIG_MEDIA_ATTACH is not set
-CONFIG_MEDIA_TUNER=y
-CONFIG_MEDIA_TUNER_CUSTOMISE=y
-
-#
-# Customize TV tuners
-#
-# CONFIG_MEDIA_TUNER_SIMPLE is not set
-# CONFIG_MEDIA_TUNER_TDA8290 is not set
-# CONFIG_MEDIA_TUNER_TDA827X is not set
-# CONFIG_MEDIA_TUNER_TDA18271 is not set
-# CONFIG_MEDIA_TUNER_TDA9887 is not set
-# CONFIG_MEDIA_TUNER_TEA5767 is not set
-# CONFIG_MEDIA_TUNER_MT20XX is not set
-# CONFIG_MEDIA_TUNER_MT2060 is not set
-# CONFIG_MEDIA_TUNER_MT2266 is not set
-# CONFIG_MEDIA_TUNER_MT2131 is not set
-# CONFIG_MEDIA_TUNER_QT1010 is not set
-# CONFIG_MEDIA_TUNER_XC2028 is not set
-# CONFIG_MEDIA_TUNER_XC5000 is not set
-# CONFIG_MEDIA_TUNER_MXL5005S is not set
-# CONFIG_MEDIA_TUNER_MXL5007T is not set
-# CONFIG_MEDIA_TUNER_MC44S803 is not set
-# CONFIG_MEDIA_TUNER_MAX2165 is not set
-# CONFIG_MEDIA_TUNER_TDA18218 is not set
-# CONFIG_MEDIA_TUNER_TDA18212 is not set
-CONFIG_VIDEO_V4L2=y
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_CONTIG=m
-# CONFIG_VIDEO_CAPTURE_DRIVERS is not set
-# CONFIG_V4L_MEM2MEM_DRIVERS is not set
-CONFIG_VIDEO_SUN4I_CEDAR=y
-CONFIG_VIDEO_DECODER_SUN4I=y
 # CONFIG_VIDEO_AVS_COUNTER is not set
-CONFIG_VIDEO_CSI_SUN4I=y
-CONFIG_CSI_DEV_SEL=m
-CONFIG_CSI0_SUN4I=m
-CONFIG_CSI1_SUN4I=m
-CONFIG_CSI_OV7670=m
-CONFIG_CSI_GT2005=m
-CONFIG_CSI_GC0308=m
-CONFIG_CSI_HI704=m
-CONFIG_CSI_SP0838=m
-CONFIG_CSI_MT9M112=m
-CONFIG_CSI_MT9M113=m
-CONFIG_CSI_OV2655=m
-CONFIG_CSI_HI253=m
-CONFIG_CSI_MT9D112=m
-CONFIG_CSI_GC0307=m
-CONFIG_CSI_OV5640=m
-# CONFIG_RADIO_ADAPTERS is not set
-CONFIG_AUDIO_ENGINE=y
-CONFIG_ACE_CONFIG=y
+CONFIG_VIDEO_SUN5I_CEDAR=y
+CONFIG_VIDEO_DECODER_SUN5I=y
+# CONFIG_AUDIO_ENGINE is not set
 CONFIG_PA_CONTROL=y
 CONFIG_PA_CONFIG=y
 
@@ -1087,15 +1061,21 @@ CONFIG_PA_CONFIG=y
 #
 # CONFIG_DRM is not set
 # CONFIG_ION is not set
+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 is not set
 CONFIG_FB=y
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FB_DDC is not set
 # CONFIG_FB_BOOT_VESA_SUPPORT is not set
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
 # CONFIG_FB_SYS_FILLRECT is not set
 # CONFIG_FB_SYS_COPYAREA is not set
@@ -1106,15 +1086,23 @@ CONFIG_FB=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_MODE_HELPERS is not set
+CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_TILEBLITTING is not set
 
 #
 # Frame buffer hardware drivers
 #
-CONFIG_LYCHEE_FB_SUN4I=m
-CONFIG_LYCHEE_LCD_SUN4I=m
-CONFIG_LYCHEE_HDMI_SUN4I=m
+
+#
+# Display options for sun4i/sun5i
+#
+CONFIG_LYCHEE_FB_SUN5I=y
+CONFIG_FB_SUNXI=y
+CONFIG_FB_SUNXI_RESERVED_MEM=y
+CONFIG_FB_SUNXI_UMP=y
+CONFIG_LYCHEE_LCD_SUN5I=y
+CONFIG_FB_SUNXI_LCD=y
+# CONFIG_LYCHEE_HDMI_SUN5I is not set
 # CONFIG_FB_ARMCLCD is not set
 # CONFIG_FB_UVESA is not set
 # CONFIG_FB_S1D13XXX is not set
@@ -1133,7 +1121,12 @@ CONFIG_LYCHEE_HDMI_SUN4I=m
 # Console display driver support
 #
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE is not set
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
@@ -1144,7 +1137,6 @@ CONFIG_SND_JACK=y
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_PCM_OSS is not set
-# CONFIG_SND_HRTIMER is not set
 # CONFIG_SND_DYNAMIC_MINORS is not set
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_VERBOSE_PROCFS=y
@@ -1163,6 +1155,7 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_MPU401 is not set
 CONFIG_SND_ARM=y
 # CONFIG_SND_ARMAACI is not set
+CONFIG_SND_SPI=y
 CONFIG_SND_USB=y
 # CONFIG_SND_USB_AUDIO is not set
 # CONFIG_SND_USB_UA101 is not set
@@ -1170,17 +1163,18 @@ CONFIG_SND_USB=y
 # CONFIG_SND_USB_6FIRE is not set
 CONFIG_SND_SOC=y
 # CONFIG_SND_SOC_CACHE_LZO is not set
-CONFIG_SOUND_SUN4I=y
-CONFIG_SND_SUN4I_SOC_CODEC=y
-CONFIG_SND_SUN4I_SOC_HDMIAUDIO=y
-CONFIG_SND_SUN4I_SOC_SPDIF=m
-CONFIG_SND_SUN4I_SOC_I2S_INTERFACE=m
+CONFIG_SOUND_SUN5I=y
+CONFIG_SND_SUN5I_SOC_CODEC=y
+# CONFIG_SND_SUN5I_SOC_HDMIAUDIO is not set
+CONFIG_SND_SUN5I_SOC_SPDIF=m
+CONFIG_SND_SUN5I_SOC_I2S_INTERFACE=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_HIDRAW is not set
+# CONFIG_UHID is not set
 
 #
 # USB Input Devices
@@ -1254,7 +1248,6 @@ CONFIG_USB=y
 # CONFIG_USB_DEVICEFS is not set
 CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_SUSPEND is not set
 # CONFIG_USB_MON is not set
 # CONFIG_USB_WUSB_CBAF is not set
 
@@ -1274,13 +1267,11 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_R8A66597_HCD is not set
-CONFIG_USB_SW_SUN4I_HCD=y
-CONFIG_USB_SW_SUN4I_HCD0=y
-CONFIG_USB_SW_SUN4I_HCI=y
-CONFIG_USB_SW_SUN4I_EHCI0=y
-CONFIG_USB_SW_SUN4I_EHCI1=y
-CONFIG_USB_SW_SUN4I_OHCI0=y
-CONFIG_USB_SW_SUN4I_OHCI1=y
+CONFIG_USB_SW_SUN5I_HCD=y
+CONFIG_USB_SW_SUN5I_HCD0=y
+CONFIG_USB_SW_SUN5I_HCI=y
+CONFIG_USB_SW_SUN5I_EHCI0=y
+CONFIG_USB_SW_SUN5I_OHCI0=y
 # CONFIG_USB_MUSB_HDRC is not set
 
 #
@@ -1338,7 +1329,7 @@ CONFIG_USB_STORAGE_ENE_UB6250=y
 # CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_LED is not set
-# CONFIG_USB_CYPRESS_CY7C63 is not set
+CONFIG_USB_CYPRESS_CY7C63=m
 # CONFIG_USB_CYTHERM is not set
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_FTDI_ELAN is not set
@@ -1356,35 +1347,40 @@ CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_SELECTED=y
-CONFIG_USB_SW_SUN4I_UDC0=y
+# CONFIG_USB_GADGET_FUSB300 is not set
+# CONFIG_USB_GADGET_R8A66597 is not set
+# CONFIG_USB_GADGET_PXA_U2O is not set
+# CONFIG_USB_GADGET_M66592 is not set
+CONFIG_USB_SW_SUN5I_UDC0=y
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
 CONFIG_USB_GADGET_DUALSPEED=y
 # CONFIG_USB_ZERO is not set
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_ETH is not set
 # CONFIG_USB_G_NCM is not set
-CONFIG_USB_FILE_STORAGE=m
-CONFIG_USB_FILE_STORAGE_TEST=y
+# CONFIG_USB_FILE_STORAGE is not set
 # CONFIG_USB_MASS_STORAGE is not set
 # CONFIG_USB_G_SERIAL is not set
 # CONFIG_USB_G_PRINTER is not set
+CONFIG_USB_G_ANDROID=y
 # CONFIG_USB_CDC_COMPOSITE is not set
 # CONFIG_USB_G_MULTI is not set
 # CONFIG_USB_G_HID is not set
 # CONFIG_USB_G_DBGP is not set
-# CONFIG_USB_G_WEBCAM is not set
 
 #
 # OTG and related infrastructure
 #
+# CONFIG_USB_OTG_WAKELOCK is not set
 # CONFIG_USB_ULPI is not set
 # CONFIG_NOP_USB_XCEIV is not set
-CONFIG_USB_SW_SUN4I_USB=y
-CONFIG_USB_SW_SUN4I_USB_MANAGER=y
-# CONFIG_USB_SW_SUN4I_USB0_NULL is not set
-# CONFIG_USB_SW_SUN4I_USB0_DEVICE_ONLY is not set
-# CONFIG_USB_SW_SUN4I_USB0_HOST_ONLY is not set
-CONFIG_USB_SW_SUN4I_USB0_OTG=y
-CONFIG_USB_SW_SUN4I_USB_DEBUG=y
+CONFIG_USB_SW_SUN5I_USB=y
+CONFIG_USB_SW_SUN5I_USB_MANAGER=y
+# CONFIG_USB_SW_SUN5I_USB0_NULL is not set
+# CONFIG_USB_SW_SUN5I_USB0_DEVICE_ONLY is not set
+# CONFIG_USB_SW_SUN5I_USB0_HOST_ONLY is not set
+CONFIG_USB_SW_SUN5I_USB0_OTG=y
+CONFIG_USB_SW_SUN5I_USB_DEBUG=y
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_UNSAFE_RESUME=y
@@ -1408,11 +1404,11 @@ CONFIG_MMC_SUNXI_POWER_CONTROL=y
 # SUNXI MMC/SD/SDIO Host Controller Drivers
 #
 CONFIG_MMC_SUNXI=y
-# CONFIG_MMC_SUNXI_DBG is not set
+CONFIG_MMC_SUNXI_DBG=y
 # CONFIG_MEMSTICK is not set
 # CONFIG_NEW_LEDS is not set
 # CONFIG_NFC_DEVICES is not set
-# CONFIG_SWITCH is not set
+CONFIG_SWITCH=y
 # CONFIG_ACCESSIBILITY is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
@@ -1444,6 +1440,7 @@ CONFIG_RTC_INTF_ALARM_DEV=y
 # CONFIG_RTC_DRV_ISL12022 is not set
 # CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
+CONFIG_RTC_DRV_SUN5I=y
 # CONFIG_RTC_DRV_PCF8583 is not set
 # CONFIG_RTC_DRV_M41T80 is not set
 # CONFIG_RTC_DRV_BQ32K is not set
@@ -1457,6 +1454,15 @@ CONFIG_RTC_INTF_ALARM_DEV=y
 #
 # SPI RTC drivers
 #
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
 
 #
 # Platform RTC drivers
@@ -1480,7 +1486,6 @@ CONFIG_RTC_INTF_ALARM_DEV=y
 #
 # CONFIG_RTC_DRV_PL030 is not set
 # CONFIG_RTC_DRV_PL031 is not set
-CONFIG_RTC_DRV_SUN4I=y
 # CONFIG_DMADEVICES is not set
 # CONFIG_AUXDISPLAY is not set
 # CONFIG_UIO is not set
@@ -1497,25 +1502,16 @@ CONFIG_STAGING=y
 #
 # Android
 #
-CONFIG_ANDROID=y
-CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_LOGGER=y
-CONFIG_ANDROID_RAM_CONSOLE=y
-CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y
-CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT=y
-CONFIG_ANDROID_RAM_CONSOLE_EARLY_ADDR=0
-CONFIG_ANDROID_RAM_CONSOLE_EARLY_SIZE=0
-CONFIG_ANDROID_TIMED_OUTPUT=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER=y
+# CONFIG_ANDROID is not set
 # CONFIG_POHMELFS is not set
 # CONFIG_LINE6_USB is not set
 # CONFIG_VT6656 is not set
 # CONFIG_IIO is not set
-# CONFIG_XVMALLOC is not set
-# CONFIG_ZRAM is not set
+CONFIG_XVMALLOC=y
+CONFIG_ZRAM=m
+# CONFIG_ZRAM_DEBUG is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_LIRC_STAGING is not set
-# CONFIG_EASYCAP is not set
 CONFIG_MACH_NO_WESTBRIDGE=y
 # CONFIG_ATH6K_LEGACY is not set
 # CONFIG_USB_ENESTORAGE is not set
@@ -1547,8 +1543,8 @@ CONFIG_EXT3_FS_XATTR=y
 # CONFIG_EXT3_FS_SECURITY is not set
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_XATTR=y
-# CONFIG_EXT4_FS_POSIX_ACL is not set
-# CONFIG_EXT4_FS_SECURITY is not set
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
 # CONFIG_EXT4_DEBUG is not set
 CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
@@ -1570,11 +1566,10 @@ CONFIG_QUOTA=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 # 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_QFMT_V2 is not set
 CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=y
+# CONFIG_AUTOFS4_FS is not set
 CONFIG_FUSE_FS=y
 CONFIG_CUSE=y
 CONFIG_GENERIC_ACL=y
@@ -1594,11 +1589,8 @@ CONFIG_CACHEFILES=y
 #
 # CD-ROM/DVD Filesystems
 #
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=y
-CONFIG_UDF_NLS=y
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
 
 #
 # DOS/FAT/NT Filesystems
@@ -1607,7 +1599,7 @@ CONFIG_FAT_FS=y
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 CONFIG_NTFS_FS=y
 # CONFIG_NTFS_DEBUG is not set
 CONFIG_NTFS_RW=y
@@ -1784,8 +1776,9 @@ CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_TEST_KSTRTOX is not set
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_LL is not set
-CONFIG_EARLY_PRINTK=y
+CONFIG_DEBUG_LL=y
+# CONFIG_EARLY_PRINTK is not set
+# CONFIG_DEBUG_ICEDCC is not set
 # CONFIG_OC_ETM is not set
 
 #
diff --git a/recipes-kernel/linux/linux_3.0.bb b/recipes-kernel/linux/linux_3.0.bb
index ce773fa..cc21856 100644
--- a/recipes-kernel/linux/linux_3.0.bb
+++ b/recipes-kernel/linux/linux_3.0.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Linux kernel for Allwinner a10 processors"
 
 KERNEL_IMAGETYPE = "uImage"
 
-COMPATIBLE_MACHINE = "(allwinner-a10)"
+COMPATIBLE_MACHINE = "(mele|olinuxino-a13)"
 
 PR = "5"