Commit 104f942b authored by Jiaxun Yang's avatar Jiaxun Yang Committed by Thomas Bogendoerfer
Browse files

MIPS: Retire MACH_PISTACHIO 



Now it can be replaced by generic kernel.

Signed-off-by: default avatarJiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 917b64f1

arch/mips/Kbuild.platforms

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ platform-$(CONFIG_MIPS_MALTA) += mti-malta/ 
platform-$(CONFIG_MACH_NINTENDO64)	+= n64/

platform-$(CONFIG_NLM_COMMON)		+= netlogic/

platform-$(CONFIG_PIC32MZDA)		+= pic32/

platform-$(CONFIG_MACH_PISTACHIO)	+= pistachio/

platform-$(CONFIG_RALINK)		+= ralink/

platform-$(CONFIG_MIKROTIK_RB532)	+= rb532/

platform-$(CONFIG_SGI_IP22)		+= sgi-ip22/

arch/mips/Kconfig

+0 −30
Original line number Diff line number Diff line
@@ -513,35 +513,6 @@ config MACH_LOONGSON64 
	  and Loongson-2F which will be removed), developed by the Institute

	  of Computing Technology (ICT), Chinese Academy of Sciences (CAS).



config MACH_PISTACHIO

	bool "IMG Pistachio SoC based boards"

	select BOOT_ELF32

	select BOOT_RAW

	select CEVT_R4K

	select CLKSRC_MIPS_GIC

	select COMMON_CLK

	select CSRC_R4K

	select DMA_NONCOHERENT

	select GPIOLIB

	select IRQ_MIPS_CPU

	select MFD_SYSCON

	select MIPS_CPU_SCACHE

	select MIPS_GIC

	select PINCTRL

	select REGULATOR

	select SYS_HAS_CPU_MIPS32_R2

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_MIPS_CPS

	select SYS_SUPPORTS_MULTITHREADING

	select SYS_SUPPORTS_RELOCATABLE

	select SYS_SUPPORTS_ZBOOT

	select SYS_HAS_EARLY_PRINTK

	select USE_GENERIC_EARLY_PRINTK_8250

	select USE_OF

	help

	  This enables support for the IMG Pistachio SoC platform.



config MIPS_MALTA

	bool "MIPS Malta board"

	select ARCH_MAY_HAVE_PC_FDC
@@ -1088,7 +1059,6 @@ source "arch/mips/ingenic/Kconfig" 
source "arch/mips/jazz/Kconfig"

source "arch/mips/lantiq/Kconfig"

source "arch/mips/pic32/Kconfig"

source "arch/mips/pistachio/Kconfig"

source "arch/mips/ralink/Kconfig"

source "arch/mips/sgi-ip27/Kconfig"

source "arch/mips/sibyte/Kconfig"

arch/mips/boot/dts/Makefile

+0 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

subdir-$(CONFIG_BMIPS_GENERIC)		+= brcm

subdir-$(CONFIG_CAVIUM_OCTEON_SOC)	+= cavium-octeon

subdir-$(CONFIG_MACH_PISTACHIO)		+= img

subdir-$(CONFIG_FIT_IMAGE_FDT_MARDUK)   += img

subdir-$(CONFIG_FIT_IMAGE_FDT_BOSTON)	+= img

subdir-$(CONFIG_MACH_INGENIC)		+= ingenic

arch/mips/boot/dts/img/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -2,6 +2,3 @@ 
dtb-$(CONFIG_FIT_IMAGE_FDT_BOSTON)	+= boston.dtb



dtb-$(CONFIG_FIT_IMAGE_FDT_MARDUK)	+= pistachio_marduk.dtb
 


dtb-$(CONFIG_MACH_PISTACHIO)	+= pistachio_marduk.dtb

obj-$(CONFIG_MACH_PISTACHIO)	+= pistachio_marduk.dtb.o

arch/mips/configs/pistachio_defconfig

deleted100644 → 0
+0 −316
Original line number Diff line number Diff line 
# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_DEFAULT_HOSTNAME="localhost"

CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_PREEMPT_VOLUNTARY=y

CONFIG_IKCONFIG=m

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=18

CONFIG_CGROUPS=y

CONFIG_CGROUP_SCHED=y

CONFIG_CFS_BANDWIDTH=y

CONFIG_CGROUP_FREEZER=y

CONFIG_NAMESPACES=y

CONFIG_USER_NS=y

CONFIG_BLK_DEV_INITRD=y

# CONFIG_RD_BZIP2 is not set

# CONFIG_RD_LZMA is not set

# CONFIG_RD_LZO is not set

# CONFIG_RD_LZ4 is not set

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_EMBEDDED=y

# CONFIG_COMPAT_BRK is not set

CONFIG_PROFILING=y

CONFIG_MACH_PISTACHIO=y

CONFIG_MIPS_CPS=y

CONFIG_NR_CPUS=4

CONFIG_PM_DEBUG=y

CONFIG_PM_ADVANCED_DEBUG=y

CONFIG_CPU_IDLE=y

