On Fri, Jan 10, 2014 at 9:35 PM, Florian Fainelli <florian@xxxxxxxxxxx> wrote: > All platforms that require a special MIPS_L1_CACHE_SHIFT value have been > updated, such that we can now make MIPS_L1_CACHE_SHIFT default to the > appropriate integer value based on the select MIPS_L1_CACHE_SHIFT_<N> > variable. > > Signed-off-by: Florian Fainelli <florian@xxxxxxxxxxx> > --- > arch/mips/Kconfig | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig > index 753c5a3..123f7c0 100644 > --- a/arch/mips/Kconfig > +++ b/arch/mips/Kconfig > @@ -1106,10 +1106,10 @@ config MIPS_L1_CACHE_SHIFT_7 > > config MIPS_L1_CACHE_SHIFT > int > - default "4" if MACH_DECSTATION || MIKROTIK_RB532 || PMC_MSP4200_EVAL || SOC_RT288X > - default "6" if MIPS_CPU_SCACHE > - default "7" if SGI_IP22 || SGI_IP27 || SGI_IP28 || SNI_RM || CPU_CAVIUM_OCTEON > - default "5" > + default "4" if MIPS_L1_CACHE_SHIFT_4 > + default "6" if MIPS_L1_CACHE_SHIFT_6 > + default "7" if MIPS_L1_CACHE_SHIFT_7 > + default "5" if MIPS_L1_CACHE_SHIFT_5 Having MIPS_L1_CACHE_SHIFT_5 default n and a last default "5" without any condition to allows this to be ordered, which looks IMHO a lot nicer ;-) Jonas
