Re: [PATCH 2/3] MIPS: introduce CPU_R4K_FPU

[wu zhangjin <wuzhangjin@xxxxxxxxx>]

On Mon, Aug 1, 2011 at 6:26 PM, Florian Fainelli <florian@xxxxxxxxxxx> wrote:
> R4K-style CPUs have this boolean defined by default. Allows us
> to remove some lines in arch/mips/kernel/Makefile
>
> Signed-off-by: Florian Fainelli <florian@xxxxxxxxxxx>
> ---
>  arch/mips/Kconfig         |    4 ++++
>  arch/mips/kernel/Makefile |   17 +----------------
>  2 files changed, 5 insertions(+), 16 deletions(-)
>
> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
> index 9f4ade4..44eebc7 100644
> --- a/arch/mips/Kconfig
> +++ b/arch/mips/Kconfig
> @@ -1807,6 +1807,10 @@ config CPU_GENERIC_DUMP_TLB
>        bool
>        default y if !(CPU_R3000 || CPU_R6000 || CPU_R8000 || CPU_TX39XX)
>
> +config CPU_R4K_FPU
> +       bool
> +       default y if !(CPU_R3000 || CPU_R6000 || CPU_TX39XX || CPU_CAVIUM_OCTEON)
> +
>  choice
>        prompt "MIPS MT options"
>
> diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
> index 83bba33..eeb942d 100644
> --- a/arch/mips/kernel/Makefile
> +++ b/arch/mips/kernel/Makefile
> @@ -32,25 +32,10 @@ obj-$(CONFIG_MODULES)               += mips_ksyms.o module.o
>
>  obj-$(CONFIG_FUNCTION_TRACER)  += mcount.o ftrace.o
>
> -obj-$(CONFIG_CPU_LOONGSON2)    += r4k_fpu.o r4k_switch.o
> -obj-$(CONFIG_CPU_MIPS32)       += r4k_fpu.o r4k_switch.o
> -obj-$(CONFIG_CPU_MIPS64)       += r4k_fpu.o r4k_switch.o
> +obj-$(CONFIG_CPU_R4K_FPU)      += r4k_fpu.o r4k_switch.o
>  obj-$(CONFIG_CPU_R3000)                += r2300_fpu.o r2300_switch.o
> -obj-$(CONFIG_CPU_R4300)                += r4k_fpu.o r4k_switch.o
> -obj-$(CONFIG_CPU_R4X00)                += r4k_fpu.o r4k_switch.o
> -obj-$(CONFIG_CPU_R5000)                += r4k_fpu.o r4k_switch.o
>  obj-$(CONFIG_CPU_R6000)                += r6000_fpu.o r4k_switch.o
> -obj-$(CONFIG_CPU_R5432)                += r4k_fpu.o r4k_switch.o
> -obj-$(CONFIG_CPU_R5500)                += r4k_fpu.o r4k_switch.o
> -obj-$(CONFIG_CPU_R8000)                += r4k_fpu.o r4k_switch.o
> -obj-$(CONFIG_CPU_RM7000)       += r4k_fpu.o r4k_switch.o
> -obj-$(CONFIG_CPU_RM9000)       += r4k_fpu.o r4k_switch.o
> -obj-$(CONFIG_CPU_NEVADA)       += r4k_fpu.o r4k_switch.o
> -obj-$(CONFIG_CPU_R10000)       += r4k_fpu.o r4k_switch.o
> -obj-$(CONFIG_CPU_SB1)          += r4k_fpu.o r4k_switch.o
>  obj-$(CONFIG_CPU_TX39XX)       += r2300_fpu.o r2300_switch.o
> -obj-$(CONFIG_CPU_TX49XX)       += r4k_fpu.o r4k_switch.o
> -obj-$(CONFIG_CPU_VR41XX)       += r4k_fpu.o r4k_switch.o
>  obj-$(CONFIG_CPU_CAVIUM_OCTEON)        += octeon_switch.o
>  obj-$(CONFIG_CPU_XLR)          += r4k_fpu.o r4k_switch.o

Seems the above line can be removed too, this may remove them automatically:

$ sed -i -e '/r4k_fpu.o\s*r4k_switch/d' -e '/r4k_switch.o\s*r4k_fpu/d'
 arch/mips/kernel/Makefile

Best Regards,
Wu Zhangjin

>
> --
> 1.7.4.1
>
>
>