Revert "Add armv6hl-based Raspberry Pi"

This reverts commit bfeccd5029dc06a5cc10b1fe22f57c825d02c63c.

4 files changed, 1 insertions, 275 deletions

diff --git a/Makefile.config b/Makefile.config
index 87fb20e71..148e21fef 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -10,7 +10,6 @@ CONFIGFILES	= \
 	$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
 	$(CFG)-s390x.config \
 	$(CFG)-armv7hl.config $(CFG)-armv7hl-lpae.config \
-	$(CFG)-armv6hl.config \
 	$(CFG)-aarch64.config \
 	$(CFG)-ppc64.config $(CFG)-ppc64p7.config $(CFG)-ppc64-debug.config \
 	$(CFG)-ppc64le.config $(CFG)-ppc64le-debug.config
@@ -48,9 +47,6 @@ temp-armv7: config-armv7 temp-armv7-generic
 temp-armv7-lpae: config-armv7-lpae temp-armv7-generic
 	perl merge.pl $^ > $@
 
-temp-armv6: config-armv6 temp-arm-generic
-	perl merge.pl $^ > $@
-
 temp-arm-debug-generic: temp-arm-generic temp-debug-generic
 	perl merge.pl $^ > $@
 
@@ -126,9 +122,6 @@ $(CFG)-s390x.config: config-s390x temp-s390-generic
 $(CFG)-armv7hl.config: /dev/null temp-armv7
 	perl merge.pl $^ arm > $@
 
-$(CFG)-armv6hl.config: /dev/null temp-armv6
-	perl merge.pl $^ arm > $@
-
 $(CFG)-armv7hl-lpae.config: /dev/null temp-armv7-lpae
 	perl merge.pl $^ arm > $@
 
