diff --git a/recipes-kernel/linux/linux/defconfig b/recipes-kernel/linux/linux/defconfig
index 57f39a1..10b3cfe 100644
--- a/recipes-kernel/linux/linux/defconfig
+++ b/recipes-kernel/linux/linux/defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/arm 3.0.39 Kernel Configuration
+# Linux/arm 3.0.42 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_CHIP_ID=1123
@@ -617,10 +617,11 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 CONFIG_SUN4I_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_SUN4I_GPIO_UGLY is not set
 CONFIG_SUNXI_DBGREG=m
 # CONFIG_INTEL_MID_PTI is not set
@@ -1195,9 +1196,9 @@ 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=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
@@ -1214,10 +1215,18 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 #
 # Frame buffer hardware drivers
 #
+
+#
+# Display options for sun4i/sun5i
+#
 CONFIG_LYCHEE_FB_SUN4I=m
-CONFIG_LYCHEE_FB_UMP_SUN4I=y
+CONFIG_FB_SUNXI=m
+CONFIG_FB_SUNXI_RESERVED_MEM=y
+CONFIG_FB_SUNXI_UMP=y
 CONFIG_LYCHEE_LCD_SUN4I=m
+CONFIG_FB_SUNXI_LCD=m
 CONFIG_LYCHEE_HDMI_SUN4I=m
+CONFIG_FB_SUNXI_HDMI=m
 # CONFIG_FB_ARMCLCD is not set
 # CONFIG_FB_UVESA is not set
 # CONFIG_FB_S1D13XXX is not set
@@ -1248,6 +1257,8 @@ CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_TIMER=y
 CONFIG_SND_PCM=y
+CONFIG_SND_HWDEP=y
+CONFIG_SND_RAWMIDI=y
 CONFIG_SND_JACK=y
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_MIXER_OSS is not set
@@ -1272,10 +1283,10 @@ CONFIG_SND_DRIVERS=y
 CONFIG_SND_ARM=y
 # CONFIG_SND_ARMAACI is not set
 CONFIG_SND_USB=y
-# CONFIG_SND_USB_AUDIO is not set
+CONFIG_SND_USB_AUDIO=y
 # CONFIG_SND_USB_UA101 is not set
 # CONFIG_SND_USB_CAIAQ is not set
-# CONFIG_SND_USB_6FIRE is not set
+CONFIG_SND_USB_6FIRE=y
 CONFIG_SND_SOC=y
 # CONFIG_SND_SOC_CACHE_LZO is not set
 CONFIG_SOUND_SUN4I=y
@@ -1289,6 +1300,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
 # CONFIG_HIDRAW is not set
+# CONFIG_UHID is not set
 
 #
 # USB Input Devices