From: Soren Brinkmann <soren.brinkmann@xilinx.com>
Date: Tue, 8 Dec 2015 15:53:11 +0000 (-0800)
Subject: zynqmp: Don't hardcode bootargs
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1525a01a307715d43c1fc998ec3ca605ed48eaf7;p=thirdparty%2Fu-boot.git

zynqmp: Don't hardcode bootargs

ZynqMP uses devicetree, which allows specifying the kernel
command line in a flexible way. Don't hardcode it in U-Boot.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Acked-by: Alistair Francis <alistair.francis@xilinx.com>
Acked-by: Sai Pavan Boddu <saipava@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index d53aa08cbb8..6d77c4d311e 100644
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -59,13 +59,9 @@
 #if defined(CONFIG_ZYNQ_DCC)
 # define CONFIG_ARM_DCC
 # define CONFIG_CPU_ARMV8
-# define CONFIG_BOOTARGS	"setenv bootargs console=hvc0 " \
-				"earlycon=dcc; run nosmp;"
 #else
 # if defined(CONFIG_ZYNQ_SERIAL_UART0) || defined(CONFIG_ZYNQ_SERIAL_UART1)
 #  define CONFIG_ZYNQ_SERIAL
-#  define CONFIG_BOOTARGS	"setenv bootargs console=ttyPS0,${baudrate} " \
-				"earlycon=cdns,mmio,0xff000000,${baudrate}n8"
 # endif
 #endif
 
@@ -227,7 +223,7 @@
 		     "booti $kernel_addr - $fdt_addr\0" \
 	DFU_ALT_INFO
 
-#define CONFIG_PREBOOT		"run bootargs; run sata_root; run setup"
+#define CONFIG_PREBOOT		"run setup"
 #define CONFIG_BOOTCOMMAND	"run $modeboot"
 #define CONFIG_BOOTDELAY	5