Merge branch 'next'

Merge the outstanding changes from the 'next' branch to master.

1 files changed, 2 insertions, 21 deletions

diff --git a/cmd/spl.c b/cmd/spl.c
index 379b512f1ff..f591dc07fb6 100644
--- a/cmd/spl.c
+++ b/cmd/spl.c
@@ -30,19 +30,6 @@ static const char **subcmd_list[] = {
 #endif
 		NULL,
 	},
-	[SPL_EXPORT_ATAGS] = (const char * []) {
-#ifdef CONFIG_SUPPORT_PASSING_ATAGS
-		"start",
-		"loados",
-#ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH
-		"ramdisk",
-#endif
-		"cmdline",
-		"bdt",
-		"prep",
-#endif
-		NULL,
-	},
 	NULL
 };
 
@@ -96,7 +83,6 @@ static int call_bootm(int argc, char *const argv[], const char *subcommand[])
 
 static struct cmd_tbl cmd_spl_export_sub[] = {
 	U_BOOT_CMD_MKENT(fdt, 0, 1, (void *)SPL_EXPORT_FDT, "", ""),
-	U_BOOT_CMD_MKENT(atags, 0, 1, (void *)SPL_EXPORT_ATAGS, "", ""),
 };
 
 static int spl_export(struct cmd_tbl *cmdtp, int flag, int argc,
@@ -128,10 +114,6 @@ static int spl_export(struct cmd_tbl *cmdtp, int flag, int argc,
 #endif
 			break;
 #endif
-		case SPL_EXPORT_ATAGS:
-			printf("Argument image is now in RAM at: 0x%p\n",
-				(void *)gd->bd->bi_boot_params);
-			break;
 		}
 	} else {
 		/* Unrecognized command */
@@ -176,11 +158,10 @@ static int do_spl(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 
 U_BOOT_CMD(
 	spl, 6 , 1, do_spl, "SPL configuration",
-	"export <img=atags|fdt> [kernel_addr] [initrd_addr] [fdt_addr]\n"
-	"\timg\t\t\"atags\" or \"fdt\"\n"
+	"export fdt [kernel_addr] [initrd_addr] [fdt_addr]\n"
 	"\tkernel_addr\taddress where a kernel image is stored.\n"
 	"\t\t\tkernel is loaded as part of the boot process, but it is not started.\n"
 	"\tinitrd_addr\taddress of initial ramdisk\n"
 	"\t\t\tcan be set to \"-\" if fdt_addr without initrd_addr is used.\n"
-	"\tfdt_addr\tin case of fdt, the address of the device tree.\n"
+	"\tfdt_addr\tthe address of the device tree.\n"
 	);