better fix for newbootargs handling

Hashcode · Hashcode · commit bad01c291dba · 2014-04-29T23:14:11.000-07:00
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
@@ -209,11 +209,11 @@ static void do_nonsec_virt_switch(void)
 /* Subcommand: PREP */
 static void boot_prep_linux(bootm_headers_t *images)
 {
-	char *commandline = getenv("bootargs");
+	char *commandline = getenv("dtbootargs");
 
 #ifdef CONFIG_OMAP4KC1
-	if (strstr(commandline, "newbootargs"))
-		commandline = getenv("dtbootargs");
+	if (!strstr(commandline, "newbootargs"))
+		commandline = getenv("bootargs");
 #endif
 
 	if (IMAGE_ENABLE_OF_LIBFDT && images->ft_len) {
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
@@ -2112,11 +2112,9 @@ int do_booti(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		char temp[BOOT_ARGS_SIZE];
 		sprintf(temp, "%s %s", getenv("dtbootargs"), hdr->cmdline);
 		setenv("dtbootargs", temp);
-		sprintf(temp, "%s %s", getenv("bootargs"), hdr->cmdline);
-		setenv("bootargs", temp);
 	}
 
-	printf("bootargs  @ %s\n", getenv("bootargs"));
+	printf("cmdline   @ %s\n", hdr->cmdline);
 	printf("kernel    @ %08x (%d)\n", hdr->kernel_addr, hdr->kernel_size);
 	printf("ramdisk   @ %08x (%d)\n", hdr->ramdisk_addr, hdr->ramdisk_size);
 	printf("2nd-image @ %08x (%d)\n", hdr->second_addr, hdr->second_size);
