Merge "gfch100: add some new configs"