error on applying patch to u-boot building A20_Olimex_kernel_3.4.103+_Jessie

Started by mauricio, December 16, 2016, 02:42:53 PM

Previous topic - Next topic

mauricio

Hello

I'm trying to build A20_Olimex_kernel_3.4.103+_Jessie

I need my Realtek USB wifi dongle to work, also one-wire ds18b20, and them doesn't work with the image at https://www.olimex.com/wiki/images/7/78/A20_OLinuxino_Micro_debian_Jessie_34_103_2G_release_12.torrent

so, I'm following instructions from here https://github.com/OLIMEX/OLINUXINO/blob/master/SOFTWARE/A20/A20-build-3.4.103-release-4/BUILD_DESCRIPTION_A20_Olimex_kernel_3.4.103%2B_Jessie_rel_4.txt

patching u-boot gives me errors

I will go ahead anyway, but I'll be glad to know if this is normal or what. I follwed instructions and I did change to the correct version of u-boot with

# git reset --hard  8cbb389bb3da80cbf8911f8386cbff92c6a78afe

please any advice or comment is welcome, thanks


patching file board/sunxi/gmac.c
patching file configs/A20-OLinuXino-Lime2_defconfig
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file configs/A20-OLinuXino-Lime2_defconfig.rej
patching file configs/A20-OLinuXino-Lime_defconfig
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file configs/A20-OLinuXino-Lime_defconfig.rej
patching file configs/A20-Olimex-SOM-EVB_defconfig
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file configs/A20-Olimex-SOM-EVB_defconfig.rej
patching file drivers/net/phy/micrel.c
Hunk #2 succeeded at 399 (offset 1 line).
Hunk #3 succeeded at 493 (offset 22 lines).
patching file drivers/net/phy/phy.c
patching file drivers/net/phy/realtek.c
Hunk #1 succeeded at 11 with fuzz 2 (offset 1 line).
Hunk #2 succeeded at 66 (offset 12 lines).
Hunk #3 FAILED at 64.
1 out of 3 hunks FAILED -- saving rejects to file drivers/net/phy/realtek.c.rej
patching file include/configs/sunxi-common.h
Hunk #1 succeeded at 309 (offset -24 lines).


UPDATE
following this

To switch from the latest sources to the exact commit that we used execute the next command:

# git reset --hard  8cbb389bb3da80cbf8911f8386cbff92c6a78afe

or

git checkout v2016.09 -b tmp

I tryed second command 'git checkout v2016.09 -b tmp' which seem to work and throw out no errors

I did revert changes done before, by attempting to patch first time with

patch -p1 -R < a20-phy-dram.patch

then

git checkout v2016.09 -b tmp

and repatch

patch -p1 < a20-phy-dram.patch


patching file board/sunxi/gmac.c
patching file configs/A20-OLinuXino-Lime2_defconfig
patching file configs/A20-OLinuXino-Lime_defconfig
patching file configs/A20-Olimex-SOM-EVB_defconfig
patching file drivers/net/phy/micrel.c
patching file drivers/net/phy/phy.c
patching file drivers/net/phy/realtek.c
patching file include/configs/sunxi-common.h