Drop ia64.

Goodbye, ia64.  Prarit will miss you.

3 files changed, 6 insertions, 224 deletions

diff --git a/Makefile.config b/Makefile.config
index ccb035d77..df66aad19 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -14,10 +14,9 @@ CONFIGFILES	= \
 	$(CFG)-armv7hl-omap.config $(CFG)-armv7hl-tegra.config \
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
 	$(CFG)-sparc64.config  \
-	$(CFG)-ppc64.config $(CFG)-ppc64-debug.config \
-	$(CFG)-ia64.config
+	$(CFG)-ppc64.config $(CFG)-ppc64-debug.config 
 
-PLATFORMS	= x86 x86_64 powerpc powerpc32 powerpc64 s390x ia64 sparc64
+PLATFORMS	= x86 x86_64 powerpc powerpc32 powerpc64 s390x sparc64
 TEMPFILES	= $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
 
 configs: $(CONFIGFILES)
@@ -77,9 +76,6 @@ temp-powerpc32-generic: config-powerpc32-generic temp-powerpc-generic
 temp-s390-generic: config-s390x temp-generic
 	perl merge.pl $^ > $@
 
-temp-ia64-generic: config-ia64-generic temp-generic
-	perl merge.pl $^ > $@
-
 kernel-$(VERSION)-i686-PAE.config: config-i686-PAE temp-x86-32-generic
 	perl merge.pl $^ i386 > $@
 
@@ -133,6 +129,3 @@ kernel-$(VERSION)-ppc.config: /dev/null temp-powerpc32-generic
 
 kernel-$(VERSION)-ppc-smp.config: config-powerpc32-smp temp-powerpc32-generic
 	perl merge.pl $^ powerpc > $@