# CONFIG_MIPS_CPS_CPUIDLE is not set

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_PARTITION_ADVANCED=y

# CONFIG_COMPACTION is not set

CONFIG_DEFAULT_MMAP_MIN_ADDR=32768

CONFIG_ZSMALLOC=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_NET_KEY=m

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_ADVANCED_ROUTER=y

CONFIG_IP_MULTIPLE_TABLES=y

CONFIG_IP_ROUTE_MULTIPATH=y

CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_MROUTE=y

CONFIG_IP_PIMSM_V1=y

CONFIG_IP_PIMSM_V2=y

CONFIG_SYN_COOKIES=y

CONFIG_INET_AH=m

CONFIG_INET_ESP=m

CONFIG_INET_IPCOMP=m

CONFIG_INET_XFRM_MODE_TRANSPORT=m

CONFIG_INET_XFRM_MODE_TUNNEL=m

CONFIG_INET_XFRM_MODE_BEET=m

# CONFIG_INET_DIAG is not set

CONFIG_TCP_CONG_ADVANCED=y

# CONFIG_TCP_CONG_BIC is not set

# CONFIG_TCP_CONG_WESTWOOD is not set

# CONFIG_TCP_CONG_HTCP is not set

CONFIG_TCP_CONG_LP=m

CONFIG_TCP_MD5SIG=y

CONFIG_INET6_AH=m

CONFIG_INET6_ESP=m

CONFIG_INET6_XFRM_MODE_TRANSPORT=m

CONFIG_INET6_XFRM_MODE_TUNNEL=m

CONFIG_INET6_XFRM_MODE_BEET=m

CONFIG_IPV6_SIT=m

CONFIG_NETWORK_SECMARK=y

CONFIG_NETFILTER=y

# CONFIG_BRIDGE_NETFILTER is not set

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CT_NETLINK=y

CONFIG_NETFILTER_XT_MARK=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y

CONFIG_NETFILTER_XT_TARGET_DSCP=y

CONFIG_NETFILTER_XT_TARGET_NFLOG=y

CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y

CONFIG_NETFILTER_XT_TARGET_SECMARK=y

CONFIG_NETFILTER_XT_TARGET_TCPMSS=m

CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y

CONFIG_NETFILTER_XT_MATCH_DSCP=y

CONFIG_NETFILTER_XT_MATCH_POLICY=y

CONFIG_NETFILTER_XT_MATCH_STATE=y

CONFIG_NF_NAT_IPV4=m

CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_FILTER=y

CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_IP_NF_MANGLE=y

CONFIG_NF_NAT_IPV6=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_MATCH_IPV6HEADER=m

CONFIG_IP6_NF_FILTER=m

CONFIG_IP6_NF_TARGET_REJECT=m

CONFIG_IP6_NF_MANGLE=m

CONFIG_BRIDGE=m

CONFIG_VLAN_8021Q=m

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_HTB=m

CONFIG_NET_SCH_CODEL=m

CONFIG_NET_SCH_FQ_CODEL=m

CONFIG_NET_CLS_U32=m

CONFIG_CLS_U32_MARK=y

CONFIG_BT=m

CONFIG_BT_RFCOMM=m

CONFIG_BT_HCIBTUSB=m

CONFIG_BT_HCIBFUSB=m

CONFIG_BT_HCIVHCI=m

CONFIG_CFG80211=m

CONFIG_NL80211_TESTMODE=y

CONFIG_CFG80211_DEBUGFS=y

CONFIG_CFG80211_WEXT=y

CONFIG_MAC80211=m

CONFIG_MAC80211_LEDS=y

CONFIG_MAC80211_DEBUGFS=y

CONFIG_MAC80211_DEBUG_MENU=y

CONFIG_MAC80211_VERBOSE_DEBUG=y

CONFIG_RFKILL=y

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_DEBUG_DEVRES=y

CONFIG_CONNECTOR=y

CONFIG_MTD=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_SPI_NOR=y

CONFIG_MTD_UBI=y

CONFIG_MTD_UBI_BLOCK=y

CONFIG_ZRAM=m

CONFIG_BLK_DEV_LOOP=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SR=m

CONFIG_SCSI_SPI_ATTRS=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y

CONFIG_DM_VERITY=y

CONFIG_NETDEVICES=y

CONFIG_TUN=m

CONFIG_VETH=m

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_MICROCHIP is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC is not set

CONFIG_STMMAC_ETH=y

# CONFIG_NET_VENDOR_VIA is not set

CONFIG_PPP=m

CONFIG_PPP_ASYNC=m

CONFIG_USB_PEGASUS=m

CONFIG_USB_RTL8150=m

CONFIG_USB_RTL8152=m

CONFIG_USB_NET_DM9601=m

CONFIG_USB_NET_SMSC75XX=m

CONFIG_USB_NET_SMSC95XX=m

CONFIG_USB_NET_MCS7830=m

# CONFIG_USB_NET_CDC_SUBSET is not set

# CONFIG_USB_NET_ZAURUS is not set

CONFIG_HOSTAP=m

