drop ia64 support following upstream removal

diff --git a/kernel-ia64.config b/kernel-ia64.config
deleted file mode 100644 (file)
index 62925a7..0000000
--- a/kernel-ia64.config
+++ /dev/null
@@ -1,143 +0,0 @@
-
-#-
-#- *** FILE: arch/Kconfig ***
-#-
-OPROFILE ia64=m
-OPROFILE_IBS ia64=n
-KPROBES ia64=y
-#- file kernel/gcov/Kconfig goes here
-
-#-
-#- *** FILE: arch/ia64/Kconfig ***
-#-
-#- file init/Kconfig goes here
-#- file kernel/Kconfig.freezer goes here
-IA64 ia64=y
-64BIT ia64=y
-ZONE_DMA ia64=y
-MMU ia64=y
-SWIOTLB ia64=y
-RWSEM_XCHGADD_ALGORITHM ia64=y
-GENERIC_FIND_NEXT_BIT ia64=y
-GENERIC_CALIBRATE_DELAY ia64=y
-DMI ia64=y
-EFI ia64=y
-GENERIC_IOMAP ia64=y
-IA64_UNCACHED_ALLOCATOR ia64=y
-AUDIT_ARCH ia64=y
-PARAVIRT_GUEST ia64=n
-PARAVIRT ia64=y
-#- file arch/ia64/xen/Kconfig goes here
-IA64_GENERIC ia64=y
-IA64_DIG ia64=n
-IA64_DIG_VTD ia64=n
-IA64_HP_ZX1 ia64=n
-IA64_HP_ZX1_SWIOTLB ia64=n
-IA64_SGI_SN2 ia64=n
-IA64_SGI_UV ia64=n
-IA64_HP_SIM ia64=n
-ITANIUM ia64=y
-MCKINLEY ia64=n
-IA64_PAGE_SIZE_4KB ia64=n
-IA64_PAGE_SIZE_8KB ia64=n
-IA64_PAGE_SIZE_16KB ia64=y
-IA64_PAGE_SIZE_64KB ia64=n
-PGTABLE_3 ia64=y
-PGTABLE_4 ia64=n
-#- file kernel/Kconfig.hz goes here
-IA64_BRL_EMU ia64=y
-IA64_L1_CACHE_SHIFT ia64=6
-IA64_CYCLONE ia64=y
-IOSAPIC ia64=y
-FORCE_MAX_ZONEORDER ia64=17
-VIRT_CPU_ACCOUNTING ia64=y
-SMP ia64=y
-NR_CPUS ia64=64
-HOTPLUG_CPU ia64=y
-ARCH_ENABLE_MEMORY_HOTPLUG ia64=y
-SCHED_SMT ia64=n
-PERMIT_BSP_REMOVE ia64=n
-#- file kernel/Kconfig.preempt goes here
-#- file mm/Kconfig goes here
-ARCH_SELECT_MEMORY_MODEL ia64=y
-ARCH_DISCONTIGMEM_ENABLE ia64=y
-ARCH_FLATMEM_ENABLE ia64=y
-ARCH_SPARSEMEM_ENABLE ia64=y
-ARCH_DISCONTIGMEM_DEFAULT ia64=y
-NUMA ia64=y
-NODES_SHIFT ia64=10
-ARCH_POPULATES_NODE_MAP ia64=y
-VIRTUAL_MEM_MAP ia64=y
-HOLES_IN_ZONE ia64=y
-HAVE_ARCH_EARLY_PFN_TO_NID ia64=y
-HAVE_ARCH_NODEDATA_EXTENSION ia64=y
-IA32_SUPPORT ia64=y
-COMPAT ia64=y
-IA64_MCA_RECOVERY ia64=m
-PERFMON ia64=y
-IA64_PALINFO ia64=m
-IA64_MC_ERR_INJECT ia64=m
-SGI_SN ia64=y
-IA64_ESI ia64=n
-IA64_HP_AML_NFW ia64=n
-#- file drivers/sn/Kconfig goes here
-#- file drivers/firmware/Kconfig goes here
-#- file fs/Kconfig.binfmt goes here
-#- file kernel/power/Kconfig goes here
-#- file drivers/acpi/Kconfig goes here
-#- file arch/ia64/kernel/cpufreq/Kconfig goes here
-PCI_DOMAINS ia64=y
-#- file drivers/pci/pcie/Kconfig goes here
-#- file drivers/pci/Kconfig goes here
-#- file drivers/pci/hotplug/Kconfig goes here
-#- file drivers/pcmcia/Kconfig goes here
-DMAR_DEFAULT_ON ia64=y
-#- file net/Kconfig goes here
-#- file drivers/Kconfig goes here
-#- file arch/ia64/hp/sim/Kconfig goes here
-MSPEC ia64=m
-#- file fs/Kconfig goes here
-#- file arch/ia64/Kconfig.debug goes here
-#- file security/Kconfig goes here
-#- file crypto/Kconfig goes here
-#- file arch/ia64/kvm/Kconfig goes here
-#- file lib/Kconfig goes here
-GENERIC_HARDIRQS ia64=y
-GENERIC_IRQ_PROBE ia64=y
-GENERIC_PENDING_IRQ ia64=y
-IRQ_PER_CPU ia64=y
-
-#-
-#- *** FILE: arch/ia64/Kconfig.debug ***
-#-
-#- file lib/Kconfig.debug goes here
-IA64_GRANULE_16MB ia64=y
-IA64_GRANULE_64MB ia64=n
-IA64_PRINT_HAZARDS ia64=y
-DISABLE_VHPT ia64=n
-IA64_DEBUG_CMPXCHG ia64=n
-IA64_DEBUG_IRQ ia64=n
-SYSVIPC_COMPAT ia64=y
-
-#-
-#- *** FILE: arch/ia64/hp/sim/Kconfig ***
-#-
-HP_SIMETH ia64=y
-HP_SIMSERIAL ia64=y
-HP_SIMSERIAL_CONSOLE ia64=y
-
-#-
-#- *** FILE: arch/ia64/kernel/cpufreq/Kconfig ***
-#-
-#- file drivers/cpufreq/Kconfig goes here
-#- CPUFreq processor drivers
-IA64_ACPI_CPUFREQ ia64=m
-
-#-
-#- *** FILE: arch/ia64/kvm/Kconfig ***
-#-
-#- file virt/kvm/Kconfig goes here
-VIRTUALIZATION ia64=y
-KVM ia64=m
-KVM_INTEL ia64=m
-#- file drivers/virtio/Kconfig goes here

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index b0f983f01d10ff49008d64b9ff9e50690cc0ba4c..e5ce0c6e847b89c2fdec1529f578038206a8c446 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -408,7 +408,7 @@ SPEAKUP_SYNTH_DUMMY all=m
 #-
 #- *** FILE: drivers/acpi/Kconfig ***
 #-
-ACPI arm64=y ia64=y x86=y
+ACPI arm64=y x86=y
 ACPI_DEBUGGER all=n
 ACPI_SPCR_TABLE all=y
 ACPI_SLEEP x86=y
@@ -477,7 +477,7 @@ NFIT_SECURITY_DEBUG all=n
 #-
 #- *** FILE: drivers/acpi/numa/Kconfig ***
 #-
-ACPI_NUMA ia64=y x86_64=y
+ACPI_NUMA x86_64=y
 ACPI_HMAT all=y
 
 #-
@@ -501,7 +501,7 @@ ANDROID_BINDER_IPC_SELFTEST all=n
 #- *** FILE: drivers/ata/Kconfig ***
 #-
 ATA all=m
-ATA_NONSTANDARD all=n ia64=y ppc64=y
+ATA_NONSTANDARD all=n ppc64=y
 ATA_VERBOSE_ERROR all=y
 ATA_ACPI all=y
 SATA_ZPODD all=y
@@ -598,7 +598,7 @@ PATA_WINBOND_VLB all=m sparc=n
 PATA_PARPORT all=m
 #- file drivers/ata/pata_parport/Kconfig goes here
 #- Generic fallback / legacy drivers
-PATA_ACPI arm64=m i386=m ia64=m x86_64=m
+PATA_ACPI arm64=m i386=m x86_64=m
 ATA_GENERIC all=m sparc=n
 PATA_LEGACY all=m
 
@@ -961,10 +961,10 @@ IPMB_DEVICE_INTERFACE all=m
 #- *** FILE: drivers/char/tpm/Kconfig ***
 #-
 #* TCG_TPM forced to 'y' by IMA
-TCG_TPM all=m x86=y ia64=y
+TCG_TPM all=m x86=y
 HW_RANDOM_TPM all=y
 #* TCG_TIS forced to 'y' by IMA
-TCG_TIS all=m x86=y ia64=y
+TCG_TIS all=m x86=y
 TCG_TIS_SPI all=m
 TCG_TIS_SPI_CR50 all=y
 TCG_TIS_I2C all=m
@@ -4031,8 +4031,8 @@ JOYSTICK_TURBOGRAFX all=m
 JOYSTICK_AS5011 all=m
 JOYSTICK_JOYDUMP all=m
 JOYSTICK_XPAD all=m sparc=n
-JOYSTICK_XPAD_FF all=y ia64=n
-JOYSTICK_XPAD_LEDS all=y ia64=n
+JOYSTICK_XPAD_FF all=y
+JOYSTICK_XPAD_LEDS all=y
 JOYSTICK_WALKERA0701 all=m
 JOYSTICK_PSXPAD_SPI all=m
 JOYSTICK_PSXPAD_SPI_FF all=y
@@ -5007,7 +5007,6 @@ VIDEO_TDA9840 all=m
 VIDEO_TEA6415C all=m
 VIDEO_TEA6420 all=m
 VIDEO_TVAUDIO all=m
-VIDEO_VP27SMPX ia64=m
 VIDEO_WM8739 all=m
 VIDEO_WM8775 all=m
 VIDEO_SAA6588 all=m
@@ -5596,7 +5595,7 @@ VIDEO_AU0828_RC all=y
 #-
 #- *** FILE: drivers/media/usb/b2c2/Kconfig ***
 #-
-DVB_B2C2_FLEXCOP_USB alpha=m arm=m arm64=m ia64=m i386=m ppc=m ppc64=m sparc64=m x86_64=m
+DVB_B2C2_FLEXCOP_USB alpha=m arm=m arm64=m i386=m ppc=m ppc64=m sparc64=m x86_64=m
 DVB_B2C2_FLEXCOP_USB_DEBUG all=n
 
 #-
@@ -6019,15 +6018,15 @@ TIFM_7XX1 all=m
 ICS932S401 all=m
 ATMEL_SSC all=m
 ENCLOSURE_SERVICES all=m
-SGI_XP ia64=m x86_64=m
+SGI_XP x86_64=m
 SMPRO_ERRMON all=m
 SMPRO_MISC all=m
 CS5535_MFGPT all=m
 CS5535_CLOCK_EVENT_SRC all=m
 HI6421V600_IRQ arm=m arm64=m
 HP_ILO all=m
-SGI_GRU ia64=m x86_64=m
-SGI_GRU_DEBUG ia64=n x86_64=n
+SGI_GRU x86_64=m
+SGI_GRU_DEBUG x86_64=n
 APDS9802ALS all=m
 ISL29003 all=m
 ISL29020 all=m
@@ -8026,7 +8025,7 @@ HDLC_X25 all=m
 #- X.25/LAPB support is disabled
 PCI200SYN all=m
 WANXL all=m
-PC300TOO all=m ia64=n ppc=n ppc64=n
+PC300TOO all=m ppc=n ppc64=n
 N2 alpha=m i386=m
 C101 alpha=m i386=m
 FARSYNC all=m
@@ -8853,12 +8852,12 @@ OF_OVERLAY arm=y arm64=y
 PARPORT all=m
 PARPORT_PC all=m
 PARPORT_SERIAL all=m
-PARPORT_PC_FIFO all=y ia64=n
+PARPORT_PC_FIFO all=y
 PARPORT_PC_SUPERIO all=y
 PARPORT_PC_PCMCIA all=m
 PARPORT_GSC all=n
 PARPORT_SUNBPP sparc=m sparc64=m
-PARPORT_1284 all=y ia64=n
+PARPORT_1284 all=y
 PARPORT_NOT_PC all=y
 
 #-
@@ -9675,7 +9674,7 @@ POWER_MLXBF arm64=m
 #- *** FILE: drivers/power/supply/Kconfig ***
 #-
 #* ACPI_SYSFS_POWER selects POWER_SUPPLY=y
