powerpc/B4: Merge B4420 and B4860 in config_mpc85xx.h