U-Boot patches for 2018.03rc1

I am currently attempting to make u-boot recognize a blank board ID as described this guide (section 4.2). The problem is that the 0002-NFM-Production-eeprom-assume-device-is-BeagleBone-Bl.patch does not work because the first two patches in the guide must be applied first and they do not work either because they are made for the wrong code version. I would like to know if newer versions for the first two patches (0001-am335x_evm-uEnv.txt-bootz-n-fixes.patch and 0002-U-Boot-BeagleBone-Cape-Manager.patch) exist for u-boot version 2018.03rc1.

Here is the whole historical archive:

https://github.com/RobertCNelson/Bootloader-Builder/tree/master/patches

Regards,