Issue Applying BBX15 Patch to X15 u-boot

[Jeff Andich]

Hi,

Hope everyone in the Southeast on this site (and in general) is starting to put the pieces back together post- storm Harvey.

Last-night and today I tried applying the latest patches for the BB-X15 to the 2017.01 branch of u-boot per the instructions on eewiki, https://eewiki.net/display/linuxonarm/BeagleBoard-X15, when I got some errors when applying the 0001-beagle_x15-uEnv.txt-bootz-n-fixes.patch patch.




I followed all the steps but when I got to the apply patch step for the x15 patch, I got the following errors:




Some Hunks failed while most succeeded (see below).  I didn't really try to go any further, since I haven't seen this before.

Thanks and FYI!!

Jeff




~/build57xxUboot/retrievedFromEEWikiByDate/31_Aug_2017/u-boot$ patch -p1 < 0001-beagle_x15-uEnv.txt-bootz-n-fixes.patch

patching file Makefile

patching file arch/arm/dts/Makefile

Hunk #1 FAILED at 143.

1 out of 1 hunk FAILED -- saving rejects to file arch/arm/dts/Makefile.rej

patching file arch/arm/dts/am571x-sndrblock-common.dtsi

patching file arch/arm/dts/am571x-sndrblock.dts

The next patch would create the file arch/arm/dts/am57xx-beagle-x15-revc.dts,

which already exists!  Assume -R? [n] 

Apply anyway? [n] 

Skipping patch.

1 out of 1 hunk ignored

patching file board/ti/am57xx/board.c

Hunk #1 FAILED at 37.

Hunk #2 succeeded at 90 (offset 2 lines).

Hunk #3 succeeded at 485 (offset 2 lines).

Hunk #4 succeeded at 501 with fuzz 2 (offset 2 lines).

Hunk #5 succeeded at 527 (offset 4 lines).

Hunk #6 succeeded at 599 (offset 4 lines).

Hunk #7 FAILED at 737.

Hunk #8 FAILED at 1147.

Hunk #9 succeeded at 1172 (offset 8 lines).

3 out of 9 hunks FAILED -- saving rejects to file board/ti/am57xx/board.c.rej

patching file configs/am57xx_evm_defconfig

Hunk #2 FAILED at 61.

1 out of 3 hunks FAILED -- saving rejects to file configs/am57xx_evm_defconfig.rej

patching file include/configs/ti_armv7_common.h

patching file include/configs/ti_omap5_common.h

Hunk #2 FAILED at 101.

Hunk #3 FAILED at 117.

2 out of 3 hunks FAILED -- saving rejects to file include/configs/ti_omap5_common.h.rej

patching file include/environment/ti/mmc.h

patching file scripts/Kbuild.include

patching file scripts/Makefile.extrawarn

[Robert Nelson]

On Thu, Aug 31, 2017 at 2:59 PM, Jeff Andich <jeff....@gmail.com> wrote:
> Hi,
>
> Hope everyone in the Southeast on this site (and in general) is starting to
> put the pieces back together post- storm Harvey.
>
>
> Last-night and today I tried applying the latest patches for the BB-X15 to
> the 2017.01 branch of u-boot per the instructions on eewiki,
> https://eewiki.net/display/linuxonarm/BeagleBoard-X15, when I got some
> errors when applying the 0001-beagle_x15-uEnv.txt-bootz-n-fixes.patch patch.
>
> I followed all the steps but when I got to the apply patch step for the x15
> patch, I got the following errors:
>
> Some Hunks failed while most succeeded (see below). I didn't really try to
> go any further, since I haven't seen this before.
>
> Thanks and FYI!!

Yeah, ti merged x15_revc support into their u-boot tree.. Haven't had
much free time at work to fix it yet..

I'll update those instructions to checkout this git-sha as a base:

590c7d7fe15d06a4d708403d3234bcd01cd039e1

Regards,

--
Robert Nelson
https://rcn-ee.com/

[Jeff Andich]

Ok thanks a lot!

Is the Rev. B board essentially the 572xEVM, whereas the Rev. C board is the BeagleBoard-X15?

Where's the best place to see what all changed from board revision B to C?

https://github.com/beagleboard/beagleboard-x15/blob/master/BeagleBoard_X15_RevC2_BOM.xlsx ?

Thanks!!

[Robert Nelson]

On Thu, Aug 31, 2017 at 4:02 PM, Jeff Andich <jeff....@gmail.com> wrote:
> Ok thanks a lot!
>
> Is the Rev. B board essentially the 572xEVM, whereas the Rev. C board is the
> BeagleBoard-X15?
>
> Where's the best place to see what all changed from board revision B to C?
>
> https://github.com/beagleboard/beagleboard-x15/blob/master/BeagleBoard_X15_RevC2_BOM.xlsx
> ?

Actually the 572xEVM got forked around Rev A2..

Rev B's pass FCC...

Rev C is just a Rev B with SR2.0 silicon. (plus a few pull-up resistor
changes, for SR2.0 silicon)