Re: [PATCH 3/3] MIPS: introduce CPU_R4K_CACHE_TLB

[Jonas Gorski <jonas.gorski@gmail.com>]

Hi,

On 1 August 2011 12:26, Florian Fainelli <florian@openwrt.org> wrote:
> R4K-style CPUs having common code to support their caches and tlb have this
> boolean defined by default. Allows us to save some lines in
> arch/mips/mm/Makefile
>
> Signed-off-by: Florian Fainelli <florian@openwrt.org>
> ---
>  arch/mips/Kconfig     |    4 ++++
>  arch/mips/mm/Makefile |   16 +---------------
>  2 files changed, 5 insertions(+), 15 deletions(-)
>
> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
> index 44eebc7..0150745 100644
> --- a/arch/mips/Kconfig
> +++ b/arch/mips/Kconfig
> @@ -1811,6 +1811,10 @@ config CPU_R4K_FPU
>        bool
>        default y if !(CPU_R3000 || CPU_R6000 || CPU_TX39XX || 
> CPU_CAVIUM_OCTEON)
>
> +config CPU_R4K_CACHE_TLB
> +       bool
> +       default y if !(CPU_R3000 || CPU_SB1 || CPU_TX39XX || 
> CPU_CAVIUM_OCTEON)
> +
>  choice
>        prompt "MIPS MT options"
>
> diff --git a/arch/mips/mm/Makefile b/arch/mips/mm/Makefile
> index 4d8c162..04ece1b5 100644
> --- a/arch/mips/mm/Makefile
> +++ b/arch/mips/mm/Makefile
> @@ -11,24 +11,10 @@ obj-$(CONFIG_64BIT)         += pgtable-64.o
>  obj-$(CONFIG_HIGHMEM)          += highmem.o
>  obj-$(CONFIG_HUGETLB_PAGE)     += hugetlbpage.o
>
> -obj-$(CONFIG_CPU_LOONGSON2)    += c-r4k.o cex-gen.o tlb-r4k.o
> -obj-$(CONFIG_CPU_MIPS32)       += c-r4k.o cex-gen.o tlb-r4k.o
> -obj-$(CONFIG_CPU_MIPS64)       += c-r4k.o cex-gen.o tlb-r4k.o
> -obj-$(CONFIG_CPU_NEVADA)       += c-r4k.o cex-gen.o tlb-r4k.o
> -obj-$(CONFIG_CPU_R10000)       += c-r4k.o cex-gen.o tlb-r4k.o
> +obj-$(CONFIG_CPU_R4K_CACHE_TLB) += c-r4k.o cex-gen.o tlb-r4k.o
>  obj-$(CONFIG_CPU_R3000)                += c-r3k.o tlb-r3k.o
> -obj-$(CONFIG_CPU_R4300)                += c-r4k.o cex-gen.o tlb-r4k.o
> -obj-$(CONFIG_CPU_R4X00)                += c-r4k.o cex-gen.o tlb-r4k.o
> -obj-$(CONFIG_CPU_R5000)                += c-r4k.o cex-gen.o tlb-r4k.o
> -obj-$(CONFIG_CPU_R5432)                += c-r4k.o cex-gen.o tlb-r4k.o
> -obj-$(CONFIG_CPU_R5500)                += c-r4k.o cex-gen.o tlb-r4k.o
> -obj-$(CONFIG_CPU_R8000)                += c-r4k.o cex-gen.o tlb-r8k.o

This one should stay (and be added to the exceptions): tlb-r*8*k. ;-)

> -obj-$(CONFIG_CPU_RM7000)       += c-r4k.o cex-gen.o tlb-r4k.o
> -obj-$(CONFIG_CPU_RM9000)       += c-r4k.o cex-gen.o tlb-r4k.o
>  obj-$(CONFIG_CPU_SB1)          += c-r4k.o cerr-sb1.o cex-sb1.o tlb-r4k.o
>  obj-$(CONFIG_CPU_TX39XX)       += c-tx39.o tlb-r3k.o
> -obj-$(CONFIG_CPU_TX49XX)       += c-r4k.o cex-gen.o tlb-r4k.o
> -obj-$(CONFIG_CPU_VR41XX)       += c-r4k.o cex-gen.o tlb-r4k.o
>  obj-$(CONFIG_CPU_CAVIUM_OCTEON)        += c-octeon.o cex-oct.o tlb-r4k.o
>  obj-$(CONFIG_CPU_XLR)          += c-r4k.o tlb-r4k.o cex-gen.o

This one should go, too. You probably missed it because it used a
different file name order ;-). I haven't checked if they are others
outside of the context lines.


Jonas