Build kernel 4.14.50 to match Raspbian 2018-06-27

The build process is slightly altered to pick up a version-specific
ARM patch when possible.

tools/build-kernel-qemu

@@ -5,9 +5,7 @@
 #######################################################
 
 TOOLCHAIN=arm-linux-gnueabihf
-COMMIT=6820d0cbec64cfee481b961833feffec8880111e
+COMMIT=raspberrypi-kernel_1.20180619-1
-COMMIT=raspberrypi-kernel_1.20171029-1
-#COMMIT=""
 INSTALL_PACKAGES=""
 USE_GIT=1
 USB_WEBCAM_MODULES=""    # add USB & V4L modules for USB webcam support (didn't work as static)
@@ -41,12 +39,15 @@ else
 	cd linux-${COMMIT}
 fi
 
-patch -p1 < ../linux-arm.patch
-exit
-make ARCH=arm versatile_defconfig
 KERNEL_VERSION=$(make kernelversion)
 KERNEL_TARGET_FILE_NAME=../qemu-kernel-$KERNEL_VERSION
 MODULES_INSTALL_PATH=../qemu-kernel-$KERNEL_VERSION-modules
+if [ -e "../linux-arm-$KERNEL_VERSION.patch" ]; then
+    patch -p1 < ../linux-arm-$KERNEL_VERSION.patch
+else
+    patch -p1 < ../linux-arm.patch
+fi
+make ARCH=arm versatile_defconfig
 echo "Building Qemu Raspberry Pi kernel qemu-kernel-$KERNEL_VERSION"
 
 cat >> .config << EOF

tools/linux-arm-4.14.50.patch

@@ -0,0 +1,39 @@
+diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
+index d1346a160760..8de93ddc6f27 100644
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -670,7 +670,7 @@ config ARCH_MULTI_V5
+ 	select ARCH_MULTI_V4_V5
+ 	select CPU_ARM926T if !(CPU_ARM946E || CPU_ARM1020 || \
+ 		CPU_ARM1020E || CPU_ARM1022 || CPU_ARM1026 || \
+-		CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_FEROCEON)
++		CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_FEROCEON || CPU_V6)
+ 
+ config ARCH_MULTI_V4_V5
+ 	bool
+diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig
+index f5c275434d6c..87ff5f5379a9 100644
+--- a/arch/arm/mach-versatile/Kconfig
++++ b/arch/arm/mach-versatile/Kconfig
+@@ -7,7 +7,7 @@ config ARCH_VERSATILE
+ 	select ARM_VIC
+ 	select CLKSRC_VERSATILE
+ 	select COMMON_CLK_VERSATILE
+-	select CPU_ARM926T
++	select CPU_V6
+ 	select ICST
+ 	select MFD_SYSCON
+ 	select PLAT_VERSATILE
+diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
+index 91adb0d9936c..a56fea56902d 100644
+--- a/drivers/mmc/host/Kconfig
++++ b/drivers/mmc/host/Kconfig
+@@ -6,7 +6,7 @@ comment "MMC/SD/SDIO Host Controller Drivers"
+ 
+ config MMC_BCM2835_MMC
+ 	tristate "MMC support on BCM2835"
+-	depends on MACH_BCM2708 || MACH_BCM2709 || ARCH_BCM2835
++	depends on MACH_BCM2708 || MACH_BCM2709 || ARCH_BCM2835 || ARCH_VERSATILE
+ 	help
+ 	  This selects the MMC Interface on BCM2835.
+