Remove redundant kern conf entries that are inherited via include

Move cfg to spi1 as that's where it is located from the factory