diff --git a/install/config/all.sh b/install/config/all.sh index 1336dee3..a9affb79 100644 --- a/install/config/all.sh +++ b/install/config/all.sh @@ -24,6 +24,6 @@ run_logged $OMARCHY_INSTALL/config/hardware/usb-autosuspend.sh run_logged $OMARCHY_INSTALL/config/hardware/ignore-power-button.sh run_logged $OMARCHY_INSTALL/config/hardware/nvidia.sh run_logged $OMARCHY_INSTALL/config/hardware/fix-f13-amd-audio-input.sh -run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-bcm4360.sh +run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-bcm43xx.sh run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-spi-keyboard.sh run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-t2.sh diff --git a/install/config/hardware/fix-apple-bcm4360.sh b/install/config/hardware/fix-apple-bcm4360.sh deleted file mode 100644 index f7d6d324..00000000 --- a/install/config/hardware/fix-apple-bcm4360.sh +++ /dev/null @@ -1,5 +0,0 @@ -# Install wifi drivers for 2013-2015 MacBooks using the BCM4360 chip -if lspci -nnv | grep -A2 "14e4:43a0" | grep -q "106b:"; then - echo "Apple BCM4360 detected" - sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers -fi diff --git a/install/config/hardware/fix-apple-bcm43xx.sh b/install/config/hardware/fix-apple-bcm43xx.sh new file mode 100644 index 00000000..1311a491 --- /dev/null +++ b/install/config/hardware/fix-apple-bcm43xx.sh @@ -0,0 +1,11 @@ +# Install Wi-Fi drivers for Broadcom chips on MacBooks: +# - BCM4360 (2013–2015) +# - BCM4331 (2012, early 2013) + +pci_info=$(lspci -nnv) + +if echo "$pci_info" | grep -q "106b:" && + (echo "$pci_info" | grep -q "14e4:43a0" || echo "$pci_info" | grep -q "14e4:4331"); then + echo "Apple BCM4360 / BCM4331 detected" + sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers +fi