Trying Chiffre in Rocket Chip

[harispap2]

Hello,
I am currently member of a university project in which we utilize the Chipyard framework for simulating CPU designs etc.
The chipyard framework contains RocketChip (the source code of which is located inside the directory of Chipyard and is the same with the source of Rocket on its repository).
The issue, which I don't think has to deal with Chipyard itself, but rather an incompatibility or a misunderstanding from my side is with using Rocket Custom Coprocessor (RoCC).
To be precise, I run the following commands, as mentioned in the readme:

git clone https://github.com/freechipsproject/rocket-chip $ROCKETCHIP_DIR
cd $ROCKETCHIP_DIR
git clone https://github.com/ibm/chiffre chiffre
git apply le-chiffre/patches/rocket-chip-fault-cycle.patch
cd emulator
make CONFIG=LeChiffreConfig ROCKETCHIP_ADDONS="chiffre/le-chiffre chiffre"

Even when trying outside of the chiffre directory, inside an empty directory, after (freshly) cloning both rocket chip and chiffre the patch always fails to apply and I receive the error mentioned on the screenshot bellow:

A sidenote: after the git clone command, chiffre is cloned inside a directory called "chiffre", in which i have to enter before running the patch apply command.
Thanks in advance and excuse my ignorance as I am pretty new in processor testing.

[rbertran]

FYI @seldridge , not sure if you are automatically notified.

[harispap2]

I decided to try chiffre in standalone rocket and apply the changes specified in the patch manually. However, I think that some rocket libraries have changed, as I now receive the following errors during making of rocket with the chiffre addon (ROCKETCHIP_ADDONS="chiffre/le-chiffre chiffre").
(The output is included as a text file)

out.txt