diff options
| -rw-r--r-- | Makefile.config | 12 | ||||
| -rw-r--r-- | config-powerpc32-generic | 179 | ||||
| -rw-r--r-- | config-powerpc32-smp | 3 | ||||
| -rw-r--r-- | filter-ppc.sh | 14 | ||||
| -rw-r--r-- | kernel.spec | 70 |
5 files changed, 9 insertions, 269 deletions
diff --git a/Makefile.config b/Makefile.config index 348396828..63549f642 100644 --- a/Makefile.config +++ b/Makefile.config @@ -11,11 +11,10 @@ CONFIGFILES = \ $(CFG)-s390x.config \ $(CFG)-armv7hl.config $(CFG)-armv7hl-lpae.config \ $(CFG)-aarch64.config \ - $(CFG)-ppc.config $(CFG)-ppc-smp.config \ $(CFG)-ppc64.config $(CFG)-ppc64p7.config $(CFG)-ppc64-debug.config \ $(CFG)-ppc64le.config -PLATFORMS = x86 x86_64 powerpc powerpc32 powerpc64 s390x arm arm64 +PLATFORMS = x86 x86_64 powerpc powerpc64 s390x arm arm64 TEMPFILES = $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS))) configs: $(CONFIGFILES) @@ -81,9 +80,6 @@ temp-powerpc-generic: config-powerpc-generic temp-generic temp-powerpc-debug-generic: config-powerpc-generic temp-debug-generic perl merge.pl $^ > $@ -temp-powerpc32-generic: config-powerpc32-generic temp-powerpc-generic - perl merge.pl $^ > $@ - temp-powerpc64-generic: config-powerpc64 temp-powerpc-generic perl merge.pl $^ > $@ @@ -134,9 +130,3 @@ $(CFG)-armv7hl-lpae.config: /dev/null temp-armv7-lpae $(CFG)-aarch64.config: /dev/null temp-arm64 perl merge.pl $^ arm64 > $@ - -$(CFG)-ppc.config: /dev/null temp-powerpc32-generic - perl merge.pl $^ powerpc > $@ - -$(CFG)-ppc-smp.config: config-powerpc32-smp temp-powerpc32-generic - perl merge.pl $^ powerpc > $@ diff --git a/config-powerpc32-generic b/config-powerpc32-generic deleted file mode 100644 index aadda4865..000000000 --- a/config-powerpc32-generic +++ /dev/null @@ -1,179 +0,0 @@ -# CONFIG_SMP is not set -CONFIG_PPC32=y -# CONFIG_PPC64 is not set -# CONFIG_RTAS_PROC is not set -# CONFIG_HOTPLUG_PCI is not set -CONFIG_CPU_FREQ_PMAC=y -CONFIG_PPC_CHRP=y -CONFIG_PPC_PMAC=y -# CONFIG_PPC_MPC52xx is not set -CONFIG_PPC_PREP=y - -# CONFIG_PPC_MPC5200_SIMPLE is not set -# CONFIG_SATA_FSL is not set -# CONFIG_SATA_NV is not set - -# busted in .28git1 -# ERROR: "cacheable_memzero" [drivers/net/gianfar_driver.ko] undefined! -# CONFIG_GIANFAR is not set -# CONFIG_USB_EHCI_FSL is not set - -CONFIG_PMAC_APM_EMU=y -CONFIG_PMAC_BACKLIGHT=y - -CONFIG_HIGHMEM=y -# CONFIG_HIGHMEM_START_BOOL is not set -# CONFIG_LOWMEM_SIZE_BOOL is not set -# CONFIG_TASK_SIZE_BOOL is not set -# CONFIG_KERNEL_START_BOOL is not set -# CONFIG_PPC601_SYNC_FIX is not set -CONFIG_ADVANCED_OPTIONS=y -CONFIG_SCSI_MESH=m -CONFIG_SCSI_MESH_SYNC_RATE=5 -CONFIG_SCSI_MESH_RESET_DELAY_MS=4000 - -CONFIG_LBDAF=y - -CONFIG_SCSI_MAC53C94=m -CONFIG_ADB_CUDA=y -CONFIG_ADB_MACIO=y -CONFIG_INPUT_ADBHID=y -CONFIG_ADB_PMU_LED=y -CONFIG_ADB_PMU_LED_IDE=y - -CONFIG_PMAC_MEDIABAY=y -CONFIG_NET_VENDOR_APPLE=y -CONFIG_BMAC=m -CONFIG_MACE=m -# CONFIG_MACE_AAUI_PORT is not set -# CONFIG_MV643XX_ETH is not set -CONFIG_I2C_HYDRA=m -CONFIG_I2C_MPC=m -CONFIG_THERM_WINDTUNNEL=m -CONFIG_THERM_ADT746X=m -# CONFIG_ANSLCD is not set - -CONFIG_FB_PLATINUM=y -CONFIG_FB_VALKYRIE=y -CONFIG_FB_CT65550=y -# CONFIG_BDI_SWITCH is not set - -CONFIG_MAC_FLOPPY=m -# CONFIG_BLK_DEV_FD is not set - -CONFIG_FB_ATY128=y -CONFIG_FB_ATY=y -CONFIG_FB_MATROX=y -# CONFIG_KEXEC is not set - -# CONFIG_HVC_RTAS is not set - -# CONFIG_UDBG_RTAS_CONSOLE is not set -CONFIG_BRIQ_PANEL=m - -# CONFIG_ATA_PIIX is not set -# CONFIG_PATA_AMD is not set -# CONFIG_PATA_ATIIXP is not set -# CONFIG_PATA_MPC52xx is not set -# CONFIG_PATA_MPIIX is not set -# CONFIG_PATA_OLDPIIX is not set -# CONFIG_PATA_OPTI is not set -# CONFIG_PATA_SERVERWORKS is not set - -# CONFIG_SERIAL_MPC52xx is not set -# CONFIG_MPC5200_WDT is not set -CONFIG_8xxx_WDT=m -CONFIG_GEF_WDT=m - -# CONFIG_PPC_MPC5200_BUGFIX is not set -# CONFIG_NET_VENDOR_FREESCALE is not set -#CHECK: This may later become a tristate. -CONFIG_MDIO_GPIO=m - -CONFIG_SERIAL_OF_PLATFORM=y -CONFIG_DEBUG_STACKOVERFLOW=y - -# CONFIG_EMBEDDED6xx is not set - -# CONFIG_BLK_DEV_PLATFORM is not set -# CONFIG_BLK_DEV_4DRIVES is not set -# CONFIG_BLK_DEV_ALI14XX is not set -# CONFIG_BLK_DEV_DTC2278 is not set -# CONFIG_BLK_DEV_HT6560B is not set -# CONFIG_BLK_DEV_QD65XX is not set -# CONFIG_BLK_DEV_UMC8672 is not set - -# CONFIG_VIRQ_DEBUG is not set - -CONFIG_PPC_BESTCOMM_ATA=m -CONFIG_PPC_BESTCOMM_FEC=m -CONFIG_PPC_BESTCOMM_GEN_BD=m - -CONFIG_FORCE_MAX_ZONEORDER=11 -# CONFIG_PAGE_OFFSET_BOOL is not set -# CONFIG_FB_FSL_DIU is not set -CONFIG_IRQSTACKS=y -CONFIG_VIRTUALIZATION=y - -# CONFIG_DEBUG_GPIO is not set -# CONFIG_GPIO_PCA953X is not set -# CONFIG_GPIO_PCF857X is not set -# CONFIG_HTC_EGPIO is not set - -# CONFIG_TIFM_CORE is not set - -# CONFIG_BLK_CPQ_CISS_DA is not set -# CONFIG_CISS_SCSI_TAPE is not set - -# CONFIG_I2C_NFORCE2 is not set - -# CONFIG_SND_INTEL8X0 is not set -# CONFIG_SND_INTEL8X0M is not set - -# CONFIG_MEMSTICK is not set - -# CONFIG_IPMI_HANDLER is not set - -# PPC gets sad with debug alloc (bz 448598) -# CONFIG_DEBUG_PAGEALLOC is not set - -CONFIG_CRYPTO_DEV_TALITOS=m - -# CONFIG_FSL_EMB_PERFMON is not set -# CONFIG_MPC8272_ADS is not set -# CONFIG_PQ2FADS is not set -# CONFIG_EP8248E is not set -# CONFIG_MPC830x_RDB is not set -# CONFIG_MPC831x_RDB is not set -# CONFIG_MPC832x_MDS is not set -# CONFIG_MPC832x_RDB is not set -# CONFIG_MPC834x_MDS is not set -# CONFIG_MPC834x_ITX is not set -# CONFIG_MPC836x_MDS is not set -# CONFIG_MPC836x_RDK is not set -# CONFIG_MPC837x_MDS is not set -# CONFIG_MPC837x_RDB is not set -# CONFIG_SBC834x is not set -# CONFIG_ASP834x is not set -# CONFIG_KMETER1 is not set -# CONFIG_MPC8641_HPCN is not set -# CONFIG_SBC8641D is not set -# CONFIG_MPC8610_HPCD is not set -# CONFIG_FSL_LBC is not set -# CONFIG_MTD_NAND_FSL_UPM is not set - -# CONFIG_USB_MUSB_HDRC is not set - -# busted in 2.6.27 -# drivers/mtd/maps/sbc8240.c: In function 'init_sbc8240_mtd': -# drivers/mtd/maps/sbc8240.c:172: warning: passing argument 1 of 'simple_map_init' from incompatible pointer type -# drivers/mtd/maps/sbc8240.c:177: error: 'struct mtd_info' has no member named 'module' - -CONFIG_RCU_FANOUT=32 - -CONFIG_KVM_BOOK3S_32=m - -# CONFIG_SCSI_QLA_ISCSI is not set - -CONFIG_BATTERY_PMU=m - diff --git a/config-powerpc32-smp b/config-powerpc32-smp deleted file mode 100644 index 5dbe87f7f..000000000 --- a/config-powerpc32-smp +++ /dev/null @@ -1,3 +0,0 @@ -# CONFIG_HOTPLUG_CPU is not set -CONFIG_NR_CPUS=4 -# CONFIG_BATTERY_PMU is not set diff --git a/filter-ppc.sh b/filter-ppc.sh deleted file mode 100644 index 8ff7a3b9d..000000000 --- a/filter-ppc.sh +++ /dev/null @@ -1,14 +0,0 @@ -#! /bin/bash - -# This is the ppc override file for the core/drivers package split. The -# module directories listed here and in the generic list in filter-modules.sh -# will be moved to the resulting kernel-modules package for this arch. -# Anything not listed in those files will be in the kernel-core package. -# -# Please review the default list in filter-modules.sh before making -# modifications to the overrides below. If something should be removed across -# all arches, remove it in the default instead of per-arch. - -driverdirs="atm auxdisplay bcma bluetooth fmc infiniband isdn leds media memstick message mmc mtd nfc ntb pcmcia platform power ssb staging uio uwb" - -singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs iscsi_tcp megaraid pmcraid qla1280 9pnet_rdma svcrdma xprtrdma hid-picolcd hid-prodikeys hwa-hc hwpoison-inject" diff --git a/kernel.spec b/kernel.spec index f17b502ba..e0f55731b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -86,8 +86,6 @@ Summary: The Linux kernel # # standard kernel %define with_up %{?_without_up: 0} %{?!_without_up: 1} -# kernel-smp (only valid for ppc 32-bit) -%define with_smp %{?_without_smp: 0} %{?!_without_smp: 1} # kernel PAE (only valid for i686 (PAE) and ARM (lpae)) %define with_pae %{?_without_pae: 0} %{?!_without_pae: 1} # kernel-debug @@ -109,8 +107,6 @@ Summary: The Linux kernel # # Only build the base kernel (--with baseonly): %define with_baseonly %{?_with_baseonly: 1} %{?!_with_baseonly: 0} -# Only build the smp kernel (--with smponly): -%define with_smponly %{?_with_smponly: 1} %{?!_with_smponly: 0} # Only build the pae kernel (--with paeonly): %define with_paeonly %{?_with_paeonly: 1} %{?!_with_paeonly: 0} # Only build the debug kernel (--with dbgonly): @@ -193,14 +189,6 @@ Summary: The Linux kernel # if requested, only build base kernel %if %{with_baseonly} -%define with_smp 0 -%define with_pae 0 -%define with_debug 0 -%endif - -# if requested, only build smp kernel -%if %{with_smponly} -%define with_up 0 %define with_pae 0 %define with_debug 0 %endif @@ -208,7 +196,6 @@ Summary: The Linux kernel # if requested, only build pae kernel %if %{with_paeonly} %define with_up 0 -%define with_smp 0 %define with_debug 0 %endif @@ -218,7 +205,6 @@ Summary: The Linux kernel %define with_up 0 %define with_pae 0 %endif -%define with_smp 0 %define with_pae 0 %define with_tools 0 %define with_perf 0 @@ -228,16 +214,11 @@ Summary: The Linux kernel %if %{with_vdso_install} # These arches install vdso/ directories. -%define vdso_arches %{all_x86} x86_64 ppc %{power64} s390 s390x aarch64 +%define vdso_arches %{all_x86} x86_64 %{power64} s390 s390x aarch64 %endif # Overrides for generic default options -# only ppc needs a separate smp kernel -%ifnarch ppc -%define with_smp 0 -%endif - # don't do debug builds on anything but i686 and x86_64 %ifnarch i686 x86_64 %define with_debug 0 @@ -254,7 +235,7 @@ Summary: The Linux kernel # bootwrapper is only on ppc # sparse blows up on ppc -%ifnarch ppc %{power64} +%ifnarch %{power64} %define with_bootwrapper 0 %define with_sparse 0 %endif @@ -302,16 +283,6 @@ Summary: The Linux kernel %define with_tools 0 %endif -%ifarch ppc -%define asmarch powerpc -%define hdrarch powerpc -%define all_arch_configs kernel-%{version}-ppc{-,.}*config -%define image_install_path boot -%define make_target vmlinux -%define kernel_image vmlinux -%define kernel_image_elf 1 -%endif - %ifarch %{arm} %define all_arch_configs kernel-%{version}-arm*.config %define image_install_path boot @@ -363,7 +334,6 @@ Summary: The Linux kernel %ifarch %nobuildarches %define with_up 0 -%define with_smp 0 %define with_pae 0 %define with_debuginfo 0 %define with_perf 0 @@ -377,7 +347,7 @@ Summary: The Linux kernel %endif # Architectures we build tools/cpupower on -%define cpupowerarchs %{ix86} x86_64 ppc %{power64} %{arm} aarch64 +%define cpupowerarchs %{ix86} x86_64 %{power64} %{arm} aarch64 # # Packages that need to be installed before the kernel is, because the %%post @@ -395,7 +365,7 @@ Version: %{rpmversion} Release: %{pkg_release} # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD. # SET %%nobuildarches (ABOVE) INSTEAD -ExclusiveArch: %{all_x86} x86_64 ppc ppc64 ppc64p7 s390 s390x %{arm} aarch64 ppc64le +ExclusiveArch: %{all_x86} x86_64 ppc64 ppc64p7 s390 s390x %{arm} aarch64 ppc64le ExclusiveOS: Linux %ifnarch %{nobuildarches} Requires: kernel-%{?variant:%{variant}-}core-uname-r = %{KVERREL}%{?variant} @@ -449,7 +419,6 @@ Source90: filter-x86_64.sh Source91: filter-armv7hl.sh Source92: filter-i686.sh Source93: filter-aarch64.sh -Source94: filter-ppc.sh Source95: filter-ppc64.sh Source96: filter-ppc64le.sh Source97: filter-s390x.sh @@ -471,8 +440,6 @@ Source32: config-x86-32-generic Source40: config-x86_64-generic Source50: config-powerpc-generic -Source51: config-powerpc32-generic -Source52: config-powerpc32-smp Source53: config-powerpc64 Source54: config-powerpc64p7 Source55: config-powerpc64le @@ -925,15 +892,6 @@ Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?1:+%{1}}\ # Now, each variant package. -%define variant_summary The Linux kernel compiled for SMP machines -%kernel_variant_package -n SMP smp -%description smp-core -This package includes a SMP version of the Linux kernel. It is -required only on machines with two or more CPUs as well as machines with -hyperthreading technology. - -Install the kernel-smp package if your machine uses two or more CPUs. - %ifnarch armv7hl %define variant_summary The Linux kernel compiled for PAE capable machines %kernel_variant_package %{pae} @@ -997,13 +955,6 @@ exit 1 %endif %endif -%if %{with_smponly} -%if !%{with_smp} -echo "Cannot build --with smponly, smp build is disabled" -exit 1 -%endif -%endif - %if "%{baserelease}" == "0" echo "baserelease must be greater than zero" exit 1 @@ -1614,7 +1565,7 @@ BuildKernel() { fi rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*.o rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o -%ifarch ppc %{power64} +%ifarch %{power64} cp -a --parents arch/powerpc/lib/crtsavres.[So] $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ %endif if [ -d arch/%{asmarch}/include ]; then @@ -1797,10 +1748,6 @@ BuildKernel %make_target %kernel_image %{pae} BuildKernel %make_target %kernel_image %endif -%if %{with_smp} -BuildKernel %make_target %kernel_image smp -%endif - %global perf_make \ make -s %{?cross_opts} %{?_smp_mflags} -C tools/perf V=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix} %if %{with_perf} @@ -2084,9 +2031,6 @@ fi}\ %kernel_variant_preun %kernel_variant_post -r kernel-smp -%kernel_variant_preun smp -%kernel_variant_post -v smp - %kernel_variant_preun %{pae} %kernel_variant_post -v %{pae} -r (kernel|kernel-smp) @@ -2241,7 +2185,6 @@ fi %kernel_variant_files %{with_up} -%kernel_variant_files %{with_smp} smp %kernel_variant_files %{with_debug} debug %kernel_variant_files %{with_pae} %{pae} %kernel_variant_files %{with_pae_debug} %{pae}debug @@ -2260,6 +2203,9 @@ fi # ||----w | # || || %changelog +* Mon Sep 08 2014 Josh Boyer <jwboyer@fedoraproject.org> +- Remove ppc32 support + * Mon Sep 8 2014 Peter Robinson <pbrobinson@fedoraproject.org> - Build tools on ppc64le (rhbz 1138884) - Some minor ppc64 cleanups |