Merge pull request #69 from andreabolognani/cleanup

Improve tools, clean up old data

tools/build-kernel-qemu

@@ -5,7 +5,7 @@
 #######################################################
 
 TOOLCHAIN=arm-linux-gnueabihf
-COMMIT=raspberrypi-kernel_1.20180619-1
+COMMIT=raspberrypi-kernel_1.20181112-1
 INSTALL_PACKAGES=""
 USE_GIT=1
 USB_WEBCAM_MODULES=""    # add USB & V4L modules for USB webcam support (didn't work as static)
@@ -39,6 +39,9 @@ else
 	cd linux-${COMMIT}
 fi
 
+# Use all available cores for compilation
+export MAKEFLAGS="$MAKEFLAGS -j$(nproc)"
+
 KERNEL_VERSION=$(make kernelversion)
 KERNEL_TARGET_FILE_NAME=../qemu-kernel-$KERNEL_VERSION
 MODULES_INSTALL_PATH=../qemu-kernel-$KERNEL_VERSION-modules
@@ -52,115 +55,35 @@ echo "Building Qemu Raspberry Pi kernel qemu-kernel-$KERNEL_VERSION"
 
 cat >> .config << EOF
 CONFIG_CROSS_COMPILE="$TOOLCHAIN"
-CONFIG_CPU_V6=y
-CONFIG_ARM_ERRATA_411920=y
-CONFIG_ARM_ERRATA_364296=y
-CONFIG_AEABI=y
-CONFIG_OABI_COMPAT=y
-CONFIG_PCI=y
-CONFIG_PCI_VERSATILE=y
-CONFIG_SCSI=y
-CONFIG_SCSI_SYM53C8XX_2=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_TMPFS=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT4_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_FONT_8x16=y
-CONFIG_LOGO=y
-CONFIG_VFP=y
-CONFIG_CGROUPS=y
-
-CONFIG_MMC_BCM2835=y
-CONFIG_MMC_BCM2835_DMA=y
-CONFIG_DMADEVICES=y
-CONFIG_DMA_BCM2708=y
-
-CONFIG_FHANDLE=y
-
-CONFIG_OVERLAY_FS=y
-
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_FS_POSIX_ACL=y
-
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-
-CONFIG_MODVERSIONS=y
-
-CONFIG_NET_9P=y
-CONFIG_NET_9P_VIRTIO=y
-CONFIG_9P_FS=y
-CONFIG_9P_FS_POSIX_ACL=y
-
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_BLK=y
-CONFIG_SCSI_VIRTIO=y
-CONFIG_VIRTIO_NET=y
-CONFIG_VIRTIO_CONSOLE=y
-CONFIG_VIRTIO_BALLOON=y
-CONFIG_VIRTIO_INPUT=y
-CONFIG_VIRTIO_PCI=y
-
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_VIRTIO=y
 EOF
 
-if [ $USB_WEBCAM_MODULES ] ; then
-echo "Make sure you have drivers for your webcam selected in menuconfig"
-echo >> .config << EOF
-# won't work as statically linked
-CONFIG_MEDIA_SUPPORT=m
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
-CONFIG_VIDEO_MEDIA=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=m
-CONFIG_V4L_USB_DRIVERS=m
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_VIDEO_CORE=m
-CONFIG_VIDEO_VIDEOBUF2=m
-CONFIG_INPUT_CORE=m
-CONFIG_VIDEO_UVC=m
-
-CONFIG_USB=m
-CONFIG_USB_STORAGE=m
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_VHCI_HCD=m
-CONFIG_USB_GSPCA=m
-CONFIG_VIDEO_GSPCA=m
-
-CONFIG_I2C=m
+if [ -e "../config_file_$KERNEL_VERSION" ]; then
+    cat "../config_file_$KERNEL_VERSION" >> .config
+else
+    cat "../config_file" >> .config
+fi
 
-# won't be accepted as modules so linking statically
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-EOF
+if [ $USB_WEBCAM_MODULES ] ; then
+    echo "Make sure you have drivers for your webcam selected in menuconfig"
+    cat ../config_webcam >> .config
 fi
 
 cat ../config_ip_tables >> .config
 
-make -j 4 -k ARCH=arm CROSS_COMPILE=${TOOLCHAIN}- menuconfig
-make -j 4 -k ARCH=arm CROSS_COMPILE=${TOOLCHAIN}- bzImage dtbs
+make -k ARCH=arm CROSS_COMPILE=${TOOLCHAIN}- menuconfig
+make -k ARCH=arm CROSS_COMPILE=${TOOLCHAIN}- bzImage dtbs
 cp arch/arm/boot/zImage $KERNEL_TARGET_FILE_NAME
-cp arch/arm/boot/dts/versatile-pb.dtb ../
+if [ -e arch/arm/boot/dts/versatile-pb.dtb ] ; then
+    cp arch/arm/boot/dts/versatile-pb.dtb ../
+fi
 
 if [ $USB_WEBCAM_MODULES ] ; then
     mkdir -p $MODULES_INSTALL_PATH
     if [ ! -d $MODULES_INSTALL_PATH ] ; then
         echo "Couldn't create webcam modules install directory $MODULES_INSTALL_PATH"
     fi
