Add AXI4 Lite data types and Simulate instance

[PietPtr]

Adds datatypes for transactions on an AXI4 Lite bus.

[martijnbastiaan]

Cool, could you rebase on top of main?

git rebase origin/main

You'll get merge conflicts, which Git will tell you. Fix them and use:

git add somefile

to mark them as resolved.

You can see all outstanding conflicts by doing

git status

Finally, if you're happy you can do:

git rebase --continue

[martijnbastiaan]

I also recommend using 3-way merge, see this: https://www.youtube.com/watch?v=f_xMuOK0FuQ