diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig
index 623d7cb702..9f6165fa4e 100644
--- a/configs/raspberrypi3_defconfig
+++ b/configs/raspberrypi3_defconfig
@@ -1,6 +1,5 @@
 BR2_arm=y
 BR2_cortex_a7=y
-BR2_ARM_EABIHF=y
 BR2_ARM_FPU_NEON_VFPV4=y
 BR2_DL_DIR="$(TOPDIR)/.download"
 BR2_CCACHE=y
@@ -10,10 +9,10 @@ BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="4.1.18"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_GLIBC_VERSION_2_22=y
 BR2_BINUTILS_VERSION_2_25_X=y
-BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-float=hard"
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_TARGET_OPTIMIZATION="-pipe -mhard-float"
+BR2_TARGET_OPTIMIZATION="-pipe"
 BR2_TARGET_GENERIC_HOSTNAME=""
 BR2_TARGET_GENERIC_ISSUE=""
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
@@ -45,7 +44,6 @@ BR2_PACKAGE_GZIP=y
 BR2_PACKAGE_CIFS_UTILS=y
 # BR2_PACKAGE_E2FSPROGS_BADBLOCKS is not set
 # BR2_PACKAGE_E2FSPROGS_CHATTR is not set
-BR2_PACKAGE_E2FSPROGS_DEBUGFS=y
 # BR2_PACKAGE_E2FSPROGS_DUMPE2FS is not set
 # BR2_PACKAGE_E2FSPROGS_E2FREEFRAG is not set
 # BR2_PACKAGE_E2FSPROGS_E2LABEL is not set