-    make -j 4 -k ARCH=arm CROSS_COMPILE=${TOOLCHAIN}- modules
-    make -j 4 -k ARCH=arm CROSS_COMPILE=${TOOLCHAIN}- \
+    make -k ARCH=arm CROSS_COMPILE=${TOOLCHAIN}- modules
+    make -k ARCH=arm CROSS_COMPILE=${TOOLCHAIN}- \
         INSTALL_MOD_PATH=$MODULES_INSTALL_PATH modules_install
     echo "Copy modules to Raspberry to /lib/modules/$KERNEL_VERSION"
 fi

tools/config_file

@@ -0,0 +1,59 @@
+CONFIG_CPU_V6=y
+CONFIG_ARM_ERRATA_411920=y
+CONFIG_ARM_ERRATA_364296=y
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
+CONFIG_PCI=y
+CONFIG_PCI_VERSATILE=y
+CONFIG_SCSI=y
+CONFIG_SCSI_SYM53C8XX_2=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_DEV_SR=y
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_TMPFS=y
+CONFIG_INPUT_EVDEV=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT4_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_FONT_8x16=y
+CONFIG_LOGO=y
+CONFIG_VFP=y
+CONFIG_CGROUPS=y
+
+CONFIG_MMC_BCM2835=y
+CONFIG_MMC_BCM2835_DMA=y
+CONFIG_DMADEVICES=y
+CONFIG_DMA_BCM2708=y
+
+CONFIG_FHANDLE=y
+
+CONFIG_OVERLAY_FS=y
+
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+CONFIG_FS_POSIX_ACL=y
+
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+
+CONFIG_MODVERSIONS=y
+
+CONFIG_NET_9P=y
+CONFIG_NET_9P_VIRTIO=y
+CONFIG_9P_FS=y
+CONFIG_9P_FS_POSIX_ACL=y
+
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_BLK=y
+CONFIG_SCSI_VIRTIO=y
+CONFIG_VIRTIO_NET=y
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_INPUT=y
+CONFIG_VIRTIO_PCI=y
+
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_VIRTIO=y

tools/config_file_4.4.34

@@ -0,0 +1,39 @@
+CONFIG_CPU_V6=y
+CONFIG_ARM_ERRATA_411920=y
+CONFIG_ARM_ERRATA_364296=y
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
+CONFIG_PCI=y
+CONFIG_SCSI=y
+CONFIG_SCSI_SYM53C8XX_2=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_DEV_SR=y
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_TMPFS=y
+CONFIG_INPUT_EVDEV=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT4_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_FONT_8x16=y
+CONFIG_LOGO=y
+CONFIG_VFP=y
+CONFIG_CGROUPS=y
+
+CONFIG_MMC_BCM2835=y
+CONFIG_MMC_BCM2835_DMA=y
+CONFIG_DMADEVICES=y
+CONFIG_DMA_BCM2708=y
+
+CONFIG_FHANDLE=y
+
+CONFIG_OVERLAY_FS=y
+
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+CONFIG_FS_POSIX_ACL=y
+
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y

tools/config_webcam

@@ -0,0 +1,28 @@
+# won't work as statically linked
+CONFIG_MEDIA_SUPPORT=m
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_VIDEO_MEDIA=m
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_CAPTURE_DRIVERS=m
+CONFIG_V4L_USB_DRIVERS=m
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_VIDEO_CORE=m
+CONFIG_VIDEO_VIDEOBUF2=m
+CONFIG_INPUT_CORE=m
+CONFIG_VIDEO_UVC=m
+
+CONFIG_USB=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_VHCI_HCD=m
+CONFIG_USB_GSPCA=m
+CONFIG_VIDEO_GSPCA=m
+
+CONFIG_I2C=m
+
+# won't be accepted as modules so linking statically
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_MEDIA_CAMERA_SUPPORT=y

tools/linux-arm-4.14.50.patch

@@ -1,39 +0,0 @@
-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.
- 

tools/linux-arm-4.14.79.patch

@@ -1 +0,0 @@
-linux-arm-4.14.50.patch

tools/linux-arm.patch

@@ -1,8 +1,8 @@
 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index b5d529fdffab..5bd83d386f50 100644
+index d1346a160760..8de93ddc6f27 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -669,7 +669,7 @@ config ARCH_MULTI_V5
+@@ -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 || \
@@ -12,10 +12,10 @@ index b5d529fdffab..5bd83d386f50 100644
  config ARCH_MULTI_V4_V5
  	bool
 diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig
-index c257d40ca51d..bb906ed1f492 100644
+index f5c275434d6c..87ff5f5379a9 100644
 --- a/arch/arm/mach-versatile/Kconfig
 +++ b/arch/arm/mach-versatile/Kconfig
-@@ -6,7 +6,7 @@ config ARCH_VERSATILE
+@@ -7,7 +7,7 @@ config ARCH_VERSATILE
  	select ARM_VIC
  	select CLKSRC_VERSATILE
  	select COMMON_CLK_VERSATILE
@@ -25,16 +25,15 @@ index c257d40ca51d..bb906ed1f492 100644
  	select MFD_SYSCON
  	select PLAT_VERSATILE
 diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
-index 87d251e93913..3e783895a981 100644
+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
+ config MMC_BCM2835_MMC
  	tristate "MMC support on BCM2835"
--	depends on ARCH_BCM2835
-+	depends on ARCH_BCM2835 || ARCH_VERSATILE
+-	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.
  
-