Actions
Forum Thread Details
  • State Not Answered
  • Replies 13 replies
  • Subscribers 328 subscribers
  • Views 1109 views
  • Users 0 members are here
Related

Unable to apply 32MB Ramdisk patch to U-boot

Former Member

Hello all,
  I've been going through the Implementing Linux on the Zynq-7000 SoC speedway course but ran into a road block.  I completed all the labs up to lab1_2 #11 where you copy over the given patch file and apply it with the following command.

git apply 0001-Xilinx-ARM-Experimental-32MB-Ramdisk-on-ZedBoard.patch

I get the following error.

[blw184@localhost u-boot-xlnx]$ git apply 0001-Xilinx-ARM-Experimental-32MB-Ramdisk-on-ZedBoard.patch
error: patch failed: include/configs/zynq_zed.h:38
error: include/configs/zynq_zed.h: patch does not apply

Am I doing something wrong?

Thank you,
Brandon

Parents Reply
  • 0 in reply to Former Member

    Thanks for the reply m.russell!

    [blw184@localhost u-boot-xlnx]$ git branch
      master
    * xilinx-14.2-build1-trd

    I think that's the correct build?

    I also ran into an similar problem with patching the linux-xlnx.
     
    [blw184@localhost ~]$ cd linux-xlnx/
    [blw184@localhost linux-xlnx]$ git apply 0001-Xilinx-ARM-Kernel-32MB-RAM-disk-on-ZedBoard.patch
    warning: arch/arm/configs/xilinx_zynq_defconfig has type 100755, expected 100644

    Thanks,
    Brandon

Children