The dependency on sifive-blocks really makes maintenance painful. The components which depend on sifive blocks should be moved to chipyard directly.