diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h
index 38769a1..caf1ef2 100644
--- a/include/configs/rpi-common.h
+++ b/include/configs/rpi-common.h
@@ -118,7 +118,7 @@
                                         sizeof(CONFIG_SYS_PROMPT) + 16)
 
 /* Environment */
-#define CONFIG_ENV_SIZE                        SZ_16K
+#define CONFIG_ENV_SIZE                        SZ_128K
 #define CONFIG_ENV_IS_IN_FAT
 #define FAT_ENV_INTERFACE              "mmc"
 #define FAT_ENV_DEVICE_AND_PART                "0:1"
@@ -128,6 +128,7 @@
 #define CONFIG_SYS_LOAD_ADDR           0x1000000
 #define CONFIG_CONSOLE_MUX
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
 #define CONFIG_PREBOOT                 "usb start"
 
 /* Shell */
@@ -143,6 +144,7 @@
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_INITRD_TAG
+#define CONFIG_SUPPORT_RAW_INITRD
 
 #include <config_distro_defaults.h>