diff --git a/board/odroidc2/boot.ini b/board/odroidc2/boot.ini
index 8ec0532328..a324b296ff 100644
--- a/board/odroidc2/boot.ini
+++ b/board/odroidc2/boot.ini
@@ -93,14 +93,9 @@ setenv bootargs "console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootwait ro no_conso
 
 # Booting
 
-setenv loadaddr "0x11000000"
-setenv dtb_loadaddr "0x1000000"
-setenv initrd_loadaddr "0x13000000"
-
-fatload mmc 0:1 ${initrd_loadaddr} uInitrd
-fatload mmc 0:1 ${loadaddr} Image
-fatload mmc 0:1 ${dtb_loadaddr} meson64_odroidc2.dtb
-fdt addr ${dtb_loadaddr}
+fatload mmc 0:1 0x11000000 Image
+fatload mmc 0:1 0x1000000 meson64_odroidc2.dtb
+fdt addr 0x1000000
 
 if test "${mesontimer}" = "0"; then fdt rm /meson_timer; fdt rm /cpus/cpu@0/timer; fdt rm /cpus/cpu@1/timer; fdt rm /cpus/cpu@2/timer; fdt rm /cpus/cpu@3/timer; fi
 if test "${mesontimer}" = "1"; then fdt rm /timer; fi
@@ -110,4 +105,4 @@ if test "${nographics}" = "1"; then fdt rm /meson-fb; fdt rm /amhdmitx; fdt rm /
 if test "${nographics}" = "1"; then fdt rm /meson-vout; fdt rm /mesonstream; fdt rm /meson-fb; fi
 if test "${nographics}" = "1"; then fdt rm /deinterlace; fdt rm /codec_mm; fi
 
-booti ${loadaddr} ${initrd_loadaddr} ${dtb_loadaddr}
+booti 0x11000000 - 0x1000000
diff --git a/board/odroidc2/overlay/lib/arm-linux-gnueabihf.bak b/board/odroidc2/overlay/lib/arm-linux-gnueabihf.bak
deleted file mode 120000
index dc555529d5..0000000000
--- a/board/odroidc2/overlay/lib/arm-linux-gnueabihf.bak
+++ /dev/null
@@ -1 +0,0 @@
-/lib
\ No newline at end of file
diff --git a/board/odroidc2/overlay/usr/lib/arm-linux-gnueabihf.bak b/board/odroidc2/overlay/usr/lib/arm-linux-gnueabihf.bak
deleted file mode 120000
index 6c1836ebc7..0000000000
--- a/board/odroidc2/overlay/usr/lib/arm-linux-gnueabihf.bak
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib
\ No newline at end of file
diff --git a/board/odroidc2/postscript.sh b/board/odroidc2/postscript.sh
index 87defc5c76..f2ae24cf74 100755
--- a/board/odroidc2/postscript.sh
+++ b/board/odroidc2/postscript.sh
@@ -3,7 +3,7 @@
 # boot directory
 mkdir -p $BOOT_DIR
 
-cp $IMG_DIR/uImage $BOOT_DIR
+cp $IMG_DIR/Image $BOOT_DIR
 cp $IMG_DIR/meson64_odroidc2.dtb $BOOT_DIR
 cp $BOARD_DIR/bl1.bin.hardkernel $IMG_DIR
 cp $BOARD_DIR/u-boot.bin $IMG_DIR
diff --git a/configs/odroidc2_defconfig b/configs/odroidc2_defconfig
index 5bd72a3550..3d2ab36428 100644
--- a/configs/odroidc2_defconfig
+++ b/configs/odroidc2_defconfig
@@ -3,15 +3,9 @@ BR2_DL_DIR="$(TOPDIR)/.download"
 BR2_CCACHE=y
 BR2_CCACHE_DIR="$(TOPDIR)/.buildroot-ccache-odroidc2"
 BR2_OPTIMIZE_2=y
-BR2_TOOLCHAIN_EXTERNAL=y
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
-BR2_TOOLCHAIN_EXTERNAL_URL="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz"
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-linux-gnueabihf"
-BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y
-BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_14=y
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
-BR2_TOOLCHAIN_EXTERNAL_CXX=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
+BR2_GLIBC_VERSION_2_22=y
+BR2_BINUTILS_VERSION_2_25_X=y
 BR2_TARGET_OPTIMIZATION="-pipe"
 BR2_TARGET_GENERIC_HOSTNAME=""
 BR2_TARGET_GENERIC_ISSUE=""
@@ -80,12 +74,9 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_NETTLE=y
 BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_JPEG_TURBO=y
-BR2_PACKAGE_LIBV4L=y
-BR2_PACKAGE_LIBV4L_UTILS=y
 BR2_PACKAGE_LIBXML2=y
 BR2_PACKAGE_LIBTHEORA=y
 BR2_PACKAGE_X264=y
-BR2_PACKAGE_X265=y
 BR2_PACKAGE_LIBCURL=y
 BR2_PACKAGE_CURL=y
 BR2_PACKAGE_LIBCAP=y