Commit fc5bad03 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Tony Luck
Browse files

ia64: remove the hpsim platform 



The hpsim platform supports the HP IA64 simulator which was useful as a
bring up platform.  But it is fairly non-standard vs real IA64 system
in that it for example doesn't support ACPI.  It also comes with a
whole bunch of simulator specific drivers.  Remove it to simplify the
IA64 port.

Note that through a weird twist only them hpsim boot loader built the
vmlinux.gz file, so the makefile targets for that are moved to the
main ia64 Makefile now.

Acked-by: default avatarTom Vaden <tom.vaden@hpe.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lkml.kernel.org/r/20190813072514.23299-18-hch@lst.de


Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 05933aac

arch/ia64/Kconfig

+7 −27
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ config IA64 
	bool

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_MIGHT_HAVE_PC_SERIO

	select ACPI if (!IA64_HP_SIM)

	select ARCH_SUPPORTS_ACPI if (!IA64_HP_SIM)

	select ACPI

	select ARCH_SUPPORTS_ACPI

	select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI

	select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI

	select FORCE_PCI if (!IA64_HP_SIM)

	select FORCE_PCI

	select PCI_DOMAINS if PCI

	select PCI_SYSCALL if PCI

	select HAVE_UNSTABLE_SCHED_CLOCK
@@ -140,7 +140,6 @@ config IA64_GENERIC 
	  HP-zx1/sx1000		For HP systems

	  HP-zx1/sx1000+swiotlb	For HP systems with (broken) DMA-constrained devices.

	  SGI-UV		For SGI UV systems

	  Ski-simulator		For the HP simulator <http://www.hpl.hp.com/research/linux/ski/>



	  If you don't know what to do, choose "generic".
@@ -181,11 +180,6 @@ config IA64_SGI_UV 
	  to select this option.  If in doubt, select ia64 generic support

	  instead.



config IA64_HP_SIM

	bool "Ski-simulator"

	select SWIOTLB

	depends on !PM



endchoice



choice
@@ -239,14 +233,7 @@ config IA64_PAGE_SIZE_64KB 


endchoice



if IA64_HP_SIM

config HZ

	default 32

endif



if !IA64_HP_SIM

source "kernel/Kconfig.hz"

endif



config IA64_BRL_EMU

	bool
@@ -265,11 +252,6 @@ config IA64_CYCLONE 
	  Say Y here to enable support for IBM EXA Cyclone time source.

	  If you're unsure, answer N.



config IOSAPIC

	bool

	depends on !IA64_HP_SIM

	default y



config FORCE_MAX_ZONEORDER

	int "MAX_ORDER (11 - 17)"  if !HUGETLB_PAGE

	range 11 17  if !HUGETLB_PAGE
@@ -373,7 +355,7 @@ config ARCH_DISCONTIGMEM_DEFAULT 


config NUMA

	bool "NUMA support"

	depends on !IA64_HP_SIM && !FLATMEM

	depends on !FLATMEM

	select ACPI_NUMA if ACPI

	help

	  Say Y to compile the kernel to support NUMA (Non-Uniform Memory
@@ -395,7 +377,7 @@ config NODES_SHIFT 
config VIRTUAL_MEM_MAP

	bool "Virtual mem map"

	depends on !SPARSEMEM

	default y if !IA64_HP_SIM

	default y

	help

	  Say Y to compile the kernel with support for a virtual mem map.

	  This code also only takes effect if a memory hole of greater than
@@ -478,7 +460,7 @@ config IA64_HP_AML_NFW 


config KEXEC

	bool "kexec system call"

	depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)

	depends on !SMP || HOTPLUG_CPU

	select KEXEC_CORE

	help

	  kexec is a system call that implements the ability to shutdown your
@@ -496,7 +478,7 @@ config KEXEC 


config CRASH_DUMP

	  bool "kernel crash dumps"

	  depends on IA64_MCA_RECOVERY && !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)

	  depends on IA64_MCA_RECOVERY && (!SMP || HOTPLUG_CPU)

	  help

	    Generate crash dump after being started by kexec.
@@ -518,8 +500,6 @@ endif 


endmenu



source "arch/ia64/hp/sim/Kconfig"



config MSPEC

	tristate "Memory special operations driver"

	depends on IA64

arch/ia64/Makefile

