diff --git a/pkgs/additional/linux-armbian/default.nix b/pkgs/additional/linux-armbian/default.nix index 0ac5ac641..9bb8e702d 100644 --- a/pkgs/additional/linux-armbian/default.nix +++ b/pkgs/additional/linux-armbian/default.nix @@ -11,7 +11,8 @@ withNixpkgsConfig ? true, withFullConfig ? false, withModemPower ? false, #< TODO: fix so it applies - withMegousPatches ? true, + withArmbianPatches ? true, + withMegousPatches ? false, #VVV nixpkgs calls `.override` on the kernel to configure additional things, but we don't care about those things ... }@args: @@ -46,6 +47,177 @@ linux_latest.override { }; } ] + ++ lib.optionals withArmbianPatches (with patches.armbian; [ + byName."Doc-dt-bindings-usb-add-binding-for-DWC3-controller-on-Allwinne" + byName."drv-pinctrl-pinctrl-sun50i-a64-disable_strict_mode" + byName."drv-rtc-sun6i-support-RTCs-without-external-LOSCs" + byName."drv-gpu-drm-gem-dma-Export-with-handle-allocator" + byName."drv-gpu-drm-sun4i-Add-GEM-allocator" + byName."Revert-drm-sun4i-hdmi-switch-to-struct-drm_edid" + byName."drv-gpu-drm-sun4i-Add-HDMI-audio-sun4i-hdmi-encoder" + byName."drv-net-stmmac-dwmac-sun8i-second-EMAC-clock-register" + byName."drv-phy-sun4i-usb-Allow-reset-line-to-be-shared" + byName."drv-staging-media-sunxi-cedrus-add-H616-variant" + byName."drv-soc-sunxi-sram-Add-SRAM-C1-H616-handling" + byName."drv-media-dvb-frontends-si2168-fix-cmd-timeout" + byName."include-uapi-drm_fourcc-add-ARM-tiled-format-modifier" + byName."drv-clocksource-arm_arch_timer-fix-a64-timejump" + byName."sound-soc-sunxi-sun4i-spdif-add-mclk_multiplier" + byName."sound-soc-sunxi-sun8i-codec-analog-enable-sound" + # byName."sound-soc-sunxi-Provoke-the-early-load-of-sun8i-codec-analog" #< 2024-09-16: does not apply to linux 6.11.0 + byName."sound-soc-sunxi-sun4i-codec-adcis-select-capture-source" + byName."drv-mmc-host-sunxi-mmc-add-h5-emmc-compatible" + byName."drv-pinctrl-sunxi-pinctrl-sun50i-h6.c-GPIO-disable_strict_mode" + byName."drv-gpu-drm-sun4i-sun8i_mixer.c-add-h3-mixer1" + byName."drv-mtd-nand-raw-nand_ids.c-add-H27UBG8T2BTR-BC-nand" + byName."drv-mfd-axp20x-add-sysfs-interface" + byName."drv-spi-spidev-Add-armbian-spi-dev-compatible" + byName."drv-spi-spi-sun4i.c-spi-bug-low-on-sck" + byName."drv-rtc-sun6i-Add-Allwinner-H616-support" + byName."drv-nvmem-sunxi_sid-Support-SID-on-H616" + byName."drv-iio-adc-axp20x_adc-arm64-dts-axp803-hwmon-enable-thermal" + byName."drv-gpu-drm-panel-simple-Add-compability-olinuxino-lcd" + byName."drv-input-touchscreen-sun4i-ts-Enable-parsing" + byName."drv-mmc-host-sunxi-mmc-Disable-DDR52-mode-on-all-A20-based-boar" + byName."drv-usb-gadget-composite-rename-gadget-serial-console-manufactu" + byName."arm-arm64-dts-Add-leds-axp20x-charger" + byName."arm-dts-sun9i-a80-add-thermal-sensor" + byName."arm-dts-sun9i-a80-add-thermal-zone" + byName."arm-dts-sun7i-a20-Disable-OOB-IRQ-for-brcm-wifi-on-Cubietruck-a" + byName."arm-dts-a20-orangepi-and-mini-fix-phy-mode-hdmi" + byName."arm-dts-sun8i-h3-nanopi-add-leds-pio-pins" + byName."arm-dts-a10-cubiebord-a20-cubietruck-green-LED-mmc0-default-tri" + byName."arm-dts-Add-sun8i-h2-plus-nanopi-duo-device" + byName."arm-dts-Add-sun8i-h2-plus-sunvell-r69-device" + byName."arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2" + byName."arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-bluetooth-o" + byName."arm-dts-h3-orangepi-2-Add-regulator-vdd-cpu" + byName."arm-dts-sun8i-r40-bananapi-m2-ultra-add-codec-analog" + byName."arm-dts-sun7i-a20-cubietruck-add-alias-uart2" + byName."arm-dts-sun8i-v3s-s3-pinecube-enable-sound-codec" + byName."arm-dts-sun8i-r40-add-clk_out_a-fix-bananam2ultra" + byName."arm-dts-sun8i-h3-bananapi-m2-plus-add-wifi_pwrseq" + byName."arm-dts-sun7i-a20-bananapro-add-hdmi-connector-de" + byName."arm-dts-sun7i-a20-bananapro-add-AXP209-regulators" + byName."arm-dts-sunxi-h3-h5.dtsi-force-mmc0-bus-width" + byName."arm64-dts-sun50i-a64-pine64-enable-wifi-mmc1" + byName."arm64-dts-sun50i-a64-sopine-baseboard-Add-i2s2-mmc1" + byName."arm64-dts-sun50i-h6-Add-r_uart-uart2-3-pins" + byName."arm64-dts-allwiner-sun50i-h616.dtsi-add-usb-ehci-ohci" + byName."arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok" + byName."arm64-dts-allwinner-sun50i-h616-Add-GPU-node" + byName."arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali" + byName."arm64-dts-allwinner-sun50i-h616-Add-VPU-node" + byName."arm64-dts-sun50i-h616-x96-mate-T95-eth-sd-card-hack" + byName."arm64-dts-sun50i-h616-x96-mate-add-hdmi" + byName."arm64-dts-add-sun50i-h618-cpu-dvfs.dtsi" + byName."arm64-dts-sun50i-h313-x96q-lpddr3" + byName."Add-FB_TFT-ST7796S-driver" + byName."Optimize-TSC2007-touchscreen-add-polling-method" + byName."Add-ws2812-RGB-driver-for-allwinner-H616" + byName."LED-green_power_on-red_status_heartbeat-arch-arm64-boot-dts-all" + byName."arm64-dts-allwinner-h616-orangepi-zero2-Enable-expansion-board-" + byName."arm64-dts-sun50i-a64-pine64-enable-Bluetooth" + byName."arm64-dts-sun50i-a64-sopine-baseboard-enable-Bluetooth" + byName."arm64-dts-nanopi-a64-set-right-phy-mode-to-rgmii-id" + byName."arm64-dts-FIXME-a64-olinuxino-add-regulator-audio-mmc" + byName."arm64-dts-Add-sun50i-h5-nanopi-k1-plus-device" + byName."arm64-dts-Add-sun50i-h5-nanopi-neo-core2-device" + byName."arm64-dts-Add-sun50i-h5-nanopi-neo2-v1.1-device" + byName."arm64-dts-Add-sun50i-h5-nanopi-m1-plus2-device" + byName."arm64-dts-sun50i-h5-nanopi-neo2-add-regulator-led-triger" + byName."arm64-dts-sun50i-h5-orangepi-pc2-add-spi-flash" + byName."arm64-dts-sun50i-h5-orangepi-prime-add-regulator" + byName."arm64-dts-sun50i-h5-orangepi-zero-plus-add-regulator" + byName."arm64-dts-sun50i-h6.dtsi-improve-thermals" + byName."arm64-dts-sun50i-h6-orangepi-3-delete-node-spi0" + byName."arm64-dts-sun50i-h6-orangepi-lite2-spi0-usb3phy-dwc3-enable" + byName."arm64-dts-sun50i-h6-pine-h64-add-wifi-rtl8723cs" + byName."arm64-dts-sun50i-h6-pine-h64-add-dwc3-usb3phy" + byName."arm64-dts-sun50i-a64-pine64-add-spi0" + byName."arm64-dts-sun50i-h6.dtsi-add-pinctrl-pins-for-spi" + byName."arm64-dts-sun50i-a64-orangepi-win-add-aliase-ethernet1" + byName."arm64-dts-sun50i-a64-force-mmc0-bus-width" + byName."drv-of-Device-Tree-Overlay-ConfigFS-interface" + # byName."scripts-add-overlay-compilation-support" #< error: "mkimage: command not found" + byName."Makefile-CONFIG_SHELL-fix-for-builddeb-packaging" + byName."arm-dts-overlay-Add-Overlays-for-sunxi" + byName."arm64-dts-allwinner-overlay-Add-Overlays-for-sunxi64" + byName."arm-dts-overlay-sun8i-h3-cpu-clock-add-overclock" + byName."arm64-dts-overlay-sun50i-a64-pine64-7inch-lcd" + byName."arm64-dts-overlay-sun50i-h5-add-gpio-regulator-overclock" + byName."Move-sun50i-h6-pwm-settings-to-its-own-overlay" + byName."Compile-the-pwm-overlay" + byName."cb1-overlay" + byName."cb1-overlay-light-fix" + byName."arm-dts-sunxi-h3-h5.dtsi-add-i2s0-i2s1-pins" + byName."arm-dts-sun5i-a13-olinuxino-micro-add-panel-lcd-olinuxino-4.3" + byName."arm-dts-sun5i-a13-olinuxino-Add-panel-lcd-olinuxino-4.3-needed-" + byName."arm-dts-sun7i-a20-olinuxino-micro-emmc-Add-vqmmc-node" + byName."arm-dts-sun7i-a20-olinuxino-lime2-enable-audio-codec" + byName."arm-dts-sun7i-a20-olinuxino-lime2-enable-ldo3-always-on" + byName."arm-dts-sun7i-a20-olimex-som-204-evb-olinuxino-micro-decrease-d" + byName."arm-dts-sun8i-h3-add-thermal-zones" + byName."arm64-dts-sun50i-a64-olinuxino-add-boards" + byName."arm64-dts-sun50i-a64-olinuxino-emmc-enable-bluetooth" + byName."arm64-dts-sun50i-a64-olinuxino-1Ge16GW-enable-bluetooth" + byName."arm64-dts-sun50i-a64.dtsi-adjust-thermal-trip-points" + byName."arm64-dts-sun50i-a64-olinuxino-1Ge16GW-Disable-clock-phase-and-" + # byName."Temp_fix-mailbox-arch-arm64-boot-dts-allwinner-sun50i-a64-pinep" #< 2024-09-16: does not apply to linux 6.11.0 + # byName."arm64-dts-sun50i-h6-orangepi-3-add-r_uart-aliase" #< 2024-09-16: does not apply to linux 6.11.0 + byName."arm64-dts-sun50i-h5-add-cpu-opp-refs" + byName."arm64-dts-sun50i-h5-add-termal-zones" + byName."arm64-dts-sun50i-h6-orangepi-add-cpu-opp-refs" + byName."arm64-dts-sun50i-h6-orangepi-enable-higher-clock-regulator-max-" + byName."drv-staging-rtl8723bs-AP-bugfix" + byName."arm-dts-sun8i-h3-orangepi-pc-plus-add-wifi_pwrseq" + byName."arm64-dts-sun50i-h5-orangepi-prime-add-rtl8723cs" + byName."arm-dts-sun8i-h2-plus-orangepi-zero-fix-xradio-interrupt" + byName."Fix-include-uapi-spi-spidev-module" + # byName."fix-cpu-opp-table-sun8i-a83t" #< 2024-09-16: does not apply to linux 6.11.0 + # byName."Add-dump_reg-and-sunxi-sysinfo-drivers" #< 2024-09-16: compile error in sunxi-sysinfo.c for linux 6.11.0 + # byName."Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address" #< 2024-09-16: does not apply to linux 6.11.0 + byName."nvmem-sunxi_sid-add-sunxi_get_soc_chipid-sunxi_get_serial" + byName."mmc-host-sunxi-mmc-Fix-H6-emmc" + byName."arm64-dts-allwinner-sun50i-h6-Fix-H6-emmc" + byName."arm64-dts-sun50i-h5-nanopi-r1s-h5-add-rtl8153-support" + byName."net-usb-r8152-add-LED-configuration-from-OF" + byName."arm64-dts-sun50i-h6-orangepi.dtsi-Rollback-r_rsb-to-r_i2c" + byName."arm64-dts-sun50i-h616-bigtreetech-cb1-sd-emmc" + byName."arch-arm64-dts-allwinner-sun50i-h618-bananapi-m4-zero" + byName."ARM-dts-sun8i-nanopiduo2-Use-key-0-as-power-button" + byName."ARM-dts-sun8i-nanopiduo2-enable-ethernet" + # byName."arm-dts-sun8i-h3-reduce-opp-microvolt-to-prevent-not-supported-" #< 2024-09-16: does not apply to linux 6.11.0 + byName."arm64-dts-sun50i-h5-enable-power-button-for-orangepi-prime" + byName."enable-TV-Output-on-OrangePi-Zero-LTE" + byName."drivers-devfreq-sun8i-a33-mbus-disable-autorefresh" + # byName."clk-gate-add-support-for-regmap-based-gates" #< 2024-09-16: compile error for linux 6.11.0, in clk-provider.h + byName."mfd-Add-support-for-X-Powers-AC200" + byName."mfd-Add-support-for-X-Powers-AC200-EPHY-syscon" + byName."net-phy-Add-support-for-AC200-EPHY" + byName."arm64-dts-allwinner-h6-Add-AC200-EPHY-nodes" + byName."arm64-dts-allwinner-h6-tanix-enable-Ethernet" + byName."ASoC-AC200-Initial-driver" + byName."arm64-dts-allwinner-h6-add-AC200-codec-nodes" + byName."arm64-dts-allwinner-h6-enable-AC200-codec" + byName."add-nodes-for-sunxi-info-sunxi-addr-and-sunxi-dump-reg" + # byName."add-initial-support-for-orangepi3-lts" #< 2024-09-16: DTS fails with unknown reference to sound_hdmi node + byName."Input-axp20x-pek-allow-wakeup-after-shutdown" + # byName."Add-wifi-nodes-for-Inovato-Quadra" #< 2024-09-16: DTS fails with unknown reference to sound_hdmi node + byName."arm64-dts-h616-add-wifi-support-for-orange-pi-zero-2-and-zero3" + byName."arm64-dts-sun50i-h618-orangepi-zero3-Enable-GPU-mali" + byName."arm64-dts-h616-add-hdmi-support-for-zero2-and-zero3" + byName."arm64-dts-H616-Add-overlays-that-are-also-compatible-with-orang" + byName."driver-allwinner-h618-emac" + byName."drivers-pwm-Add-pwm-sunxi-enhance-driver-for-h616" + byName."arm64-dts-sun50i-h618-orangepi-zero2w-Add-missing-nodes" + byName."arch-arm64-dts-allwinner-sun50i-h616-PG-12c-pins" + byName."arch-arm64-dts-allwinner-sun50i-h616-spi1-cs1-pin" + byName."add-dtb-overlay-for-zero2w" + # byName."Sound-for-H616-H618-Allwinner-SOCs" #< 2024-09-16: does not apply to linux 6.11.0 + byName."ARM64-dts-sun50i-h616-BigTreeTech-CB1-Enable-HDMI" + byName."ARM64-dts-sun50i-h616-BigTreeTech-CB1-Enable-EMAC1" + ]) ++ lib.optionals withMegousPatches (with patches.megous; [ # subset of megi patches. # as you edit this, ensure: