Remove extra drivers

Author: mmft24

README.md

@@ -1,5 +1,7 @@
 # mbp-ubuntu-kernel
 
+This repo is still a work in progress.
+
 Ubuntu/Mint/Debian kernel 5.6 with Apple T2 patches built-in (Macbooks produced >= 2018).
 
 Drivers:
@@ -20,74 +22,6 @@ Drone kernel build status:
 Travis kernel publish status - <http://mbp-ubuntu-kernel.herokuapp.com/> :
 [![Build Status](https://travis-ci.com/marcosfad/mbp-ubuntu-kernel.svg?branch=master)](https://travis-ci.com/marcosfad/mbp-ubuntu-kernel)
 
-## TODO
-
-### Known issues
-
-- Dynamic audio input/output change (on connecting/disconnecting headphones jack)
-- TouchID - (@MCMrARM is working on it - https://github.com/Dunedan/mbp-2016-linux/issues/71#issuecomment-528545490)
-- Thunderbolt (is disabled, because driver was causing kernel panics (not tested with 5.5 kernel))
-- Microphone (it's recognised with new apple t2 sound driver, but there is a low mic volume amp)
-
-#### Working with upstream stable kernel 5.1
-
-- Display/Screen
-- USB-C
-- Battery/AC
-- Ethernet/Video USB-C adapters
-- Bluetooth
-
-#### Working with mbp-ubuntu-kernel
-
-- NVMe
-- Camera
-- keyboard
-- touchpad (scroll, right click)
-- wifi (not Macbook pro 16,1)
-  - you need to manually extract firmware from macOS
-    - <https://github.com/Dunedan/mbp-2016-linux/issues/71#issuecomment-517444300>
-    - <https://github.com/Dunedan/mbp-2016-linux/issues/71#issuecomment-515401480>
-  - or download it from <https://packages.aunali1.com/apple/wifi-fw/18G2022>
-
-> Firmware can be found by running `ioreg -l | grep C-4364` or `ioreg -l | grep RequestedFiles` under macOS
-
-```
-Put the firmware in the right place!
-The .trx file for your model goes to /lib/firmware/brcm/brcmfmac4364-pcie.bin,
-the .clmb goes to /lib/firmware/brcm/brcmfmac4364-pcie.clm_blob
-and the .txt to something like /lib/firmware/brcm/brcmfmac4364-pcie.Apple Inc.-MacBookPro15,2.txt
-```
-
-```
-# ls -l /lib/firmware/brcm | grep 4364
--rw-r--r--. 1 root root   12860 Mar  1 12:44 brcmfmac4364-pcie.Apple Inc.-MacBookPro15,2.txt
--rw-r--r--. 1 root root  922647 Mar  1 12:44 brcmfmac4364-pcie.bin
--rw-r--r--. 1 root root   33226 Mar  1 12:44 brcmfmac4364-pcie.clm_blob
-```
-
-```
-# dmesg
-brcmfmac 0000:01:00.0: enabling device (0000 -> 0002)
-brcmfmac: brcmf_fw_alloc_request: using brcm/brcmfmac4364-pcie for chip BCM4364/3
-brcmfmac: brcmf_fw_alloc_request: using brcm/brcmfmac4364-pcie for chip BCM4364/3
-brcmfmac: brcmf_c_preinit_dcmds: Firmware: BCM4364/3 wl0: Mar 28 2019 19:17:52 version 9.137.9.0.32.6.34 FWID 01-36f56c94
-brcmfmac 0000:01:00.0 wlp1s0: renamed from wlan0
-```
-
-#### Working with external drivers
-
->> with @MCMrARM mbp2018-bridge-drv
-
-- keyboard
-- touchpad
-- touchbar
-- audio
-
-#### Not tested
-
-- eGPU
-- Thunderbolt
-
 ## Docs
 
 - Discord: <https://discord.gg/Uw56rqW>

…p_device-into-its-own-header.patch.patch …p_device-into-its-own-header.patch.patchpatches/5001-brcmfmac-move-brcmf_mp_device-into-its-own-header.patch.patch renamed to back/5001-brcmfmac-move-brcmf_mp_device-into-its-own-header.patch.patch patches/5001-brcmfmac-move-brcmf_mp_device-into-its-own-header.patch.patch renamed to back/5001-brcmfmac-move-brcmf_mp_device-into-its-own-header.patch.patch

@@ -4,12 +4,10 @@ set -eu -o pipefail
 
 ## Update docker image tag, because kernel build is using `uname -r` when defining package version variable
 # KERNEL_VERSION=$(curl -s https://www.kernel.org | grep '<strong>' | head -3 | tail -1 | cut -d'>' -f3 | cut -d'<' -f1)
-KERNEL_VERSION=5.6.5
+KERNEL_VERSION=5.6.7
 REPO_PATH=$(pwd)
 WORKING_PATH=/root/work
 KERNEL_PATH="${WORKING_PATH}/linux-kernel"
-GIT_USERNAME="Ubuntu MBP"
-GIT_EMAIL="turkos+ubuntu-mbp@gmail.com"
 
 ### Debug commands
 echo "KERNEL_VERSION=$KERNEL_VERSION"
@@ -30,14 +28,12 @@ export DEBIAN_FRONTEND=noninteractive
 apt update
 apt install -y build-essential fakeroot libncurses-dev bison flex libssl-dev libelf-dev \
   openssl dkms libudev-dev libpci-dev libiberty-dev autoconf wget xz-utils git \
-  bc rsync cpio dh-modaliases debhelper kernel-wedge
+  bc rsync cpio dh-modaliases debhelper kernel-wedge curl
 
 ### get Kernel
 git clone --depth 1 --single-branch --branch v"${KERNEL_VERSION}" \
   git://kernel.ubuntu.com/virgin/linux-stable.git "${KERNEL_PATH}"
 cd ./linux-kernel || exit
-git config user.name "${GIT_USERNAME}"
-git config user.email "${GIT_EMAIL}"
 
 #### Create patch file with custom drivers
 echo >&2 "===]> Info: Creating patch file... "
@@ -56,6 +52,7 @@ while IFS= read -r file; do
   patch -p1 <"$file"
 done < <(find "${WORKING_PATH}/patches" -type f -name "*.patch" | sort)
 
+echo >&2 "===]> Info: Add drivers default configuration... "
 ### Add new drivers. This config files comes on the one of the patches...
 echo "CONFIG_APPLE_BCE_DRIVER=m" >>"${KERNEL_PATH}/debian.master/config/amd64/config.common.ubuntu"
 echo "CONFIG_APPLE_TOUCHBAR_DRIVER=m" >>"${KERNEL_PATH}/debian.master/config/amd64/config.common.ubuntu"
@@ -67,27 +64,25 @@ chmod a+x "${KERNEL_PATH}"/debian/rules
 chmod a+x "${KERNEL_PATH}"/debian/scripts/*
 chmod a+x "${KERNEL_PATH}"/debian/scripts/misc/*
 
-# Get rid of the dirty tag
-
-### Copy configuration
-fakeroot debian/rules clean
-yes '' | fakeroot /bin/bash -c "export DROOT=debian; export ARCH=amd64; \
- ${KERNEL_PATH}/debian/scripts/misc/kernelconfig updateconfigs amd64" || true
-
-cp "${KERNEL_PATH}/debian.master/config/amd64/config.flavour.generic" ".config"
+echo >&2 "===]> Info: Bulding src... "
 
+cd "${KERNEL_PATH}"
+make clean
+cp "${WORKING_PATH}/templates/default-config" .config
 make olddefconfig
 
-#### Change buildid to mbp
-echo >&2 "===]> Info: Bulding src... "
-make clean
-cd "${KERNEL_PATH}"
-git add .
-git commit -s -a -m "getting rid of -dirty"
+# Get rid of the dirty tag
+#LASTEST_BUILD=$(curl -s https://mbp-ubuntu-kernel.herokuapp.com/ -L |
+#  grep linux-image-${KERNEL_VERSION} | grep a | cut -d'>' -f2 | cut -d'<' -f1 |
+#  sort -r | head -n 1 | cut -d'-' -f6 | cut -d'_' -f1)
+#NEXT_BUILD=$(expr ${LASTEST_BUILD} + 1)
+echo "" >${KERNEL_PATH}/.scmversion
+
 make -j "$(getconf _NPROCESSORS_ONLN)" deb-pkg LOCALVERSION=-mbp
 
 #### Copy artifacts to shared volume
 echo >&2 "===]> Info: Copying debs and calculating SHA256 ... "
 #cp -rfv ../*.deb "${REPO_PATH}/"
+#cp -rfv "${KERNEL_PATH}/.config" "${REPO_PATH}/kernel_config"
 cp -rfv ../*.deb /tmp/artifacts/
 sha256sum ../*.deb >/tmp/artifacts/sha256

…ity-to-manually-specify-FW-rambase.patch …ity-to-manually-specify-FW-rambase.patchpatches/5002-brcmfmac-Add-ability-to-manually-specify-FW-rambase.patch renamed to back/5002-brcmfmac-Add-ability-to-manually-specify-FW-rambase.patch patches/5002-brcmfmac-Add-ability-to-manually-specify-FW-rambase.patch renamed to back/5002-brcmfmac-Add-ability-to-manually-specify-FW-rambase.patch

@@ -2,20 +2,21 @@
 
 set -eu -o pipefail
 
-#KERNEL_VERSION="${KERNEL_VERSION}"
-#WORKING_PATH="${WORKING_PATH}"
 BUILD_PATH=/tmp/build-kernel
 
 ### Apple T2 drivers commit hashes
-APPLE_BCE_DRIVER_GIT_URL=https://github.com/aunali1/mbp2018-bridge-drv.git
-APPLE_BCE_DRIVER_BRANCH_NAME=aur
-APPLE_BCE_DRIVER_COMMIT_HASH=c884d9ca731f2118a58c28bb78202a0007935998
-APPLE_IB_DRIVER_GIT_URL=https://github.com/roadrunner2/macbook12-spi-driver.git
-APPLE_IB_DRIVER_BRANCH_NAME=mbp15
-APPLE_IB_DRIVER_COMMIT_HASH=90cea3e8e32db60147df8d39836bd1d2a5161871
+# Patches
 APPLE_SMC_DRIVER_GIT_URL=https://github.com/aunali1/linux-mbp-arch
 APPLE_SMC_DRIVER_BRANCH_NAME=master
-APPLE_SMC_DRIVER_COMMIT_HASH=4c19bf4009a9ee0bf4d9f3406e9d030fe3b85101
+APPLE_SMC_DRIVER_COMMIT_HASH=8cca9c0e0411708ee15eb77c00cc93297d1cd4ce
+## BCE
+#APPLE_BCE_DRIVER_GIT_URL=https://github.com/aunali1/mbp2018-bridge-drv.git
+#APPLE_BCE_DRIVER_BRANCH_NAME=aur
+#APPLE_BCE_DRIVER_COMMIT_HASH=c884d9ca731f2118a58c28bb78202a0007935998
+## SPI
+#APPLE_IB_DRIVER_GIT_URL=https://github.com/roadrunner2/macbook12-spi-driver.git
+#APPLE_IB_DRIVER_BRANCH_NAME=mbp15
+#APPLE_IB_DRIVER_COMMIT_HASH=90cea3e8e32db60147df8d39836bd1d2a5161871
 
 rm -rf "${BUILD_PATH}"
 mkdir -p "${BUILD_PATH}"
@@ -30,46 +31,45 @@ git checkout ${APPLE_SMC_DRIVER_COMMIT_HASH}
 while IFS= read -r file; do
   echo "adding ${file}"
   cp -rfv "${file}" "${WORKING_PATH}"/patches/"${file##*/}"
-done < <(find "${BUILD_PATH}/linux-mbp-arch" -type f -name "*applesmc*" | sort)
+done < <(find "${BUILD_PATH}/linux-mbp-arch" -type f -name "*.patch" | sort)
 
-### Add custom drivers to kernel
-echo -e "From: \"Kernel Builder (sita)\" <ubuntu-kernel-bot@canonical.com>\nSubject: patch custom drivers\n" >"${WORKING_PATH}/patches/custom-drivers.patch"
-
-git clone --depth 1 --single-branch --branch v"${KERNEL_VERSION}" \
-  git://kernel.ubuntu.com/virgin/linux-stable.git "${BUILD_PATH}/linux-stable"
-cd "${BUILD_PATH}/linux-stable/drivers" || exit
-
-### apple-bce
-git clone --depth 1 --single-branch --branch "${APPLE_BCE_DRIVER_BRANCH_NAME}" \
-  "${APPLE_BCE_DRIVER_GIT_URL}" "${BUILD_PATH}/linux-stable/drivers/apple-bce"
-cd "${BUILD_PATH}/linux-stable/drivers/apple-bce" || exit
-git checkout "${APPLE_BCE_DRIVER_COMMIT_HASH}" && rm -rf .git
-
-cd "${BUILD_PATH}/linux-stable/drivers"
-cp -rfv "${WORKING_PATH}/templates/Kconfig" "${BUILD_PATH}/linux-stable/drivers/apple-bce/Kconfig"
-sed -i "s/TEST_DRIVER/APPLE_BCE_DRIVER/g" "${BUILD_PATH}/linux-stable/drivers/apple-bce/Kconfig"
-# shellcheck disable=SC2016
-sed -i 's/obj-m/obj-$(CONFIG_APPLE_BCE)/g' "${BUILD_PATH}/linux-stable/drivers/apple-bce/Makefile"
-
-# ### apple-ib
-git clone --single-branch --branch "${APPLE_IB_DRIVER_BRANCH_NAME}" \
-  "${APPLE_IB_DRIVER_GIT_URL}" "${BUILD_PATH}/linux-stable/drivers/apple-touchbar"
-cd "${BUILD_PATH}/linux-stable/drivers/apple-touchbar" || exit
-git checkout "${APPLE_IB_DRIVER_COMMIT_HASH}" && rm -rf .git
-
-cd "${BUILD_PATH}/linux-stable/drivers"
-cp -rfv "${WORKING_PATH}/templates/Kconfig" "${BUILD_PATH}/linux-stable/drivers/apple-touchbar/Kconfig"
-sed -i "s/TEST_DRIVER/APPLE_TOUCHBAR_DRIVER/g" "${BUILD_PATH}/linux-stable/drivers/apple-touchbar/Kconfig"
-# shellcheck disable=SC2016
-sed -i 's/obj-m/obj-$(CONFIG_APPLE_TOUCHBAR)/g' "${BUILD_PATH}/linux-stable/drivers/apple-touchbar/Makefile"
-
-# shellcheck disable=SC2016
-echo 'obj-$(CONFIG_APPLE_BCE)           += apple-bce/' >>"${BUILD_PATH}/linux-stable/drivers/Makefile"
-# shellcheck disable=SC2016
-echo 'obj-$(CONFIG_APPLE_TOUCHBAR)      += apple-touchbar/' >>"${BUILD_PATH}/linux-stable/drivers/Makefile"
-sed -i "\$i source \"drivers/apple-bce/Kconfig\"\n" "${BUILD_PATH}/linux-stable/drivers/Kconfig"
-sed -i "\$i source \"drivers/apple-touchbar/Kconfig\"\n" "${BUILD_PATH}/linux-stable/drivers/Kconfig"
-
-## Prepare patch
-git add .
-git diff HEAD >> "${WORKING_PATH}/patches/custom-drivers.patch"
+#### Add custom drivers to kernel
+#echo -e "From: \"Kernel Builder (sita)\" <ubuntu-kernel-bot@canonical.com>\nSubject: patch custom drivers\n" >"${WORKING_PATH}/patches/custom-drivers.patch"
+#
+#git clone --depth 1 --single-branch --branch v"${KERNEL_VERSION}" \
+#  git://kernel.ubuntu.com/virgin/linux-stable.git "${BUILD_PATH}/linux-stable"
+#cd "${BUILD_PATH}/linux-stable/drivers" || exit
+#
+#### apple-bce
+#git clone --depth 1 --single-branch --branch "${APPLE_BCE_DRIVER_BRANCH_NAME}" \
+#  "${APPLE_BCE_DRIVER_GIT_URL}" "${BUILD_PATH}/linux-stable/drivers/apple-bce"
+#cd "${BUILD_PATH}/linux-stable/drivers/apple-bce" || exit
+#git checkout "${APPLE_BCE_DRIVER_COMMIT_HASH}" && rm -rf .git
+#
+#cd "${BUILD_PATH}/linux-stable/drivers"
+#cp -rfv "${WORKING_PATH}/templates/Kconfig" "${BUILD_PATH}/linux-stable/drivers/apple-bce/Kconfig"
+#sed -i "s/TEST_DRIVER/APPLE_BCE_DRIVER/g" "${BUILD_PATH}/linux-stable/drivers/apple-bce/Kconfig"
+## shellcheck disable=SC2016
+#sed -i 's/obj-m/obj-$(CONFIG_APPLE_BCE)/g' "${BUILD_PATH}/linux-stable/drivers/apple-bce/Makefile"
+## shellcheck disable=SC2016
+#echo 'obj-$(CONFIG_APPLE_BCE)           += apple-bce/' >>"${BUILD_PATH}/linux-stable/drivers/Makefile"
+#sed -i "\$i source \"drivers/apple-bce/Kconfig\"\n" "${BUILD_PATH}/linux-stable/drivers/Kconfig"
+#
+#### apple-ib
+#git clone --single-branch --branch "${APPLE_IB_DRIVER_BRANCH_NAME}" \
+#  "${APPLE_IB_DRIVER_GIT_URL}" "${BUILD_PATH}/linux-stable/drivers/apple-touchbar"
+#cd "${BUILD_PATH}/linux-stable/drivers/apple-touchbar" || exit
+#git checkout "${APPLE_IB_DRIVER_COMMIT_HASH}" && rm -rf .git
+#
+#cd "${BUILD_PATH}/linux-stable/drivers"
+#cp -rfv "${WORKING_PATH}/templates/Kconfig" "${BUILD_PATH}/linux-stable/drivers/apple-touchbar/Kconfig"
+#sed -i "s/TEST_DRIVER/APPLE_TOUCHBAR_DRIVER/g" "${BUILD_PATH}/linux-stable/drivers/apple-touchbar/Kconfig"
+## shellcheck disable=SC2016
+#sed -i 's/obj-m/obj-$(CONFIG_APPLE_TOUCHBAR)/g' "${BUILD_PATH}/linux-stable/drivers/apple-touchbar/Makefile"
+## shellcheck disable=SC2016
+#echo 'obj-$(CONFIG_APPLE_TOUCHBAR)      += apple-touchbar/' >>"${BUILD_PATH}/linux-stable/drivers/Makefile"
+#sed -i "\$i source \"drivers/apple-touchbar/Kconfig\"\n" "${BUILD_PATH}/linux-stable/drivers/Kconfig"
+#
+### Prepare patch
+#git add .
+#git diff HEAD >> "${WORKING_PATH}/patches/custom-drivers.patch"