From: Michal Simek Date: Thu, 3 Sep 2015 06:16:32 +0000 (+0200) Subject: ARM: zynqmp: Remove incorrect command X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c57d5992d471094c1e9f7e93c2d433d3dd687f3a;p=thirdparty%2Fu-boot.git ARM: zynqmp: Remove incorrect command The bug was introduced by: "zynqmp: usb: Add usb dwc3 driver support for zynqmp" (sha1: 2d5bc2183fa6484e8411ffa8edf1a33c63cb54b6) with incorrect conflict resolution. Remove this additional line. Signed-off-by: Michal Simek --- diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index c1cf48d0122..6bdae288dd0 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -210,7 +210,6 @@ "fdt set /chosen/dom0 reg <0x80000 0x$filesize> && "\ "tftpb 6000000 xen.ub && bootm 6000000 - $fdt_addr\0" \ "jtagboot=tftpboot 10000000 image.ub && bootm\0" \ - "load mmc 0:0 $kernel_addr Image && booti $kernel_addr - $fdt_addr\0" \ "nosmp=setenv bootargs $bootargs maxcpus=1\0" \ "nfsroot=setenv bootargs $bootargs root=/dev/nfs nfsroot=$serverip:/mnt/sata,tcp ip=$ipaddr:$serverip:$serverip:255.255.255.0:zynqmp:eth0:off rw\0" \ "sdroot=setenv bootargs $bootargs root=/dev/mmcblk0p2 rw rootwait\0" \