+14 −13
Original line number Diff line number Diff line
@@ -39,6 +39,12 @@ $(error Sorry, you need a newer version of the assember, one that is built from 
		ftp://ftp.hpl.hp.com/pub/linux-ia64/gas-030124.tar.gz)

endif



quiet_cmd_gzip = GZIP    $@

cmd_gzip = cat $(real-prereqs) | gzip -n -f -9 > $@



quiet_cmd_objcopy = OBJCOPY $@

cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@



KBUILD_CFLAGS += $(cflags-y)

head-y := arch/ia64/kernel/head.o
@@ -52,15 +58,12 @@ core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/ 
core-$(CONFIG_IA64_SGI_UV)	+= arch/ia64/uv/



drivers-$(CONFIG_PCI)		+= arch/ia64/pci/

drivers-$(CONFIG_IA64_HP_SIM)	+= arch/ia64/hp/sim/

drivers-$(CONFIG_IA64_HP_ZX1)	+= arch/ia64/hp/common/ arch/ia64/hp/zx1/

drivers-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/hp/common/ arch/ia64/hp/zx1/

drivers-$(CONFIG_IA64_GENERIC)	+= arch/ia64/hp/common/ arch/ia64/hp/zx1/ arch/ia64/hp/sim/ arch/ia64/uv/

drivers-$(CONFIG_IA64_GENERIC)	+= arch/ia64/hp/common/ arch/ia64/hp/zx1/ arch/ia64/uv/

drivers-$(CONFIG_OPROFILE)	+= arch/ia64/oprofile/



boot := arch/ia64/hp/sim/boot



PHONY += boot compressed check

PHONY += compressed check



all: compressed unwcheck
@@ -68,22 +71,21 @@ compressed: vmlinux.gz 


vmlinuz: vmlinux.gz



vmlinux.gz: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $@

vmlinux.gz: vmlinux.bin FORCE

	$(call if_changed,gzip)



vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)



unwcheck: vmlinux

	-$(Q)READELF=$(READELF) $(PYTHON) $(srctree)/arch/ia64/scripts/unwcheck.py $<



archclean:

	$(Q)$(MAKE) $(clean)=$(boot)



archheaders:

	$(Q)$(MAKE) $(build)=arch/ia64/kernel/syscalls all



CLEAN_FILES += vmlinux.gz bootloader



boot:	lib/lib.a vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $@

CLEAN_FILES += vmlinux.gz



install: vmlinux.gz

	sh $(srctree)/arch/ia64/install.sh $(KERNELRELEASE) $< System.map "$(INSTALL_PATH)"
@@ -91,7 +93,6 @@ install: vmlinux.gz 
define archhelp

  echo '* compressed	- Build compressed kernel image'

  echo '  install	- Install compressed kernel image'

  echo '  boot		- Build vmlinux and bootloader for Ski simulator'

  echo '* unwcheck	- Check vmlinux for invalid unwind info'

endef

arch/ia64/configs/sim_defconfig

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line 
CONFIG_SYSVIPC=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=16

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_IA64_HP_SIM=y

CONFIG_MCKINLEY=y

CONFIG_IA64_PAGE_SIZE_64KB=y

CONFIG_SMP=y

CONFIG_NR_CPUS=64

CONFIG_PREEMPT=y

CONFIG_IA64_PALINFO=m

CONFIG_EFI_VARS=y

CONFIG_BINFMT_MISC=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

# CONFIG_IPV6 is not set

# CONFIG_STANDALONE is not set

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_SCSI_CONSTANTS=y

CONFIG_SCSI_LOGGING=y

CONFIG_SCSI_SPI_ATTRS=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO_I8042 is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_EFI_RTC=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_HP_SIMETH=y

CONFIG_HP_SIMSERIAL=y

CONFIG_HP_SIMSERIAL_CONSOLE=y

CONFIG_HP_SIMSCSI=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_FS_XATTR is not set

CONFIG_PROC_KCORE=y

CONFIG_HUGETLBFS=y

CONFIG_NFS_FS=y

CONFIG_NFSD=y

CONFIG_NFSD_V3=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_MUTEXES=y

arch/ia64/hp/sim/Kconfig

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



menu "HP Simulator drivers"

	depends on IA64_HP_SIM || IA64_GENERIC



config HP_SIMETH

	bool "Simulated Ethernet "

	depends on NET



config HP_SIMSERIAL

	bool "Simulated serial driver support"

	depends on TTY



config HP_SIMSERIAL_CONSOLE

	bool "Console for HP simulator"

	depends on HP_SIMSERIAL



config HP_SIMSCSI

	bool "Simulated SCSI disk"

	depends on SCSI=y



endmenu

arch/ia64/hp/sim/Makefile

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

#

# ia64/platform/hp/sim/Makefile

#

# Copyright (C) 2002 Hewlett-Packard Co.

#	David Mosberger-Tang <davidm@hpl.hp.com>

# Copyright (C) 1999 Silicon Graphics, Inc.

# Copyright (C) Srinivasa Thirumalachar (sprasad@engr.sgi.com)

#



obj-y := hpsim_irq.o hpsim_setup.o hpsim.o

obj-$(CONFIG_IA64_GENERIC) += hpsim_machvec.o



obj-$(CONFIG_HP_SIMETH)	+= simeth.o

obj-$(CONFIG_HP_SIMSERIAL) += simserial.o

obj-$(CONFIG_HP_SIMSERIAL_CONSOLE) += hpsim_console.o

obj-$(CONFIG_HP_SIMSCSI) += simscsi.o