[f16ref] Bring in GBox board-m3-reff16.c changes
[f16ref] revert NAND_ENV check