Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42a4f17d authored by Manuel Lauss's avatar Manuel Lauss Committed by Ralf Baechle
Browse files

MIPS: Alchemy: remove SOC_AU1X00 in favor of MIPS_ALCHEMY 



Remove the CONFIG_SOC_AU1X00 Kconfig symbol since its job can also be done
by MACH_ALCHEMY, now renamed to MIPS_ALCHEMY.

Signed-off-by: default avatarManuel Lauss <manuel.lauss@googlemail.com>
To: Linux-MIPS <linux-mips@linux-mips.org>
Patchwork: https://patchwork.linux-mips.org/patch/1461/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 745aef5d

arch/mips/Kconfig

+10 −1
Original line number Diff line number Diff line
@@ -23,8 +23,17 @@ choice 
	prompt "System type"

	default SGI_IP22



config MACH_ALCHEMY

config MIPS_ALCHEMY

	bool "Alchemy processor based machines"

	select 64BIT_PHYS_ADDR

	select CEVT_R4K_LIB

	select CSRC_R4K_LIB

	select IRQ_CPU

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_APM_EMULATION

	select GENERIC_GPIO

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select SYS_SUPPORTS_ZBOOT



config AR7

arch/mips/alchemy/Kconfig

+1 −18
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ config ALCHEMY_GPIO_INDIRECT 


choice

	prompt "Machine type"

	depends on MACH_ALCHEMY

	depends on MIPS_ALCHEMY

	default MIPS_DB1000



config MIPS_MTX1
@@ -132,37 +132,20 @@ endchoice 


config SOC_AU1000

	bool

	select SOC_AU1X00

	select ALCHEMY_GPIOINT_AU1000



config SOC_AU1100

	bool

	select SOC_AU1X00

	select ALCHEMY_GPIOINT_AU1000



config SOC_AU1500

	bool

	select SOC_AU1X00

	select ALCHEMY_GPIOINT_AU1000



config SOC_AU1550

	bool

	select SOC_AU1X00

	select ALCHEMY_GPIOINT_AU1000



config SOC_AU1200

	bool

	select SOC_AU1X00

	select ALCHEMY_GPIOINT_AU1000
 


config SOC_AU1X00

	bool

	select 64BIT_PHYS_ADDR

	select CEVT_R4K_LIB

	select CSRC_R4K_LIB

	select IRQ_CPU

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_APM_EMULATION

	select GENERIC_GPIO

	select ARCH_WANT_OPTIONAL_GPIOLIB

arch/mips/alchemy/Platform

+2 −2
Original line number Diff line number Diff line 
#

# Core Alchemy code

#

platform-$(CONFIG_MACH_ALCHEMY)	+= alchemy/common/

platform-$(CONFIG_MIPS_ALCHEMY)	+= alchemy/common/





#
@@ -106,4 +106,4 @@ load-$(CONFIG_MIPS_XXS1500) += 0xffffffff80100000 
# compiler picks the board one.  If they don't, it will make sure

# the alchemy generic gpio header is picked up.



cflags-$(CONFIG_MACH_ALCHEMY)	+= -I$(srctree)/arch/mips/include/asm/mach-au1x00
 
cflags-$(CONFIG_MIPS_ALCHEMY)	+= -I$(srctree)/arch/mips/include/asm/mach-au1x00

arch/mips/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ vmlinuzobjs-y := $(obj)/head.o $(obj)/decompress.o $(obj)/dbg.o 


ifdef CONFIG_DEBUG_ZBOOT

vmlinuzobjs-$(CONFIG_SYS_SUPPORTS_ZBOOT_UART16550) += $(obj)/uart-16550.o

vmlinuzobjs-$(CONFIG_MACH_ALCHEMY)		   += $(obj)/uart-alchemy.o

vmlinuzobjs-$(CONFIG_MIPS_ALCHEMY)		   += $(obj)/uart-alchemy.o

endif



targets += vmlinux.bin

arch/mips/configs/db1000_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ CONFIG_MIPS=y 
#

# Machine selection

#

CONFIG_MACH_ALCHEMY=y

CONFIG_MIPS_ALCHEMY=y

# CONFIG_AR7 is not set

# CONFIG_BCM47XX is not set

# CONFIG_BCM63XX is not set
@@ -64,7 +64,6 @@ CONFIG_MIPS_DB1000=y 
# CONFIG_MIPS_PB1550 is not set

# CONFIG_MIPS_XXS1500 is not set

CONFIG_SOC_AU1000=y

CONFIG_SOC_AU1X00=y

CONFIG_LOONGSON_UART_BASE=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

# CONFIG_ARCH_HAS_ILOG2_U32 is not set