--- u-boot-2015.01.orig/include/configs/wandboard.h
+++ u-boot-2015.01/include/configs/wandboard.h
@@ -75,7 +75,9 @@
 #define CONFIG_GENERIC_MMC
 #define CONFIG_BOUNCE_BUFFER
 #define CONFIG_CMD_EXT2
+#define CONFIG_CMD_EXT4
 #define CONFIG_CMD_FAT
+#define CONFIG_CMD_FS_GENERIC
 #define CONFIG_DOS_PARTITION
 
 /* USB Configs */
@@ -130,6 +132,8 @@
 #define CONFIG_DEFAULT_FDT_FILE		"imx6q-wandboard.dtb"
 #endif
 
+#if 0
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
@@ -244,6 +248,25 @@
 		   "fi; " \
 	   "else run netboot; fi"
 
+#else
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"console=ttymxc0\0" \
+	"devtype=mmc\0" \
+	"devnum=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
+	"devpart=1\0" \
+	"fdt_addr_r=0x18000000\0" \
+	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
+	"fdt_high=0xffffffff\0" \
+	"initrd_addr_r=0x13000000\0" \
+	"initrd_high=0xffffffff\0" \
+	"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+	""
+
+#include "alpine-bootscript.h"
+
+#endif
+
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_HUSH_PARSER
@@ -283,6 +306,7 @@
 
 #define CONFIG_OF_LIBFDT
 #define CONFIG_CMD_BOOTZ
+#define CONFIG_SUPPORT_RAW_INITRD
 
 #ifndef CONFIG_SYS_DCACHE_OFF
 #define CONFIG_CMD_CACHE