Also remove/shorten patches and replace mk-s390-cdboot with mk-s390image.
mk-s390-cdboot
mk-s390image