generic: 6.1: re-add two Winbond nand fixes