diff --git a/config-armv6 b/config-armv6
deleted file mode 100644
index 57bc72cdf..000000000
--- a/config-armv6
+++ /dev/null
@@ -1,246 +0,0 @@
-# arm configs for armv6-based Raspberry Pi
-# Generic ARM config options
-CONFIG_ARM=y
-
-CONFIG_ARCH_MULTI_V6=y
-# CONFIG_ARCH_MULTI_V7 is not set
-
-CONFIG_CMDLINE=""
-CONFIG_AEABI=y
-CONFIG_VFP=y
-
-CONFIG_ARM_UNWIND=y
-CONFIG_ARM_THUMB=y
-CONFIG_ARM_DMA_MEM_BUFFERABLE=y
-# CONFIG_CACHE_L2X0 is not set
-CONFIG_ATAGS=y
-CONFIG_ATAGS_PROC=y
-CONFIG_ATAGS_PROC=y
-CONFIG_ZBOOT_ROM_TEXT=0
-CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_XZ_DEC_ARMTHUMB=y
-CONFIG_CPU_SW_DOMAIN_PAN=y
-
-# CONFIG_OABI_COMPAT is not set
-# CONFIG_APM_EMULATION is not set
-# CONFIG_CPU_ICACHE_DISABLE is not set
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_BPREDICT_DISABLE is not set
-# CONFIG_HVC_DCC is not set
-
-# We only enable Raspberry Pi for this ARMv6 kernel
-CONFIG_ARCH_BCM=y
-CONFIG_ARCH_BCM2835=y
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_CNS3XXX is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_OMAP2 is not set
-# CONFIG_ARCH_PICOXCELL is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_WM8750 is not set
-# CONFIG_SOC_BRCMSTB is not set
-
-# generic that deviates from or should be merged into config-generic
-# CONFIG_HIGHMEM is not set
-# CONFIG_ARM_MODULE_PLTS is not set
-
-# Power management / thermal / cpu scaling
-# CONFIG_THERMAL is not set
-CONFIG_CPUFREQ_DT=m
-CONFIG_PM_DEVFREQ=y
-CONFIG_PM_DEVFREQ_EVENT=y
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
-CONFIG_DEVFREQ_GOV_PERFORMANCE=y
-CONFIG_DEVFREQ_GOV_POWERSAVE=y
-CONFIG_DEVFREQ_GOV_USERSPACE=y
-
-# CONFIG_PCI_LAYERSCAPE is not set
-# Do NOT enable this, it breaks stuff and makes things go slow
-# CONFIG_UACCESS_WITH_MEMCPY is not set
-
-CONFIG_LBDAF=y
-
-# Device tree
-# CONFIG_ARM_APPENDED_DTB is not set
-
-# Raspberry Pi
-CONFIG_HW_RANDOM_BCM2835=m
-CONFIG_I2C_BCM2835=m
-CONFIG_SPI_BCM2835=m
-CONFIG_SPI_BCM2835AUX=m
-CONFIG_BCM2835_WDT=m
-CONFIG_DRM_VC4=m
-CONFIG_SND_BCM2835_SOC_I2S=m
-CONFIG_MMC_SDHCI_BCM2835=m
-CONFIG_DMA_BCM2835=m
-CONFIG_BCM2835_MBOX=m
-CONFIG_PWM_BCM2835=m
-CONFIG_RASPBERRYPI_FIRMWARE=m
-CONFIG_SERIAL_8250_BCM2835AUX=y
-CONFIG_MMC_SDHCI_IPROC=m
-
-# Multifunction Devices
-# CONFIG_MFD_TPS65912_SPI is not set
-# CONFIG_MFD_DA9052_SPI is not set
-# CONFIG_MFD_ARIZONA_SPI is not set
-# CONFIG_MFD_WM831X_SPI is not set
-# CONFIG_MFD_MC13XXX_SPI is not set
-# CONFIG_MFD_PM8921_CORE is not set
-# CONFIG_MFD_T7L66XB is not set
-# CONFIG_MFD_TC6387XB is not set
-
-# Pin stuff
-# CONFIG_PINCTRL_AMD is not set
-
-# GPIO
-# CONFIG_GPIO_EM is not set
-CONFIG_GPIO_74X164=m
-CONFIG_GPIO_MAX7301=m
-CONFIG_GPIO_MC33880=m
-# CONFIG_GPIO_ZEVIO is not set
-CONFIG_LEDS_GPIO=m
-CONFIG_INPUT_GPIO_BEEPER=m
-CONFIG_INPUT_GPIO_TILT_POLLED=m
-CONFIG_INPUT_MATRIXKMAP=m
-CONFIG_KEYBOARD_MATRIX=m
-
-# SPI
-CONFIG_SPI=y
-CONFIG_SPI_GPIO=m
-CONFIG_SPI_SPIDEV=m
-# CONFIG_SPI_ALTERA is not set
-CONFIG_SPI_BITBANG=m
-# CONFIG_SPI_DESIGNWARE is not set
-# CONFIG_SPI_OC_TINY is not set
-# CONFIG_SPI_SC18IS602 is not set
-# CONFIG_SPI_TLE62X0 is not set
-# CONFIG_SPI_XCOMM is not set
-# CONFIG_SPI_FSL_SPI is not set
-# CONFIG_SPI_CADENCE is not set
-# CONFIG_SPI_ZYNQMP_GQSPI is not set
-
-# MTD
-# CONFIG_MG_DISK is not set
-CONFIG_MTD_DATAFLASH=m
-CONFIG_MTD_DATAFLASH_WRITE_VERIFY=y
-CONFIG_MTD_DATAFLASH_OTP=y
-CONFIG_MTD_SST25L=m
-CONFIG_EEPROM_AT25=m
-CONFIG_EEPROM_93XX46=m
-
-# Sound
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_SOC_AC97_CODEC is not set
-# CONFIG_SND_SUN4I_CODEC is not set
-# CONFIG_SND_SOC_TAS571X is not set
-
-# RTC
-CONFIG_RTC_DRV_DS1305=m
-CONFIG_RTC_DRV_DS1347=m
-CONFIG_RTC_DRV_DS1390=m
-CONFIG_RTC_DRV_DS3234=m
-CONFIG_RTC_DRV_M41T93=m
-CONFIG_RTC_DRV_M41T94=m
-CONFIG_RTC_DRV_MAX6902=m
-CONFIG_RTC_DRV_PCF2123=m
-CONFIG_RTC_DRV_PL030=m
-CONFIG_RTC_DRV_R9701=m
-CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_RX4581=m
-
-CONFIG_CHARGER_GPIO=m
-CONFIG_GENERIC_ADC_BATTERY=m
-
-# Sensors
-CONFIG_SENSORS_AD7314=m
-CONFIG_SENSORS_ADCXX=m
-CONFIG_SENSORS_ADS7871=m
-CONFIG_SENSORS_LIS3_SPI=m
-CONFIG_SENSORS_LM70=m
-CONFIG_SENSORS_MAX1111=m
-
-# Displays
-CONFIG_LCD_L4F00242T03=m
-CONFIG_LCD_LMS283GF05=m
-CONFIG_LCD_LTV350QV=m
-CONFIG_LCD_ILI922X=m
-CONFIG_LCD_ILI9320=m
-CONFIG_LCD_TDO24M=m
-CONFIG_LCD_VGG2432A4=m
-CONFIG_LCD_S6E63M0=m
-CONFIG_LCD_LD9040=m
-CONFIG_LCD_AMS369FG06=m
-CONFIG_LCD_LMS501KF03=m
-CONFIG_LCD_HX8357=m
-CONFIG_TOUCHSCREEN_ADS7846=m
-CONFIG_TOUCHSCREEN_AD7877=m
-CONFIG_TOUCHSCREEN_TSC2005=m
-
-CONFIG_LEDS_TRIGGER_CPU=y
-CONFIG_LEDS_DAC124S085=m
-CONFIG_LEDS_PWM=m
-CONFIG_LEDS_SYSCON=y
-
-CONFIG_POWER_RESET_SYSCON=y
-
-# Network
-CONFIG_KS8851=m
-CONFIG_LIBERTAS_SPI=m
-CONFIG_P54_SPI=m
-# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
-CONFIG_MICREL_KS8995MA=m
-# CONFIG_NET_VENDOR_CIRRUS is not set
-CONFIG_NET_VENDOR_MICROCHIP=y
-CONFIG_ENCX24J600=m
-CONFIG_IEEE802154_AT86RF230=m
-CONFIG_IEEE802154_MRF24J40=m
-
-# CAN drivers
-# CONFIG_CAN_TI_HECC is not set
-# CONFIG_CAN_FLEXCAN is not set
-# CONFIG_CAN_RCAR is not set
-# CONFIG_CAN_MCP251X is not set
-
-# Needs work/investigation
-# CONFIG_ARM_KPROBES_TEST is not set
-
-# Not needed on Raspberry Pi
-# CONFIG_DRM_TILCDC is not set
-# CONFIG_DRM_STI is not set
-# CONFIG_DRM_FSL_DCU is not set
-# CONFIG_DRM_OMAP is not set
-# CONFIG_DRM_EXYNOS is not set
-# CONFIG_MFD_T7L66XB is not set
-# CONFIG_MFD_TC6387XB is not set
-# CONFIG_EZX_PCAP is not set
-# CONFIG_DM9000 is not set
-# CONFIG_DEPRECATED_PARAM_STRUCT is not set
-# CONFIG_SERIAL_8250_EM is not set
-# CONFIG_SERIAL_BCM63XX is not set
-# CONFIG_SERIAL_STM32 is not set
-# CONFIG_SERIAL_AMBA_PL010 is not set
-# CONFIG_BRCMSTB_GISB_ARB is not set
-# CONFIG_AMBA_PL08X is not set
-# CONFIG_EDAC is not set
-# CONFIG_AX88796 is not set
-
-# CONFIG_POWER_RESET_BRCMSTB is not set
-# CONFIG_CLK_QORIQ is not set
-# CONFIG_QORIQ_CPUFREQ is not set
-
-# Debug options. We need to deal with them at some point like x86
-# CONFIG_DEBUG_USER is not set
-CONFIG_DEBUG_LL=y
-CONFIG_DEBUG_LL_INCLUDE="debug/pl01x.S"
-CONFIG_DEBUG_UART_PHYS=0x20201000
-CONFIG_DEBUG_UART_VIRT=0xf0201000
-# CONFIG_ARM_KERNMEM_PERMS is not set
-
-# CONFIG_VFIO_PLATFORM_AMDXGBE_RESET is not set
-
-# Altera?
-# CONFIG_PCIE_ALTERA is not set
-
-# CONFIG_VEXPRESS_CONFIG is not set
-# CONFIG_AM335X_PHY_USB is not set
diff --git a/filter-armv6hl.sh b/filter-armv6hl.sh
deleted file mode 100644
index d02baab52..000000000
--- a/filter-armv6hl.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/bash
-
-# This is the armv6hl 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.
-
-# There's some hwmon drivers that use iio, and we filter out iio in filter-modules.sh
-# We probably don't want anything from there on a Raspberry Pi anyway
-driverdirs="$driverdirs hwmon extcon"
diff --git a/kernel.spec b/kernel.spec
index 8ca41c185..43c8bfa3d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -25,7 +25,6 @@ Summary: The Linux kernel
 %endif
 
 # define buildid .local
