xilinx_ethlite: intermediate merge fixup