-
-kernel-$(VERSION)-ia64.config: /dev/null temp-ia64-generic
-	perl merge.pl $^ ia64 > $@
diff --git a/config-ia64-generic b/config-ia64-generic
deleted file mode 100644
index f1fa7056b..000000000
--- a/config-ia64-generic
+++ /dev/null
@@ -1,205 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-
-#
-# Processor type and features
-#
-CONFIG_IA64=y
-CONFIG_64BIT=y
-# CONFIG_XEN is not set
-CONFIG_MMU=y
-CONFIG_EFI=y
-# CONFIG_ITANIUM is not set
-CONFIG_MCKINLEY=y
-CONFIG_IA64_GENERIC=y
-CONFIG_INTEL_IOMMU=y
-# CONFIG_IA64_DIG is not set
-# CONFIG_IA64_HP_ZX1 is not set
-# CONFIG_IA64_SGI_SN2 is not set
-CONFIG_IA64_ESI=y
-CONFIG_IA64_HP_AML_NFW=y
-CONFIG_MSPEC=y
-# CONFIG_IA64_HP_SIM is not set
-# CONFIG_IA64_PAGE_SIZE_4KB is not set
-# CONFIG_IA64_PAGE_SIZE_8KB is not set
-CONFIG_IA64_PAGE_SIZE_16KB=y
-# CONFIG_IA64_PAGE_SIZE_64KB is not set
-CONFIG_IA64_L1_CACHE_SHIFT=7
-CONFIG_NUMA=y
-# CONFIG_VIRTUAL_MEM_MAP is not set
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_MEMORY_HOTPLUG=y
-CONFIG_MEMORY_HOTREMOVE=y
-CONFIG_IA64_MCA_RECOVERY=m
-CONFIG_IA64_CYCLONE=y
-CONFIG_MMTIMER=y
-CONFIG_IOSAPIC=y
-CONFIG_FORCE_MAX_ZONEORDER=18
-CONFIG_NR_CPUS=1024
-# CONFIG_IA32_SUPPORT is not set
-# CONFIG_COMPAT is not set
-CONFIG_PERFMON=y
-CONFIG_IA64_PALINFO=y
-CONFIG_EFI_VARS=y
-CONFIG_SERIAL_8250_RUNTIME_UARTS=16
-CONFIG_EFI_PCDP=y
-#
-# Block devices
-#
-# CONFIG_BLK_DEV_FD is not set
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_BLK_DEV_SGIIOC4=y
-
-#
-# Character devices
-#
-CONFIG_TCG_INFINEON=m
-
-#
-# Watchdog Cards
-#
-# CONFIG_HW_RANDOM is not set
-# CONFIG_GEN_RTC is not set
-CONFIG_EFI_RTC=y
-CONFIG_RTC_DRV_EFI=y
-
-
-#
-# AGP
-#
-CONFIG_AGP_I460=y
-CONFIG_AGP_HP_ZX1=y
-CONFIG_AGP_SGI_TIOCA=y
-
-#
-# HP Simulator drivers
-#
-# CONFIG_HP_SIMETH is not set
-# CONFIG_HP_SIMSERIAL is not set
-# CONFIG_HP_SIMSCSI is not set
-
-#
-# Kernel hacking
-#
-# CONFIG_IA64_PRINT_HAZARDS is not set
-# CONFIG_DISABLE_VHPT is not set
-# CONFIG_IA64_DEBUG_CMPXCHG is not set
-# CONFIG_IA64_DEBUG_IRQ is not set
-
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-
-#
-# SGI
-#
-CONFIG_SGI_SNSC=y
-CONFIG_SGI_TIOCX=y
-CONFIG_SGI_MBCS=m
-CONFIG_SGI_IOC3=m
-CONFIG_SGI_IOC4=y
-CONFIG_SGI_XP=m
-CONFIG_SGI_GRU=m
-# CONFIG_SGI_GRU_DEBUG is not set
-CONFIG_SERIAL_SGI_L1_CONSOLE=y
-CONFIG_SERIAL_SGI_IOC3=m
-CONFIG_SERIAL_SGI_IOC4=m
-
-
-#
-# SCSI low-level drivers
-#
-# CONFIG_SCSI_BUSLOGIC is not set
-
-#
-CONFIG_ACPI=y
-CONFIG_ACPI_AC=y
-# CONFIG_ACPI_ASUS is not set
-CONFIG_ACPI_SYSFS_POWER=y
-# CONFIG_ACPI_BATTERY is not set
-CONFIG_ACPI_BLACKLIST_YEAR=0
-CONFIG_ACPI_BUTTON=y
-# CONFIG_ACPI_DOCK is not set
-CONFIG_ACPI_FAN=y
-CONFIG_ACPI_HOTPLUG_MEMORY=y
-CONFIG_ACPI_NUMA=y
-CONFIG_ACPI_POWER=y
-CONFIG_ACPI_PROCESSOR=y
-CONFIG_ACPI_PROCFS=y
-CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_THERMAL=y
-# CONFIG_ACPI_TOSHIBA is not set
-CONFIG_ACPI_VIDEO=m
-# FIXME: Next two are deprecated. Remove them when they disappear upstream
-# CONFIG_ACPI_PROC_EVENT is not set
-# CONFIG_ACPI_PROCFS_POWER is not set
-CONFIG_ACPI_HED=m
-CONFIG_ACPI_EC_DEBUGFS=m
-CONFIG_ACPI_IPMI=m
-CONFIG_ACPI_CUSTOM_METHOD=m
-CONFIG_SENSORS_ACPI_POWER=m
-
-CONFIG_PM=y
-CONFIG_HOTPLUG_PCI=y
-# CONFIG_HPET is not set
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-CONFIG_HOTPLUG_PCI_SHPC=m
-CONFIG_HOTPLUG_PCI_SGI=m
-CONFIG_PNPACPI=y
-
-CONFIG_SCHED_SMT=y
-
-CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
-
-CONFIG_IA64_ACPI_CPUFREQ=m
-
-# CONFIG_PERMIT_BSP_REMOVE is not set
-# CONFIG_FORCE_CPEI_RETARGET is not set
-
-CONFIG_NODES_SHIFT=10
-
-
-CONFIG_HW_RANDOM_INTEL=m
-
-CONFIG_CRASH_DUMP=y
-CONFIG_PROC_VMCORE=y
-
-# drivers/media/video/usbvision/usbvision-i2c.c:64:39: error: macro "outb" passed 4 arguments, but takes just 2
-# CONFIG_VIDEO_USBVISION is not set
-
-# CONFIG_IA64_MC_ERR_INJECT is not set
-
-CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=y
-
-CONFIG_SENSORS_I5K_AMB=m
-
-CONFIG_SPARSEMEM_VMEMMAP=y
-
-CONFIG_FRAME_WARN=2048
-
-CONFIG_VIRT_CPU_ACCOUNTING=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-
-CONFIG_HP_ILO=m
-
-CONFIG_PARAVIRT_GUEST=y
-CONFIG_PARAVIRT=y
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y
-
-CONFIG_INTEL_IOMMU_DEFAULT_ON=y
-
-CONFIG_RCU_FANOUT=64
-
-CONFIG_ACPI_POWER_METER=m
-CONFIG_I2C_SCMI=m
-
-# CONFIG_HP_ACCEL is not set
diff --git a/kernel.spec b/kernel.spec
index 3f9feeb06..a6e9aba6c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -374,13 +374,6 @@ Summary: The Linux kernel
 %define kernel_image_elf 1
 %endif
 
-%ifarch ia64
-%define all_arch_configs kernel-%{version}-ia64*.config
-%define image_install_path boot/efi/EFI/redhat
-%define make_target compressed
-%define kernel_image vmlinux.gz
-%endif
-
 %ifarch alpha alphaev56
 %define all_arch_configs kernel-%{version}-alpha*.config
 %define image_install_path boot
@@ -509,7 +502,7 @@ Version: %{rpmversion}
 Release: %{pkg_release}
 # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
 # SET %%nobuildarches (ABOVE) INSTEAD
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 %{sparc} s390 s390x alpha alphaev56 %{arm}
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 %{sparc} s390 s390x alpha alphaev56 %{arm}
 ExclusiveOS: Linux
 
 %kernel_reqprovconf
@@ -558,8 +551,6 @@ Source51: config-powerpc32-generic
 Source52: config-powerpc32-smp
 Source53: config-powerpc64
 
-Source60: config-ia64-generic
-
 Source70: config-s390x
 
 Source90: config-sparc64-generic
@@ -2017,6 +2008,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Thu Oct 27 2011 Josh Boyer <jwboyer@redhat.com>
+- Drop ia64
+
 * Wed Oct 26 2011 Kyle McMartin <kmcmartin@redhat.com>
 - Make some config changes caught during a review:
  - CONFIG_SOC_CAMERA: disable, it's only for some ARM boards