-%define buildid .pi1
 
 # baserelease defines which build revision of this kernel version we're
 # building.  We used to call this fedora_build, but the magical name
@@ -294,7 +293,7 @@ Summary: The Linux kernel
 %define kernel_mflags KALLSYMS_EXTRA_PASS=1
 # we only build headers/perf/tools on the base arm arches
 # just like we used to only build them on i386 for x86
-%ifnarch armv6hl armv7hl
+%ifnarch armv7hl
 %define with_headers 0
 %define with_cross_headers 0
 %define with_perf 0
@@ -415,7 +414,6 @@ Source15: merge.pl
 Source16: mod-extra.list
 Source17: mod-extra.sh
 Source18: mod-sign.sh
-Source89: filter-armv6hl.sh
 Source90: filter-x86_64.sh
 Source91: filter-armv7hl.sh
 Source92: filter-i686.sh
@@ -454,8 +452,6 @@ Source101: config-armv7-generic
 Source102: config-armv7
 Source103: config-armv7-lpae
 
-Source105: config-armv6
-
 Source110: config-arm64
 
 # This file is intentionally left empty in the stock kernel. Its a nicety
@@ -2178,9 +2174,6 @@ fi
 #
 # 
 %changelog
-* Tue Apr 26 2016 Lubomir Rintel <lkundrak@v3.sk> - 4.5.1-300.pi1
-- Build for bcm2835/rpi
-
 * Tue Apr 26 2016 Justin M. Forbes <jforbes@fedoraproject.org>
 - Change CONFIG_DW_DMAC to built-in to fix sound on some intel platforms
   This needs to be revisited later.