merge board-cp3dug-storage + board-z4u-storage -> board-cp3-storage