-POWER_SUPPLY all=m arm=y arm64=y i386=y ia64=y x86_64=y
+POWER_SUPPLY all=m arm=y arm64=y i386=y x86_64=y
 POWER_SUPPLY_DEBUG all=n
 APM_POWER arm=m ppc=m
 GENERIC_ADC_BATTERY all=m
@@ -10075,7 +10074,7 @@ RTC_DRV_PCF85363 all=m
 RTC_DRV_PCF8563 all=m
 RTC_DRV_PCF8583 all=m sparc=n
 RTC_DRV_M41T80 all=m
-RTC_DRV_M41T80_WDT all=n ia64=y
+RTC_DRV_M41T80_WDT all=n
 RTC_DRV_BD70528 all=m
 RTC_DRV_BQ32K all=m
 RTC_DRV_TWL4030 all=m
@@ -10424,7 +10423,7 @@ SCSI_MVSAS_TASKLET all=y
 #-
 #- *** FILE: drivers/scsi/pcmcia/Kconfig ***
 #-
-SCSI_LOWLEVEL_PCMCIA all=y ia64=n
+SCSI_LOWLEVEL_PCMCIA all=y
 PCMCIA_AHA152X arm=n i386=m ppc=n x86_64=m
 PCMCIA_FDOMAIN all=m
 PCMCIA_NINJA_SCSI arm=n i386=m ppc=n x86_64=m
@@ -11986,7 +11985,7 @@ FB_CONTROL ppc=y
 FB_PLATINUM ppc=y
 FB_VALKYRIE ppc=y
 FB_CT65550 ppc=n
-FB_ASILIANT all=n i386=y ia64=y x86_64=y
+FB_ASILIANT all=n i386=y x86_64=y
 FB_IMSTT all=n i386=y
 FB_VGA16 i386=m ppc=n ppc64=n x86_64=m
 FB_TGA alpha=m
@@ -12056,7 +12055,7 @@ FB_VIA_X_COMPATIBILITY all=y
 FB_NEOMAGIC all=m
 FB_KYRO all=m
 FB_3DFX all=m sparc=n
-FB_3DFX_ACCEL all=y ia64=n sparc64=n
+FB_3DFX_ACCEL all=y sparc64=n
 FB_3DFX_I2C all=y
 FB_VOODOO1 all=m
 FB_VT8623 all=m sparc=n
@@ -13228,10 +13227,10 @@ HZ all=300 alpha=1024
 #-
 #- *** FILE: kernel/Kconfig.kexec ***
 #-
-KEXEC arm=y arm64=y ia64=y powerpc=y x86=y
+KEXEC arm=y arm64=y powerpc=y x86=y
 KEXEC_FILE all=y
 KEXEC_SIG all=n
-CRASH_DUMP arm=n arm64=n ia64=n powerpc=n x86=n
+CRASH_DUMP arm=n arm64=n powerpc=n x86=n
 
 #-
 #- *** FILE: kernel/Kconfig.preempt ***
@@ -13354,7 +13353,7 @@ ENERGY_MODEL all=y
 TREE_RCU all=y
 RCU_EXPERT all=n
 TASKS_RCU all=y
-RCU_FANOUT all=32 alpha=64 ia64=64 ppc64=64 sparc64=64 x86_64=64
+RCU_FANOUT all=32 alpha=64 ppc64=64 sparc64=64 x86_64=64
 RCU_FANOUT_LEAF all=16
 RCU_NOCB_CPU all=n
 
@@ -13377,8 +13376,8 @@ TICK_ONESHOT i386=y sparc64=y
 HZ_PERIODIC all=n
 NO_HZ_IDLE all=y
 NO_HZ_FULL all=n
-NO_HZ all=y alpha= ia64=
-HIGH_RES_TIMERS all=y alpha= ia64=
+NO_HZ all=y alpha=
+HIGH_RES_TIMERS all=y alpha=
 CLOCKSOURCE_WATCHDOG_MAX_SKEW_US all=100
 
 #-
@@ -13725,7 +13724,7 @@ CRYPTO_LIB_CHACHA20POLY1305 all=m
 #-
 #- *** FILE: lib/fonts/Kconfig ***
 #-