CONFIG_HOSTAP_FIRMWARE=y

CONFIG_HOSTAP_FIRMWARE_NVRAM=y

CONFIG_LIBERTAS_THINFIRM=m

CONFIG_RT2X00=m

CONFIG_RT2800USB=m

CONFIG_MAC80211_HWSIM=m

CONFIG_USB_NET_RNDIS_WLAN=m

CONFIG_INPUT_EVDEV=y

# CONFIG_KEYBOARD_ATKBD is not set

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_8250=y

# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_DW=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_HW_RANDOM=y

CONFIG_TCG_TPM=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=m

CONFIG_I2C_IMG=y

CONFIG_I2C_STUB=m

CONFIG_SPI=y

CONFIG_SPI_BITBANG=m

CONFIG_SPI_IMG_SPFI=y

CONFIG_SPI_SPIDEV=y

CONFIG_DEBUG_GPIO=y

CONFIG_GPIO_SYSFS=y

CONFIG_POWER_SUPPLY=y

CONFIG_THERMAL=y

CONFIG_WATCHDOG=y

CONFIG_IMGPDC_WDT=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_GPIO=y

CONFIG_RC_CORE=y

CONFIG_RC_DEVICES=y

CONFIG_IR_IMG=y

CONFIG_IR_IMG_NEC=y

CONFIG_IR_IMG_JVC=y

CONFIG_IR_IMG_SONY=y

CONFIG_IR_IMG_SHARP=y

CONFIG_IR_IMG_SANYO=y

CONFIG_IR_IMG_RC5=y

CONFIG_IR_IMG_RC6=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_FB=y

CONFIG_FB_MODE_HELPERS=y

# CONFIG_LCD_CLASS_DEVICE is not set

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_HRTIMER=m

CONFIG_SND_DYNAMIC_MINORS=y

CONFIG_SND_SEQUENCER=m

CONFIG_SND_SEQ_DUMMY=m

# CONFIG_SND_SPI is not set

CONFIG_SND_USB_AUDIO=m

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

# CONFIG_USB_DEFAULT_PERSIST is not set

CONFIG_USB_MON=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_ROOT_HUB_TT=y

CONFIG_USB_ACM=y

CONFIG_USB_STORAGE=y

CONFIG_USB_DWC2=y

CONFIG_USB_SERIAL=y

CONFIG_USB_SERIAL_GENERIC=y

CONFIG_USB_SERIAL_CP210X=m

CONFIG_USB_SERIAL_FTDI_SIO=m

CONFIG_USB_SERIAL_KEYSPAN=m

CONFIG_USB_SERIAL_PL2303=m

CONFIG_USB_SERIAL_OTI6858=m

CONFIG_USB_SERIAL_QUALCOMM=m

CONFIG_USB_SERIAL_SIERRAWIRELESS=m

CONFIG_USB_SERIAL_OPTION=m

CONFIG_MMC=y

CONFIG_MMC_BLOCK_MINORS=16

CONFIG_MMC_TEST=m

CONFIG_MMC_DW=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_RTC_CLASS=y

CONFIG_DMADEVICES=y

CONFIG_IMG_MDC_DMA=y

CONFIG_STAGING=y

CONFIG_ASHMEM=y

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_MEMORY=y

CONFIG_IIO=y

CONFIG_CC10001_ADC=y

CONFIG_PWM=y

CONFIG_PWM_IMG=y

CONFIG_PHY_PISTACHIO_USB=y

CONFIG_ANDROID=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

# CONFIG_DNOTIFY is not set

CONFIG_FUSE_FS=m

CONFIG_ISO9660_FS=m

CONFIG_JOLIET=y

CONFIG_ZISOFS=y

CONFIG_UDF_FS=m

CONFIG_VFAT_FS=m

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_ECRYPT_FS=y

CONFIG_HFSPLUS_FS=m

CONFIG_UBIFS_FS=y

CONFIG_SQUASHFS=y

CONFIG_SQUASHFS_FILE_DIRECT=y

CONFIG_SQUASHFS_LZO=y

CONFIG_PSTORE=y

CONFIG_PSTORE_CONSOLE=y

CONFIG_PSTORE_RAM=y

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

CONFIG_NLS_DEFAULT="utf8"

CONFIG_NLS_CODEPAGE_437=m

CONFIG_NLS_ASCII=m

CONFIG_NLS_ISO8859_1=m

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_SECURITY_YAMA=y

CONFIG_CRYPTO_AUTHENC=y

CONFIG_CRYPTO_HMAC=y

CONFIG_CRYPTO_SHA1=y

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_ARC4=y

CONFIG_CRYPTO_DES=y

CONFIG_CRC_CCITT=y

CONFIG_CRC_T10DIF=m

CONFIG_CRC7=m

# CONFIG_XZ_DEC_X86 is not set

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_INFO=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0

# CONFIG_SCHED_DEBUG is not set

CONFIG_SCHEDSTATS=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_CREDENTIALS=y

CONFIG_FUNCTION_TRACER=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_LKDTM=y

CONFIG_TEST_UDELAY=m