diff -Naur a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
--- a/include/configs/am335x_evm.h	2016-09-19 16:45:12.000000000 +0200
+++ b/include/configs/am335x_evm.h	2016-10-31 15:20:25.205873669 +0100
@@ -89,101 +89,48 @@
 	func(PXE, pxe, na) \
 	func(DHCP, dhcp, na)
 
-#define CONFIG_BOOTCOMMAND \
-	"run findfdt; " \
-	"run init_console; " \
-	"run envboot; " \
-	"run distro_bootcmd"
-
 #include <config_distro_bootcmd.h>
 
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	DEFAULT_LINUX_BOOT_ENV \
-	DEFAULT_MMC_TI_ARGS \
-	"boot_fdt=try\0" \
-	"bootpart=0:2\0" \
-	"bootdir=/boot\0" \
-	"bootfile=zImage\0" \
-	"fdtfile=undefined\0" \
-	"console=ttyO0,115200n8\0" \
-	"partitions=" \
-		"uuid_disk=${uuid_gpt_disk};" \
-		"name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \
-	"optargs=\0" \
-	"ramroot=/dev/ram0 rw\0" \
-	"ramrootfstype=ext2\0" \
-	"spiroot=/dev/mtdblock4 rw\0" \
-	"spirootfstype=jffs2\0" \
-	"spisrcaddr=0xe0000\0" \
-	"spiimgsize=0x362000\0" \
-	"spibusno=0\0" \
-	"spiargs=setenv bootargs console=${console} " \
-		"${optargs} " \
-		"root=${spiroot} " \
-		"rootfstype=${spirootfstype}\0" \
-	"ramargs=setenv bootargs console=${console} " \
-		"${optargs} " \
-		"root=${ramroot} " \
-		"rootfstype=${ramrootfstype}\0" \
-	"loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
-	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
-	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
-	"mmcloados=run args_mmc; " \
-		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-			"if run loadfdt; then " \
-				"bootz ${loadaddr} - ${fdtaddr}; " \
-			"else " \
-				"if test ${boot_fdt} = try; then " \
-					"bootz; " \
-				"else " \
-					"echo WARN: Cannot load the DT; " \
-				"fi; " \
-			"fi; " \
-		"else " \
-			"bootz; " \
-		"fi;\0" \
-	"mmcboot=mmc dev ${mmcdev}; " \
-		"if mmc rescan; then " \
-			"echo SD/MMC found on device ${mmcdev};" \
-			"run envboot; " \
-			"if run loadimage; then " \
-				"run mmcloados;" \
-			"fi;" \
-		"fi;\0" \
-	"spiboot=echo Booting from spi ...; " \
-		"run spiargs; " \
-		"sf probe ${spibusno}:0; " \
-		"sf read ${loadaddr} ${spisrcaddr} ${spiimgsize}; " \
-		"bootz ${loadaddr}\0" \
-	"ramboot=echo Booting from ramdisk ...; " \
-		"run ramargs; " \
-		"bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \
-	"findfdt="\
-		"if test $board_name = A335BONE; then " \
-			"setenv fdtfile am335x-bone.dtb; fi; " \
-		"if test $board_name = A335BNLT; then " \
-			"setenv fdtfile am335x-boneblack.dtb; fi; " \
-		"if test $board_name = BBG1; then " \
-			"setenv fdtfile am335x-bonegreen.dtb; fi; " \
-		"if test $board_name = A33515BB; then " \
-			"setenv fdtfile am335x-evm.dtb; fi; " \
-		"if test $board_name = A335X_SK; then " \
-			"setenv fdtfile am335x-evmsk.dtb; fi; " \
-		"if test $board_name = A335_ICE; then " \
-			"setenv fdtfile am335x-icev2.dtb; fi; " \
-		"if test $fdtfile = undefined; then " \
-			"echo WARNING: Could not determine device tree to use; fi; \0" \
-	"init_console=" \
-		"if test $board_name = A335_ICE; then "\
-			"setenv console ttyO3,115200n8;" \
-		"else " \
-			"setenv console ttyO0,115200n8;" \
-		"fi;\0" \
-	NANDARGS \
-	NETARGS \
-	DFUARGS \
-	BOOTENV
+        "ramboot=fatload mmc 0 0x80200000 uImage; " \
+                "fatload mmc 0 0x80F00000 Display001.dtb; " \
+                "fdt addr 0x80F00000; " \
+                "fatload mmc 0 0x81000000 initrd.gz; " \
+                "setenv initrdsize 0x${filesize}; " \
+                "setenv bootargs console=ttyO0,115200 initrd=0x81000000,${initrdsize} " \
+                        "root=/dev/ram0 rw init=/sbin/init debug initcall_debug earlyprintk; " \
+                "bootm 0x80200000 - 0x80F00000\0" \
+        "sdboot=fatload mmc 0 0x80200000 uImage; " \
+                "fatload mmc 0 0x80F00000 Display001.dtb; " \
+                "fdt addr 0x80F00000; " \
+                "setenv bootargs console=ttyO0,115200 " \
+                        "root=/dev/mmcblk0p2 rw rootwait vram=50M; " \
+                "bootm 0x80200000 - 0x80F00000\0" \
+        "emmcboot=fatload mmc 1 0x80200000 uImage; " \
+                "fatload mmc 1 0x80F00000 Display001.dtb; " \
+                "fdt addr 0x80F00000; " \
+                "setenv bootargs console=ttyO0,115200 " \
+                        "root=/dev/mmcblk1p2 rw rootwait vram=50M; " \
+                "bootm 0x80200000 - 0x80F00000\0" \
+        "bootcmd=mw.l 0x80020000 0x0040033c; " \
+               "if cmp 0x80020000 0x44e10040 1; " \
+               "then " \
+                 "echo ---emmc--; " \
+                 "mmc rescan; " \
+                 "if fatload mmc 0:1 0x80200000 MLO; then " \
+                   "run sdboot; " \
+                 "else " \
+                   "run emmcboot; " \
+                 "fi; " \
+               "else echo --sd--; " \
+                 "mmc rescan; " \
+                 "if fatload mmc 0:1 0x80200000 MLO; then " \
+                   "run sdboot; " \
+                 "else " \
+                   "run emmcboot; " \
+                 "fi; " \
+               "fi;\0"
 #endif
 
 /* NS16550 Configuration */
