From e7747832ad236b8450d0d1a491ebb9bb1051f7d1 Mon Sep 17 00:00:00 2001
From: Daniel Barlow <dan@telent.net>
Date: Mon, 1 Jan 2024 20:24:47 +0000
Subject: [PATCH] turris-omnia: reindent
---
devices/turris-omnia/default.nix | 309 ++++++++++++++++---------------
1 file changed, 155 insertions(+), 154 deletions(-)
diff --git a/devices/turris-omnia/default.nix b/devices/turris-omnia/default.nix
index 321977c..1388f7e 100644
--- a/devices/turris-omnia/default.nix
+++ b/devices/turris-omnia/default.nix
@@ -20,175 +20,176 @@
../../modules/outputs/mbrimage.nix
../../modules/outputs/extlinux.nix
];
- kernel = {
- src = pkgs.pkgsBuildBuild.fetchurl {
- name = "linux.tar.gz";
- url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.71.tar.gz";
- hash = "sha256-yhO2cXIeIgUxkSZf/4aAsF11uxyh+UUZu6D1h92vCD8=";
- };
- extraPatchPhase = ''
- ${pkgs.openwrt.applyPatches.mvebu}
- '';
config = {
- PCI = "y";
- OF = "y";
- MEMORY = "y"; # for MVEBU_DEVBUS
- DMADEVICES = "y"; # for MV_XOR
- CPU_V7 = "y";
- ARCH_MULTIPLATFORM = "y";
- ARCH_MVEBU = "y";
- ARCH_MULTI_V7= "y";
- PCI_MVEBU = "y";
- AHCI_MVEBU = "y";
- MACH_ARMADA_38X = "y";
- SMP = "y";
- # this is disabled for the moment because it relies on a GCC
- # plugin that requires gmp.h to build, and I can't see right now
- # how to confgure it to find gmp
- STACKPROTECTOR_PER_TASK = "n";
- NR_CPUS = "4";
- VFP = "y";
- NEON= "y";
+ kernel = {
+ src = pkgs.pkgsBuildBuild.fetchurl {
+ name = "linux.tar.gz";
+ url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.71.tar.gz";
+ hash = "sha256-yhO2cXIeIgUxkSZf/4aAsF11uxyh+UUZu6D1h92vCD8=";
+ };
+ extraPatchPhase = ''
+ ${pkgs.openwrt.applyPatches.mvebu}
+ '';
+ config = {
+ PCI = "y";
+ OF = "y";
+ MEMORY = "y"; # for MVEBU_DEVBUS
+ DMADEVICES = "y"; # for MV_XOR
+ CPU_V7 = "y";
+ ARCH_MULTIPLATFORM = "y";
+ ARCH_MVEBU = "y";
+ ARCH_MULTI_V7= "y";
+ PCI_MVEBU = "y";
+ AHCI_MVEBU = "y";
+ MACH_ARMADA_38X = "y";
+ SMP = "y";
+ # this is disabled for the moment because it relies on a GCC
+ # plugin that requires gmp.h to build, and I can't see right now
+ # how to confgure it to find gmp
+ STACKPROTECTOR_PER_TASK = "n";
+ NR_CPUS = "4";
+ VFP = "y";
+ NEON= "y";
- # WARNING: unmet direct dependencies detected for ARCH_WANT_LIBATA_LEDS
- ATA = "y";
+ # WARNING: unmet direct dependencies detected for ARCH_WANT_LIBATA_LEDS
+ ATA = "y";
- PSTORE = "y";
- PSTORE_RAM = "y";
- PSTORE_CONSOLE = "y";
- PSTORE_DEFLATE_COMPRESS = "n";
+ PSTORE = "y";
+ PSTORE_RAM = "y";
+ PSTORE_CONSOLE = "y";
+ PSTORE_DEFLATE_COMPRESS = "n";
- SERIAL_8250 = "y";
- SERIAL_8250_CONSOLE = "y";
- SERIAL_OF_PLATFORM="y";
- SERIAL_MVEBU_UART = "y";
- SERIAL_MVEBU_CONSOLE = "y";
+ SERIAL_8250 = "y";
+ SERIAL_8250_CONSOLE = "y";
+ SERIAL_OF_PLATFORM="y";
+ SERIAL_MVEBU_UART = "y";
+ SERIAL_MVEBU_CONSOLE = "y";
- SERIAL_8250_DMA= "y";
- SERIAL_8250_DW= "y";
- SERIAL_8250_EXTENDED= "y";
- SERIAL_8250_MANY_PORTS= "y";
- SERIAL_8250_SHARE_IRQ= "y";
- OF_ADDRESS= "y";
- OF_MDIO= "y";
+ SERIAL_8250_DMA= "y";
+ SERIAL_8250_DW= "y";
+ SERIAL_8250_EXTENDED= "y";
+ SERIAL_8250_MANY_PORTS= "y";
+ SERIAL_8250_SHARE_IRQ= "y";
+ OF_ADDRESS= "y";
+ OF_MDIO= "y";
- WATCHDOG = "y"; # watchdog is enabled by u-boot
- ORION_WATCHDOG = "y"; # so is non-optional to keep feeding
+ WATCHDOG = "y"; # watchdog is enabled by u-boot
+ ORION_WATCHDOG = "y"; # so is non-optional to keep feeding
- MVEBU_DEVBUS = "y"; # "Device Bus controller ... flash devices such as NOR, NAND, SRAM, and FPGA"
- MVMDIO = "y";
- MVNETA = "y";
- MVNETA_BM = "y";
- MVNETA_BM_ENABLE = "y";
- SRAM = "y"; # mmio-sram is "compatible" for bm_bppi reqd by BM
- PHY_MVEBU_A38X_COMPHY = "y"; # for eth2
+ MVEBU_DEVBUS = "y"; # "Device Bus controller ... flash devices such as NOR, NAND, SRAM, and FPGA"
+ MVMDIO = "y";
+ MVNETA = "y";
+ MVNETA_BM = "y";
+ MVNETA_BM_ENABLE = "y";
+ SRAM = "y"; # mmio-sram is "compatible" for bm_bppi reqd by BM
+ PHY_MVEBU_A38X_COMPHY = "y"; # for eth2
- MVPP2 = "y";
- MV_XOR = "y";
+ MVPP2 = "y";
+ MV_XOR = "y";
- NET_DSA = "y";
- NET_DSA_MV88E6XXX = "y"; # depends on PTP_1588_CLOCK_OPTIONAL
- };
- };
- rootfsType = "ext4";
- boot = {
- commandLine = [
- "console=ttyS0,115200"
- "pcie_aspm=off" # ath9k pci incompatible with PCIe ASPM
- ];
- imageFormat = "fit";
- };
- filesystem =
- let
- inherit (pkgs.pseudofile) dir symlink;
- firmware = pkgs.stdenv.mkDerivation {
- name = "wlan-firmware";
- phases = ["installPhase"];
- installPhase = ''
+ NET_DSA = "y";
+ NET_DSA_MV88E6XXX = "y"; # depends on PTP_1588_CLOCK_OPTIONAL
+ };
+ };
+ rootfsType = "ext4";
+ boot = {
+ commandLine = [
+ "console=ttyS0,115200"
+ "pcie_aspm=off" # ath9k pci incompatible with PCIe ASPM
+ ];
+ imageFormat = "fit";
+ };
+ filesystem =
+ let
+ inherit (pkgs.pseudofile) dir symlink;
+ firmware = pkgs.stdenv.mkDerivation {
+ name = "wlan-firmware";
+ phases = ["installPhase"];
+ installPhase = ''
mkdir $out
cp -r ${pkgs.linux-firmware}/lib/firmware/ath10k/QCA988X $out
'';
- };
- in dir {
- lib = dir {
- firmware = dir {
- ath10k = symlink firmware;
+ };
+ in dir {
+ lib = dir {
+ firmware = dir {
+ ath10k = symlink firmware;
+ };
};
};
+
+ boot.tftp = {
+ loadAddress = lim.parseInt "0x1000000";
+ kernelFormat = "zimage";
+ compressRoot = true;
};
- boot.tftp = {
- loadAddress = lim.parseInt "0x1000000";
- kernelFormat = "zimage";
- compressRoot = true;
+ hardware = let
+ mac80211 = pkgs.mac80211.override {
+ drivers = ["ath9k_pci" "ath10k_pci"];
+ klibBuild = config.system.outputs.kernel.modulesupport;
+ };
+ in {
+ defaultOutput = "mtdimage";
+ loadAddress = lim.parseInt "0x00800000"; # "0x00008000";
+ entryPoint = lim.parseInt "0x00800000"; # "0x00008000";
+ rootDevice = "/dev/mtdblock0";
+
+ dts = {
+ src = "${config.system.outputs.kernel.modulesupport}/arch/arm/boot/dts/armada-385-turris-omnia.dts";
+ includes = [
+ "${config.system.outputs.kernel.modulesupport}/arch/arm/boot/dts/"
+ ];
+ };
+ flash.eraseBlockSize = 65536; # only used for tftpboot
+ networkInterfaces =
+ let
+ inherit (config.system.service.network) link;
+ inherit (config.system.service) bridge;
+ in rec {
+ en70000 = link.build {
+ # in armada-38x.dtsi this is eth0.
+ # It's connected to port 5 of the 88E6176 switch
+ devpath = "/devices/platform/soc/soc:internal-regs/f1070000.ethernet";
+ # name is unambiguous but not very semantic
+ ifname = "en70000";
+ };
+ en30000 = link.build {
+ # in armada-38x.dtsi this is eth1
+ # It's connected to port 6 of the 88E6176 switch
+ devpath = "/devices/platform/soc/soc:internal-regs/f1030000.ethernet";
+ # name is unambiguous but not very semantic
+ ifname = "en30000";
+ };
+ # the default (from the dts? I'm guessing) behavour for
+ # lan ports on the switch is to attach them to
+ # en30000. It should be possible to do something better,
+ # per
+ # https://www.kernel.org/doc/html/latest/networking/dsa/configuration.html#affinity-of-user-ports-to-cpu-ports
+ # but apparently OpenWrt doesn't either so maybe it's more
+ # complicated than it looks
+
+ wan = link.build {
+ # in armada-38x.dtsi this is eth2. It may be connected to
+ # an ethernet phy or to the SFP cage, depending on a gpio
+ devpath = "/devices/platform/soc/soc:internal-regs/f1034000.ethernet";
+ ifname = "wan";
+ };
+
+ lan = link.build {
+ ifname = "lan1";
+ };
+
+ wlan = link.build {
+ ifname = "wlan0";
+ dependencies = [ mac80211 ];
+ };
+ wlan5 = link.build {
+ ifname = "wlan1";
+ dependencies = [ mac80211 ];
+ };
+ };
+ };
+ };
};
-
- hardware = let
- mac80211 = pkgs.mac80211.override {
- drivers = ["ath9k_pci" "ath10k_pci"];
- klibBuild = config.system.outputs.kernel.modulesupport;
- };
- in {
- defaultOutput = "mtdimage";
- loadAddress = lim.parseInt "0x00800000"; # "0x00008000";
-
- entryPoint = lim.parseInt "0x00800000"; # "0x00008000";
- rootDevice = "/dev/mtdblock0";
- dts = {
- src = "${config.system.outputs.kernel.modulesupport}/arch/arm/boot/dts/armada-385-turris-omnia.dts";
- includes = [
- "${config.system.outputs.kernel.modulesupport}/arch/arm/boot/dts/"
- ];
- };
- flash.eraseBlockSize = 65536; # only used for tftpboot
- networkInterfaces =
- let
- inherit (config.system.service.network) link;
- inherit (config.system.service) bridge;
- in rec {
- en70000 = link.build {
- # in armada-38x.dtsi this is eth0.
- # It's connected to port 5 of the 88E6176 switch
- devpath = "/devices/platform/soc/soc:internal-regs/f1070000.ethernet";
- # name is unambiguous but not very semantic
- ifname = "en70000";
- };
- en30000 = link.build {
- # in armada-38x.dtsi this is eth1
- # It's connected to port 6 of the 88E6176 switch
- devpath = "/devices/platform/soc/soc:internal-regs/f1030000.ethernet";
- # name is unambiguous but not very semantic
- ifname = "en30000";
- };
- # the default (from the dts? I'm guessing) behavour for
- # lan ports on the switch is to attach them to
- # en30000. It should be possible to do something better,
- # per
- # https://www.kernel.org/doc/html/latest/networking/dsa/configuration.html#affinity-of-user-ports-to-cpu-ports
- # but apparently OpenWrt doesn't either so maybe it's more
- # complicated than it looks
-
- wan = link.build {
- # in armada-38x.dtsi this is eth2. It may be connected to
- # an ethernet phy or to the SFP cage, depending on a gpio
- devpath = "/devices/platform/soc/soc:internal-regs/f1034000.ethernet";
- ifname = "wan";
- };
-
- lan = link.build {
- ifname = "lan1";
- };
-
- wlan = link.build {
- ifname = "wlan0";
- dependencies = [ mac80211 ];
- };
- wlan5 = link.build {
- ifname = "wlan1";
- dependencies = [ mac80211 ];
- };
- };
- };
-
- };
}