From: Michal Simek Date: Wed, 9 Sep 2015 11:16:14 +0000 (+0200) Subject: zynqmp: Add support for earlycon for DCC port X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bffd25e40d88ce4d404c414b2e2bcfeefda818b0;p=thirdparty%2Fu-boot.git zynqmp: Add support for earlycon for DCC port Setup early console based on serial console driver selection. Signed-off-by: Michal Simek --- diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index f2fdc61cb17..44e03f6a524 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -59,9 +59,13 @@ #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 @@ -219,9 +223,6 @@ "sdroot=setenv bootargs $bootargs root=/dev/mmcblk0p2 rw rootwait\0" \ DFU_ALT_INFO - -#define CONFIG_BOOTARGS "setenv bootargs console=ttyPS0,${baudrate} " \ - "earlycon=cdns,mmio,0xff000000,${baudrate}n8" #define CONFIG_PREBOOT "run bootargs; run sata_root; run setup" #define CONFIG_BOOTCOMMAND "run $modeboot" #define CONFIG_BOOTDELAY 5