diff --git a/FunKey/board/funkey/linux.config b/FunKey/board/funkey/linux.config
index 59d935c..e47d1ba 100644
--- a/FunKey/board/funkey/linux.config
+++ b/FunKey/board/funkey/linux.config
@@ -57,7 +57,6 @@ CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 CONFIG_INPUT_MISC=y
-CONFIG_INPUT_AXP20X_PEK=y
 CONFIG_INPUT_UINPUT=y
 CONFIG_LEGACY_PTY_COUNT=4
 CONFIG_SERIAL_8250=y
diff --git a/FunKey/board/funkey/uboot.config b/FunKey/board/funkey/uboot.config
index 27080b9..bab94d1 100644
--- a/FunKey/board/funkey/uboot.config
+++ b/FunKey/board/funkey/uboot.config
@@ -1,31 +1,24 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-# CONFIG_SPL_LIBDISK_SUPPORT is not set
-# CONFIG_SPL_POWER_SUPPORT is not set
 # CONFIG_ARMV7_NONSEC is not set
 CONFIG_IDENT_STRING=" FunKey"
 # CONFIG_PRE_CONSOLE_BUFFER is not set
 CONFIG_MACH_SUN8I_V3S=y
 CONFIG_DRAM_CLK=360
 CONFIG_DRAM_ZQ=14779
-CONFIG_VIDEO_LCD_MODE="x:800,y:480,depth:18,pclk_khz:33000,le:87,ri:40,up:31,lo:13,hs:1,vs:1,sync:3,vmode:0"
-CONFIG_VIDEO_LCD_BL_PWM="PB4"
-# CONFIG_VIDEO_LCD_BL_PWM_ACTIVE_LOW is not set
+# CONFIG_VIDEO is not set
 CONFIG_DEFAULT_DEVICE_TREE="sun8i-v3s-funkey"
 CONFIG_LOCALVERSION="-funkey"
 # CONFIG_DISTRO_DEFAULTS is not set
 CONFIG_BOOTDELAY=0
-# CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
+CONFIG_SYS_STDIO_DEREGISTER=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
-CONFIG_SYS_PROMPT="FunKey> "
-# CONFIG_CMD_BOOTD is not set
-# CONFIG_CMD_ELF is not set
+CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
-# CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_NET is not set
@@ -34,4 +27,4 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
-# CONFIG_EFI_LOADER is not set
+CONFIG_REGEX=y
diff --git a/FunKey/configs/funkey_defconfig b/FunKey/configs/funkey_defconfig
index b34eb95..7643e3a 100644
--- a/FunKey/configs/funkey_defconfig
+++ b/FunKey/configs/funkey_defconfig
@@ -2,7 +2,6 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_DL_DIR="$(BR2_EXTERNAL_FUNKEY_PATH)/dl"
 BR2_CCACHE=y
-BR2_PACKAGE_OVERRIDE_FILE="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/local.mk"
 BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/patches"
 BR2_TOOLCHAIN_EXTERNAL=y
 BR2_TARGET_GENERIC_HOSTNAME="funkey"
@@ -52,10 +51,15 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
 BR2_PACKAGE_E2FSPROGS=y
 # BR2_PACKAGE_E2FSPROGS_FSCK is not set
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_SDL=y
+BR2_PACKAGE_SDL_GFX=y
+BR2_PACKAGE_SDL_IMAGE=y
+BR2_PACKAGE_SDL_MIXER=y
 BR2_PACKAGE_SDL_SOUND=y
 BR2_PACKAGE_SDL_SOUND_PLAYSOUND=y
+BR2_PACKAGE_SDL_TTF=y
 BR2_PACKAGE_UBOOT_TOOLS=y
-BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE=y
+BR2_PACKAGE_ZLIB=y
 BR2_PACKAGE_DHCPCD=y
 BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_WPA_SUPPLICANT=y
@@ -65,7 +69,6 @@ BR2_PACKAGE_UTIL_LINUX_BINARIES=y
 BR2_PACKAGE_NANO=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
-BR2_TARGET_ROOTFS_EXT2_SIZE="100M"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
@@ -83,5 +86,3 @@ BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_MEDNAFEN=y
-BR2_PACKAGE_RETROFE=y
-BR2_PACKAGE_RETROFE_LAYOUT=y
diff --git a/buildroot b/buildroot
index 836b84a..0e70d7c 160000
--- a/buildroot
+++ b/buildroot
@@ -1 +1 @@
-Subproject commit 836b84a7743cbf7d6b745efd023217bed47e34e8
+Subproject commit 0e70d7c761fbaaecbc482dcba480151b7d3e11d4