-FONTS all=y alpha=n i386=n ia64=n x86_64=n
+FONTS all=y alpha=n i386=n x86_64=n
 FONT_8x8 all=y
 FONT_8x16 all=y
 FONT_6x11 all=y
@@ -16159,8 +16158,6 @@ RD_ZSTD all=y
 #-
 #- *** PROBABLY REMOVED OPTIONS ***
 #-
-AGP_HP_ZX1 ia64=m
-AGP_I460 ia64=m
 AMD_IOMMU_V2 all=m
 AUFS_DIRREN all=y
 AUFS_FHSM all=y
@@ -16172,7 +16169,6 @@ COPS_TANGENT alpha=y i386=y
 DEBUG_CREDENTIALS all=n
 DEV_APPLETALK all=m
 EEPROM_LEGACY all=m
-EFI_PCDP ia64=y
 IPDDP all=m
 IPDDP_ENCAP all=y
 MODULE_SIG_SHA1 all=y

diff --git a/kernel.spec b/kernel.spec
index 945482bb6cb1c5ffd75388ea41fb671dc0417f43..3aa7327419ce43eb393f283f208ed97b504c4b2c 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -133,7 +133,6 @@ Source21:   kernel-x86.config
 Source22:      kernel-sparc.config
 Source23:      kernel-alpha.config
 Source24:      kernel-powerpc.config
-Source25:      kernel-ia64.config
 Source26:      kernel-arm.config
 Source27:      kernel-arm64.config
 
@@ -277,7 +276,7 @@ Conflicts:  xfsprogs < 2.6.0
 %if %{with pae}
 ExclusiveArch: i686 pentium3 pentium4 athlon
 %else
-ExclusiveArch: i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32 alpha %{arm} ia64 ppc ppc64 sparc sparc64 aarch64
+ExclusiveArch: i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32 alpha %{arm} ppc ppc64 sparc sparc64 aarch64
 %endif
 ExclusiveOS:   Linux
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -307,11 +306,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _noautochrpath  .*%{_kernelsrcdir}/.*
 %define                _enable_debug_packages  0
 
-%ifarch ia64
-%define                initrd_dir      /boot/efi
-%else
 %define                initrd_dir      /boot
-%endif
 
 %define                topdir          %{_builddir}/%{name}-%{version}
 %define                srcdir          %{topdir}/linux-%{basever}
@@ -948,11 +943,6 @@ cp -aL %{objdir}/.config $RPM_BUILD_ROOT/boot/config-%{kernel_release}
        install -p %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
        install -p %{objdir}/vmlinux $RPM_BUILD_ROOT/boot/vmlinux-%{kernel_release}
 %endif
-%ifarch ia64
-       %{__gzip} -cfv %{objdir}/vmlinux > %{objdir}/vmlinuz
-       cp -a %{objdir}/vmlinuz $RPM_BUILD_ROOT/boot/efi/vmlinuz-%{kernel_release}
-       ln -sf efi/vmlinuz-%{kernel_release} $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
-%endif
 %ifarch alpha sparc sparc64
        %{__gzip} -cfv %{objdir}/vmlinux > %{objdir}/vmlinuz
        cp -a %{objdir}/vmlinuz $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
@@ -1061,14 +1051,6 @@ fi
 %post
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
 if [[ "$CREATE_SYMLINKS" != [Nn][Oo] ]]; then
-%ifarch ia64
-       mv -f /boot/efi/vmlinuz{,.old} 2> /dev/null
-       ln -sf vmlinuz-%{kernel_release} /boot/efi/vmlinuz
-%if 0%{?alt_kernel:1}
-       mv -f /boot/efi/vmlinuz%{_alt_kernel}{,.old} 2> /dev/null
-       ln -sf vmlinuz-%{kernel_release} /boot/efi/vmlinuz%{_alt_kernel}
-%endif
-%endif
        mv -f /boot/vmlinuz{,.old} 2> /dev/null
        mv -f /boot/System.map{,.old} 2> /dev/null
        ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz
@@ -1193,9 +1175,6 @@ fi
 %ifarch sparc sparc64
 /boot/vmlinux.aout-%{kernel_release}
 %endif
-%ifarch ia64
-/boot/efi/vmlinuz-%{kernel_release}
-%endif
 %ifarch %{arm} aarch64
 /boot/dtb-%{kernel_release}
 %endif