[HACK] Testing Laguna evalboard with CN9130

2026-07-28 03:33:01 +02:00 · 2024-11-07 14:21:50 +01:00
63 changed files with 1729 additions and 1298 deletions
@@ -33,4 +33,3 @@ Releases
   - Easy to forget adaptations/hacks in customer repos -- may need Infix change/support
 - Ensure the markdown link for the release diff is updated
 - Ensure subrepos are tagged (can be automated, see kernelkit/infix#393)
- - Sync tags for all repo. sync activities
@@ -101,7 +101,6 @@ jobs:
    runs-on: [ self-hosted, release ]
    permissions:
      contents: write
-      discussions: write
    steps:
      - uses: actions/checkout@v4
        with:
@@ -116,14 +115,12 @@ jobs:
              ver=${GITHUB_REF#refs/tags/}
          fi
          echo "ver=${ver}"     >> $GITHUB_OUTPUT
-          echo "cat="           >> $GITHUB_OUTPUT
          if echo $ver | grep -qE 'v[0-9.]+(-alpha|-beta|-rc)[0-9]*'; then
            echo "pre=true"     >> $GITHUB_OUTPUT
            echo "latest=false" >> $GITHUB_OUTPUT
          elif echo $ver | grep -qE '^v[0-9.]+\.[0-9.]+(\.[0-9]+)?$'; then
            echo "pre=false"    >> $GITHUB_OUTPUT
            echo "latest=true"  >> $GITHUB_OUTPUT
-            echo "cat=Releases" >> $GITHUB_OUTPUT
          else
            echo "pre=false"    >> $GITHUB_OUTPUT
            echo "latest=false" >> $GITHUB_OUTPUT
@@ -153,7 +150,7 @@ jobs:
          name: Infix ${{ github.ref_name }}
          prerelease: ${{ steps.rel.outputs.pre }}
          makeLatest: ${{ steps.rel.outputs.latest }}
-          discussionCategory: ${{ steps.rel.outputs.cat }}
+          discussionCategory: Releases
          bodyFile:  release.md
          artifacts: "*.tar.gz*"

@@ -0,0 +1,558 @@
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_AUDIT=y
+CONFIG_NO_HZ_IDLE=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT=y
+CONFIG_PREEMPT=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=18
+CONFIG_MEMCG=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CPUSETS=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+CONFIG_USER_NS=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_PROFILING=y
+CONFIG_ARCH_SPARX5=y
+CONFIG_ARCH_LAN969X=y
+CONFIG_ARCH_MVEBU=y
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_ARM64_VA_BITS_48=y
+CONFIG_SCHED_MC=y
+CONFIG_NR_CPUS=64
+CONFIG_COMPAT=y
+# CONFIG_SUSPEND is not set
+CONFIG_ARM_PSCI_CPUIDLE=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+CONFIG_CPUFREQ_DT=y
+CONFIG_ARM_ARMADA_37XX_CPUFREQ=y
+CONFIG_ARM_ARMADA_8K_CPUFREQ=y
+CONFIG_ACPI=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+# CONFIG_GCC_PLUGINS is not set
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_COMPAT_BRK is not set
+CONFIG_KSM=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_CMA=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_XDP_SOCKETS=y
+CONFIG_XDP_SOCKETS_DIAG=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
+CONFIG_NETFILTER=y
+CONFIG_BRIDGE_NETFILTER=y
+CONFIG_NETFILTER_NETLINK_QUEUE=y
+CONFIG_NETFILTER_NETLINK_LOG=y
+CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_FTP=y
+CONFIG_NF_TABLES=y
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_CT=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_REJECT_NETDEV=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_META=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_BPFILTER=y
+CONFIG_BRIDGE=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_BRIDGE_MRP=y
+CONFIG_BRIDGE_CFM=y
+CONFIG_NET_DSA=y
+CONFIG_VLAN_8021Q=y
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_MQPRIO=y
+CONFIG_NET_CLS_BASIC=y
+CONFIG_NET_CLS_BPF=y
+CONFIG_NET_CLS_FLOWER=y
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_GACT=y
+CONFIG_NET_ACT_MIRRED=y
+CONFIG_NET_ACT_SKBEDIT=y
+CONFIG_DCB=y
+CONFIG_NETLINK_DIAG=y
+CONFIG_MPLS=y
+CONFIG_NET_MPLS_GSO=y
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_PKTGEN=y
+# CONFIG_WIRELESS is not set
+CONFIG_NET_9P=y
+CONFIG_NET_9P_VIRTIO=y
+CONFIG_LWTUNNEL=y
+CONFIG_PCI=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_AARDVARK=y
+CONFIG_PCI_HOST_GENERIC=y
+CONFIG_PCIE_ARMADA_8K=y
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_FW_CFG_SYSFS=y
+CONFIG_FW_CFG_SYSFS_CMDLINE=y
+CONFIG_MTD=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_BLOCK2MTD=y
+CONFIG_MTD_RAW_NAND=y
+CONFIG_MTD_NAND_MARVELL=y
+CONFIG_MTD_SPI_NOR=y
+CONFIG_OF_OVERLAY=y
+CONFIG_BLK_DEV_NULL_BLK=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_VIRTIO_BLK=y
+CONFIG_BLK_DEV_NVME=y
+CONFIG_SRAM=y
+CONFIG_EEPROM_AT24=y
+# CONFIG_SCSI_PROC_FS is not set
+CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_SAS_LIBSAS=y
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_VIRTIO=y
+CONFIG_ATA=y
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_AHCI_MVEBU=y
+CONFIG_PATA_OF_PLATFORM=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_DM=y
+CONFIG_DM_INIT=y
+CONFIG_DM_VERITY=y
+CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
+CONFIG_NETDEVICES=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN=m
+CONFIG_IPVTAP=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_BAREUDP=m
+CONFIG_MACSEC=m
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=y
+CONFIG_NLMON=y
+CONFIG_NET_VRF=y
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6XXX_PTP=y
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_ADAPTEC is not set
+# CONFIG_NET_VENDOR_AGERE is not set
+# CONFIG_NET_VENDOR_ALACRITECH is not set
+# CONFIG_NET_VENDOR_ALTEON is not set
+# CONFIG_NET_VENDOR_AMAZON is not set
+# CONFIG_NET_VENDOR_AMD is not set
+# CONFIG_NET_VENDOR_AQUANTIA is not set
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_ATHEROS is not set
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CADENCE is not set
+# CONFIG_NET_VENDOR_CAVIUM is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CISCO is not set
+# CONFIG_NET_VENDOR_CORTINA is not set
+# CONFIG_NET_VENDOR_DEC is not set
+# CONFIG_NET_VENDOR_DLINK is not set
+# CONFIG_NET_VENDOR_EMULEX is not set
+# CONFIG_NET_VENDOR_EZCHIP is not set
+# CONFIG_NET_VENDOR_GOOGLE is not set
+# CONFIG_NET_VENDOR_HISILICON is not set
+# CONFIG_NET_VENDOR_HUAWEI is not set
+CONFIG_MVNETA=m
+CONFIG_MVPP2=m
+# CONFIG_NET_VENDOR_MELLANOX is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+CONFIG_LAN969X_SWITCH=y
+# CONFIG_NET_VENDOR_MICROSEMI is not set
+# CONFIG_NET_VENDOR_MYRI is not set
+# CONFIG_NET_VENDOR_NI is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_NETERION is not set
+# CONFIG_NET_VENDOR_NETRONOME is not set
+# CONFIG_NET_VENDOR_NVIDIA is not set
+# CONFIG_NET_VENDOR_OKI is not set
+# CONFIG_NET_VENDOR_PACKET_ENGINES is not set
+# CONFIG_NET_VENDOR_PENSANDO is not set
+# CONFIG_NET_VENDOR_QLOGIC is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_RDC is not set
+CONFIG_8139CP=y
+# CONFIG_NET_VENDOR_RENESAS is not set
+# CONFIG_NET_VENDOR_ROCKER is not set
+# CONFIG_NET_VENDOR_SAMSUNG is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SILAN is not set
+# CONFIG_NET_VENDOR_SIS is not set
+# CONFIG_NET_VENDOR_SOLARFLARE is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_SYNOPSYS is not set
+# CONFIG_NET_VENDOR_TEHUTI is not set
+# CONFIG_NET_VENDOR_TI is not set
+# CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
+# CONFIG_NET_VENDOR_XILINX is not set
+CONFIG_SFP=y
+CONFIG_AX88796B_PHY=y
+CONFIG_MARVELL_PHY=y
+CONFIG_MARVELL_10G_PHY=m
+CONFIG_MICREL_PHY=y
+CONFIG_MICROCHIP_PHY=y
+CONFIG_MICROCHIP_T1_PHY=y
+CONFIG_MICROSEMI_PHY=m
+CONFIG_MDIO_BITBANG=y
+CONFIG_MDIO_MVUSB=m
+CONFIG_MDIO_MSCC_MIIM=y
+CONFIG_MDIO_BUS_MUX_MMIOREG=y
+CONFIG_USB_RTL8152=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_CDC_EEM=m
+# CONFIG_USB_NET_CDC_NCM is not set
+# CONFIG_USB_NET_NET1080 is not set
+# CONFIG_USB_NET_CDC_SUBSET is not set
+# CONFIG_USB_NET_ZAURUS is not set
+# CONFIG_WLAN is not set
+CONFIG_INPUT_EVDEV=y
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_SERIO_SERPORT is not set
+CONFIG_SERIO_AMBAKMI=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DW=y
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_XILINX_PS_UART=y
+CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
+CONFIG_SERIAL_MVEBU_UART=y
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_GPIO=y
+CONFIG_I2C_MUX_PCA954x=y
+CONFIG_I2C_MUX_PINCTRL=y
+CONFIG_I2C_AT91=y
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
+CONFIG_I2C_MV64XXX=y
+CONFIG_I2C_SLAVE=y
+CONFIG_SPI=y
+CONFIG_SPI_ARMADA_3700=y
+CONFIG_SPI_ORION=y
+CONFIG_SPI_PL022=y
+CONFIG_SPI_MUX=y
+CONFIG_SPI_SPIDEV=m
+CONFIG_SPMI=y
+CONFIG_PINCTRL_MCP23S08=y
+CONFIG_PINCTRL_MICROCHIP_SGPIO=y
+CONFIG_PINCTRL_OCELOT=y
+CONFIG_GPIO_DWAPB=y
+CONFIG_GPIO_PL061=y
+CONFIG_GPIO_XGENE=y
+CONFIG_GPIO_PCA953X=y
+CONFIG_GPIO_PCA953X_IRQ=y
+CONFIG_GPIO_PCF857X=y
+CONFIG_GPIO_MAX77620=y
+CONFIG_POWER_RESET_GPIO_RESTART=y
+CONFIG_POWER_RESET_XGENE=y
+CONFIG_POWER_RESET_SYSCON=y
+CONFIG_BATTERY_BQ27XXX=y
+CONFIG_CHARGER_GPIO=y
+CONFIG_SENSORS_SPARX5=y
+CONFIG_SENSORS_JC42=y
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_INA2XX=m
+CONFIG_CPU_THERMAL=y
+CONFIG_THERMAL_EMULATION=y
+CONFIG_ARMADA_THERMAL=y
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_SYSFS=y
+CONFIG_SOFT_WATCHDOG=y
+CONFIG_GPIO_WATCHDOG=y
+CONFIG_ARMADA_37XX_WATCHDOG=y
+CONFIG_I6300ESB_WDT=y
+CONFIG_MFD_ATMEL_FLEXCOM=y
+CONFIG_MFD_MAX77620=y
+CONFIG_MFD_LAN966X_PCI=y
+CONFIG_MFD_LAN969X_PCI=y
+CONFIG_MFD_SEC_CORE=y
+CONFIG_MFD_ROHM_BD718XX=y
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_BD718XX=y
+CONFIG_REGULATOR_GPIO=y
+CONFIG_REGULATOR_MAX77620=y
+CONFIG_REGULATOR_PCA9450=y
+CONFIG_REGULATOR_QCOM_SPMI=y
+CONFIG_REGULATOR_S2MPS11=y
+# CONFIG_HID_GENERIC is not set
+# CONFIG_HID_A4TECH is not set
+# CONFIG_HID_APPLE is not set
+# CONFIG_HID_BELKIN is not set
+# CONFIG_HID_CHERRY is not set
+# CONFIG_HID_CHICONY is not set
+# CONFIG_HID_CYPRESS is not set
+# CONFIG_HID_EZKEY is not set
+# CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_LOGITECH is not set
+# CONFIG_HID_MICROSOFT is not set
+# CONFIG_HID_MONTEREY is not set
+CONFIG_USB_ULPI_BUS=y
+CONFIG_USB=m
+CONFIG_USB_OTG=y
+CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_XHCI_MVEBU=m
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_STORAGE=m
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC2=y
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_ISP1760=y
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_NOP_USB_XCEIV=y
+CONFIG_USB_ULPI=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_SNP_UDC_PLAT=y
+CONFIG_TYPEC=y
+CONFIG_TYPEC_TCPM=m
+CONFIG_TYPEC_TCPCI=m
+CONFIG_TYPEC_RT1711H=m
+CONFIG_MMC=y
+CONFIG_MMC_BLOCK_MINORS=32
+CONFIG_MMC_ARMMMCI=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
+CONFIG_MMC_SDHCI_OF_SPARX5=y
+CONFIG_MMC_SPI=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_EXYNOS=y
+CONFIG_MMC_DW_K3=y
+CONFIG_MMC_SDHCI_XENON=y
+CONFIG_SCSI_UFSHCD=y
+CONFIG_SCSI_UFSHCD_PLATFORM=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_SYSCON=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_NETDEV=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_MAX77686=y
+CONFIG_RTC_DRV_PCF8523=y
+CONFIG_RTC_DRV_S5M=y
+CONFIG_RTC_DRV_DS3232=y
+CONFIG_RTC_DRV_EFI=y
+CONFIG_RTC_DRV_PL031=y
+CONFIG_RTC_DRV_ARMADA38X=y
+CONFIG_DMADEVICES=y
+CONFIG_MV_XOR=y
+CONFIG_MV_XOR_V2=y
+CONFIG_PL330_DMA=y
+CONFIG_UIO=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_INPUT=y
+CONFIG_VIRTIO_MMIO=y
+# CONFIG_SURFACE_PLATFORMS is not set
+CONFIG_COMMON_CLK_CS2000_CP=y
+CONFIG_COMMON_CLK_S2MPS11=y
+CONFIG_COMMON_CLK_XGENE=y
+CONFIG_COMMON_CLK_BD718XX=y
+CONFIG_MAILBOX=y
+CONFIG_ARM_SMMU=y
+CONFIG_ARM_SMMU_V3=y
+CONFIG_EXTCON_USB_GPIO=y
+CONFIG_IIO=y
+CONFIG_TI_ADC081C=y
+CONFIG_PWM=y
+CONFIG_PHY_MVEBU_CP110_COMPHY=y
+CONFIG_PHY_MVEBU_CP110_UTMI=y
+CONFIG_PHY_SAMSUNG_USB2=y
+CONFIG_NVMEM_LAYOUT_ONIE_TLV=y
+CONFIG_MUX_MMIO=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_BTRFS_FS=y
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+CONFIG_FUSE_FS=y
+CONFIG_VIRTIO_FS=y
+CONFIG_OVERLAY_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_EXFAT_FS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+CONFIG_9P_FS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_SECURITY=y
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_ECHAINIV=y
+CONFIG_CRYPTO_ANSI_CPRNG=y
+CONFIG_CRYPTO_GHASH_ARM64_CE=y
+CONFIG_CRYPTO_SHA1_ARM64_CE=y
+CONFIG_CRYPTO_SHA2_ARM64_CE=y
+CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
+CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
+CONFIG_DMA_CMA=y
+CONFIG_CMA_SIZE_MBYTES=0
+CONFIG_IRQ_POLL=y
+CONFIG_PRINTK_TIME=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_FS=y
+CONFIG_PANIC_ON_OOPS=y
+CONFIG_PANIC_TIMEOUT=20
+CONFIG_HARDLOCKUP_DETECTOR=y
+CONFIG_WQ_WATCHDOG=y
+# CONFIG_SCHED_DEBUG is not set
+CONFIG_PROVE_LOCKING=y
+CONFIG_DEBUG_ATOMIC_SLEEP=y
+CONFIG_RCU_CPU_STALL_CPUTIME=y
+CONFIG_FUNCTION_TRACER=y
+# CONFIG_STRICT_DEVMEM is not set
+CONFIG_MEMTEST=y
@@ -34,6 +34,8 @@
 	iommu-map-mask = <0x031f>;
 };

+#include "lan969x-pcie.dtsi"
+
 &cp0_usb3_0 {
 	status = "okay";
 	usb-phy = <&cp0_usb3_0_phy0>;
@@ -0,0 +1,428 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <dt-bindings/mfd/atmel-flexcom.h>
+#include <dt-bindings/clock/microchip,lan966x.h>
+
+&cp0_pcie0 {
+	pci@0,0 {
+		#address-cells = <3>;
+		#size-cells = <2>;
+		device_type = "pci";
+
+		reg = <0 0 0 0 0>;
+		ranges = <0x02000000 0x0 0xc0000000 0x02000000 0x0 0xc0000000 0x0 0x40000000>;
+
+		lan969x: ep_lan969x@0,0 {
+			compatible = "pci1055,9690";
+
+			reg = <0 0 0 0 0>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			ranges = <0xe2000000 0x02000000 0x0 0xc0000000 0x02000000>,
+			         <0xe0000000 0x02000000 0x0 0xc2000000 0x01000000>;
+
+			#interrupt-cells = <2>;
+			interrupt-controller;
+			interrupt-parent = <&lan969x>;
+
+			clocks {
+				fx100_clk: fx100-clk {
+					compatible = "fixed-clock";
+					#clock-cells = <0>;
+					clock-frequency = <320000000>;
+				};
+
+				fabric_clk: fabric-clk {
+					compatible = "fixed-clock";
+					#clock-cells = <0>;
+					clock-frequency = <250000000>;
+				};
+			};
+
+			cpu_ctrl: syscon@e00c0000 {
+				compatible = "microchip,lan966x-cpu-syscon", "syscon";
+				reg = <0xe00c0000 0x350>;
+			};
+
+			lan969x_gpio: pinctrl@e20100d4 {
+				compatible = "microchip,lan969x-pinctrl";
+				reg = <0xe20100d4 0xd4>,
+				      <0xe2010370 0xa8>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				gpio-ranges = <&lan969x_gpio 0 0 66>;
+				interrupt-controller;
+				interrupts = <15 IRQ_TYPE_LEVEL_HIGH>;
+				#interrupt-cells = <2>;
+				#address-cells = <1>;
+			};
+
+			mdio0: mdio@e20101a8 {
+				compatible = "mscc,ocelot-miim";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0xe20101a8 0x24>;
+				clocks = <&fx100_clk>;
+				status = "disabled";
+			};
+
+			sgpio: gpio@e2010230 {
+				compatible = "microchip,sparx5-sgpio";
+				reg = <0xe2010230 0x118>;
+				clocks = <&fx100_clk>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+				status = "disabled";
+
+				sgpio_in: gpio@0 {
+					compatible = "microchip,sparx5-sgpio-bank";
+					reg = <0>;
+					gpio-controller;
+					#gpio-cells = <3>;
+					interrupts = <16 IRQ_TYPE_LEVEL_HIGH>;
+					interrupt-controller;
+					#interrupt-cells = <3>;
+					#adress-cells = <0>;
+				};
+
+				sgpio_out: gpio@1 {
+					compatible = "microchip,sparx5-sgpio-bank";
+					reg = <1>;
+					gpio-controller;
+					#gpio-cells = <3>;
+				};
+			};
+
+			lan969x_flx3: flexcom@e0064000 {
+				compatible = "atmel,sama5d2-flexcom";
+				reg = <0xe0064000 0x100>;
+				clocks = <&fabric_clk>;
+				#address-cells = <1>;
+				#size-cells = <1>;
+				ranges = <0x0 0xe0064000 0x800>;
+
+				atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>;
+				status = "okay";
+
+				lan969x_i2c3: i2c@600 {
+					compatible = "microchip,sam9x60-i2c";
+					reg = <0x600 0x200>;
+					interrupts = <49 IRQ_TYPE_LEVEL_HIGH>;
+					clocks = <&fabric_clk>;
+					#address-cells = <1>;
+					#size-cells = <0>;
+					pinctrl-0 = <&fc3_pins>;
+					pinctrl-names = "default";
+					i2c-analog-filter;
+					i2c-digital-filter;
+					i2c-digital-filter-width-ns = <35>;
+					i2c-sda-hold-time-ns = <1500>;
+					status = "okay";
+				};
+			};
+
+			i2c-mux {
+				compatible = "i2c-mux-gpio";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				i2c-parent = <&lan969x_i2c3>;
+
+				mux-gpios = <&sgpio_out 0 1 GPIO_ACTIVE_HIGH
+					     &sgpio_out 0 2 GPIO_ACTIVE_HIGH
+					     &sgpio_out 0 3 GPIO_ACTIVE_HIGH>;
+				idle-state = <0x8>;
+
+				i2c_sfp0: i2c-sfp0 {
+					reg = <0x0>;
+				};
+
+				i2c_sfp1: i2c-sfp1 {
+					reg = <0x1>;
+				};
+
+				i2c_sfp2: i2c-sfp2 {
+					reg = <0x2>;
+				};
+
+				i2c_sfp3: i2c-sfp3 {
+					reg = <0x3>;
+				};
+			};
+
+			sfp0: sfp0 {
+				compatible = "sff,sfp";
+				i2c-bus = <&i2c_sfp0>;
+				tx-disable-gpios = <&sgpio_out 6 2 GPIO_ACTIVE_HIGH>;
+				los-gpios = <&sgpio_in 6 0 GPIO_ACTIVE_HIGH>;
+				mod-def0-gpios = <&sgpio_in 6 1 GPIO_ACTIVE_LOW>;
+				tx-fault-gpios = <&sgpio_in 6 2 GPIO_ACTIVE_HIGH>;
+			};
+
+			sfp1: sfp1 {
+				compatible = "sff,sfp";
+				i2c-bus = <&i2c_sfp1>;
+				tx-disable-gpios = <&sgpio_out 7 2 GPIO_ACTIVE_HIGH>;
+				los-gpios = <&sgpio_in 7 0 GPIO_ACTIVE_HIGH>;
+				mod-def0-gpios = <&sgpio_in 7 1 GPIO_ACTIVE_LOW>;
+				tx-fault-gpios = <&sgpio_in 7 2 GPIO_ACTIVE_HIGH>;
+			};
+
+			sfp2: sfp2 {
+				compatible = "sff,sfp";
+				i2c-bus = <&i2c_sfp2>;
+				tx-disable-gpios = <&sgpio_out 8 2 GPIO_ACTIVE_HIGH>;
+				los-gpios = <&sgpio_in 8 0 GPIO_ACTIVE_HIGH>;
+				mod-def0-gpios = <&sgpio_in 8 1 GPIO_ACTIVE_LOW>;
+				tx-fault-gpios = <&sgpio_in 8 2 GPIO_ACTIVE_HIGH>;
+			};
+
+			sfp3: sfp3 {
+				compatible = "sff,sfp";
+				i2c-bus = <&i2c_sfp3>;
+				tx-disable-gpios = <&sgpio_out 9 2 GPIO_ACTIVE_HIGH>;
+				los-gpios = <&sgpio_in 9 0 GPIO_ACTIVE_HIGH>;
+				mod-def0-gpios = <&sgpio_in 9 1 GPIO_ACTIVE_LOW>;
+				tx-fault-gpios = <&sgpio_in 9 2 GPIO_ACTIVE_HIGH>;
+			};
+
+			lan969x_switch: switch@e0000000 {
+				compatible = "microchip,lan969x-switch";
+				reg = <0xe00c0000 0x800000>,
+				      <0xe2010000 0x1410000>;
+				reg-names = "cpu", "dev";
+				interrupt-names = "xtr", "fdma", "ptp", "ptp-ext";
+				interrupts = <10 IRQ_TYPE_LEVEL_HIGH>,
+					     <88 IRQ_TYPE_LEVEL_HIGH>,
+					     <9 IRQ_TYPE_LEVEL_HIGH>,
+					     <8 IRQ_TYPE_LEVEL_HIGH>;
+			};
+
+			serdes: serdes@e3410000 {
+				compatible = "microchip,lan969x-serdes";
+				#phy-cells = <1>;
+				clocks = <&fabric_clk>;
+				reg = <0xe3410000 0x150000>;
+			};
+
+			leds {
+				compatible = "gpio-leds";
+
+				led-s6-green {
+					label = "s6:green";
+					gpios = <&sgpio_out 6 0 GPIO_ACTIVE_LOW>;
+					default-state = "off";
+				};
+
+				led-s6-yellow {
+					label = "s6:yellow";
+					gpios = <&sgpio_out 6 1 GPIO_ACTIVE_LOW>;
+					default-state = "off";
+				};
+
+				led-s7-green {
+					label = "s7:green";
+					gpios = <&sgpio_out 7 0 GPIO_ACTIVE_LOW>;
+					default-state = "off";
+				};
+
+				led-s7-yellow {
+					label = "s7:yellow";
+					gpios = <&sgpio_out 7 1 GPIO_ACTIVE_LOW>;
+					default-state = "off";
+				};
+
+				led-s8-green {
+					label = "s8:green";
+					gpios = <&sgpio_out 8 0 GPIO_ACTIVE_LOW>;
+					default-state = "off";
+				};
+
+				led-s8-yellow {
+					label = "s8:yellow";
+					gpios = <&sgpio_out 8 1 GPIO_ACTIVE_LOW>;
+					default-state = "off";
+				};
+
+				led-s9-green {
+					label = "s9:green";
+					gpios = <&sgpio_out 9 0 GPIO_ACTIVE_LOW>;
+					default-state = "off";
+				};
+
+				led-s9-yellow {
+					label = "s9:yellow";
+					gpios = <&sgpio_out 9 1 GPIO_ACTIVE_LOW>;
+					default-state = "off";
+				};
+			};
+		};
+	};
+};
+
+&lan969x_gpio {
+	emmc_sd_pins: emmc-sd-pins {
+		/* eMMC_SD - CMD, CLK, D0, D1, D2, D3, D4, D5, D6, D7, RSTN */
+		pins = "GPIO_14", "GPIO_15", "GPIO_16", "GPIO_17",
+		       "GPIO_18", "GPIO_19", "GPIO_20", "GPIO_21",
+		       "GPIO_22", "GPIO_23", "GPIO_24";
+		function = "emmc_sd";
+	};
+
+	fc0_pins: fc0-pins {
+		pins = "GPIO_3", "GPIO_4";
+		function = "fc";
+	};
+
+	fc2_pins: fc2-pins {
+		pins = "GPIO_64", "GPIO_65", "GPIO_66";
+		function = "fc";
+	};
+
+	fc3_pins: fc3-pins {
+		pins = "GPIO_55", "GPIO_56";
+		function = "fc";
+	};
+
+	mdio_pins: mdio-pins {
+		pins = "GPIO_9", "GPIO_10";
+		function = "miim";
+	};
+
+	mdio_irq_pins: mdio-irq-pins {
+		pins = "GPIO_11";
+		function = "miim_irq";
+	};
+
+	sgpio_pins: sgpio-pins {
+		/* SCK, D0, D1, LD */
+		pins = "GPIO_5", "GPIO_6", "GPIO_7", "GPIO_8";
+		function = "sgpio_a";
+	};
+
+	usb_ulpi_pins: usb-ulpi-pins {
+		pins = "GPIO_30", "GPIO_31", "GPIO_32", "GPIO_33",
+		"GPIO_34", "GPIO_35", "GPIO_36", "GPIO_37",
+		"GPIO_38", "GPIO_39", "GPIO_40", "GPIO_41";
+		function = "usb_ulpi";
+	};
+
+	usb_rst_pins: usb-rst-pins {
+		pins = "GPIO_12";
+		function = "usb2phy_rst";
+	};
+
+	usb_over_pins: usb-over-pins {
+		pins = "GPIO_13";
+		function = "usb_over_detect";
+	};
+
+	usb_power_pins: usb-power-pins {
+		pins = "GPIO_1";
+		function = "usb_power";
+	};
+
+	ptp_out_pins: ptp-out-pins {
+		pins = "GPIO_58";
+		function = "ptpsync_4";
+	};
+
+	ptp_ext_pins: ptp-ext-pins {
+		pins = "GPIO_59";
+		function = "ptpsync_5";
+	};
+};
+
+&mdio0 {
+	pinctrl-0 = <&mdio_pins>, <&mdio_irq_pins>;
+	pinctrl-names = "default";
+	reset-gpios = <&lan969x_gpio 62 GPIO_ACTIVE_LOW>;
+	status = "okay";
+
+#define CU_PHY(_reg) \
+	phy@_reg { \
+		reg = <_reg>; \
+		interrupts = <11 IRQ_TYPE_LEVEL_LOW>; \
+		interrupt-parent = <&lan969x_gpio>; \
+	}
+
+	phy3:  CU_PHY( 3);
+
+	phy4:  CU_PHY( 4); phy5:  CU_PHY( 5); phy6:  CU_PHY( 6); phy7:  CU_PHY( 7);
+	phy8:  CU_PHY( 8); phy9:  CU_PHY( 9); phy10: CU_PHY(10); phy11: CU_PHY(11);
+	phy12: CU_PHY(12); phy13: CU_PHY(13); phy14: CU_PHY(14); phy15: CU_PHY(15);
+
+	phy16: CU_PHY(16); phy17: CU_PHY(17); phy18: CU_PHY(18); phy19: CU_PHY(19);
+	phy20: CU_PHY(20); phy21: CU_PHY(21); phy22: CU_PHY(22); phy23: CU_PHY(23);
+	phy24: CU_PHY(24); phy25: CU_PHY(25); phy26: CU_PHY(26); phy27: CU_PHY(27);
+};
+
+&sgpio {
+	pinctrl-0 = <&sgpio_pins>;
+	pinctrl-names = "default";
+
+	microchip,sgpio-port-ranges = <0 1>, <6 9>;
+	status = "okay";
+
+	gpio@0 {
+		ngpios = <128>;
+	};
+	gpio@1 {
+		ngpios = <128>;
+	};
+};
+
+&serdes {
+	status = "okay";
+};
+
+&lan969x_switch {
+	pinctrl-0 = <&ptp_out_pins>, <&ptp_ext_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+	ethernet-ports {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+#define CU_SWP(_reg, _phy) \
+		port@_reg { \
+			reg = <_reg>; \
+			microchip,bandwidth = <1000>; \
+			phy-handle = <_phy>; \
+			phy-mode = "qsgmii"; \
+			phys = <&serdes (_reg / 4)>; \
+		}
+
+		CU_SWP( 0,  &phy4); CU_SWP( 1,  &phy5); CU_SWP( 2,  &phy6); CU_SWP( 3,  &phy7);
+		CU_SWP( 4,  &phy8); CU_SWP( 5,  &phy9); CU_SWP( 6, &phy10); CU_SWP( 7, &phy11);
+		CU_SWP( 8, &phy12); CU_SWP( 9, &phy13); CU_SWP(10, &phy14); CU_SWP(11, &phy15);
+
+		CU_SWP(12, &phy16); CU_SWP(13, &phy17); CU_SWP(14, &phy18); CU_SWP(15, &phy19);
+		CU_SWP(16, &phy20); CU_SWP(17, &phy21); CU_SWP(18, &phy22); CU_SWP(19, &phy23);
+		CU_SWP(20, &phy24); CU_SWP(21, &phy25); CU_SWP(22, &phy26); CU_SWP(23, &phy27);
+
+#define SERDES_SWP(_reg, _lane, _sfp, _gpio) \
+		port@_reg { \
+			reg = <_reg>; \
+			microchip,bandwidth = <10000>; \
+			phys = <&serdes _lane>; \
+			phy-mode = "10gbase-r"; \
+			sfp = <_sfp>; \
+			microchip,sd-sgpio = <_gpio>; \
+			managed = "in-band-status"; \
+		}
+
+		SERDES_SWP(24, 6, &sfp0, 365);
+		SERDES_SWP(25, 7, &sfp1, 369);
+		SERDES_SWP(26, 8, &sfp2, 373);
+		SERDES_SWP(27, 9, &sfp3, 377);
+
+		port@29 {
+			reg = <29>;
+			microchip,bandwidth = <1000>;
+			phy-handle = <&phy3>;
+			phy-mode = "rgmii";
+		};
+	};
+};
@@ -265,38 +265,14 @@
 	};
 };

-#define SWP_LED \
+#define SWP_LED(_func) \
 	leds { \
 		#address-cells = <1>; \
 		#size-cells = <0>; \
 		\
 		led@0 { \
 			reg = <0>; \
-			function = "tp"; \
-			color = <LED_COLOR_ID_GREEN>; \
-			default-state = "keep"; \
-		}; \
-		led@1 { \
-			reg = <1>; \
-			function = "aux"; \
-			color = <LED_COLOR_ID_GREEN>; \
-			default-state = "off"; \
-		}; \
-	}
-
-/* SFP LEDs
- * Rev A. LEDs do not work at all
- * Rev B. only outer-most (green) LEDs work
- */
-
-#define SFP_LED \
-	leds { \
-		#address-cells = <1>; \
-		#size-cells = <0>; \
-		\
-		led@0 { \
-			reg = <0>; \
-			function = "sfp"; \
+			function = _func; \
 			color = <LED_COLOR_ID_GREEN>; \
 			default-state = "keep"; \
 		}; \
@@ -311,7 +287,7 @@
 		phy-mode = "10gbase-r"; \
 		managed = "in-band-status"; \
 		sfp = <_sfp>; \
-		SFP_LED; \
+		SWP_LED("sfp"); \
 	}

 #define XSWCPU(_n, _eth) \
@@ -345,7 +321,7 @@
 		nvmem-cell-names = "mac-address"; \
 		phy-mode = "gmii"; \
 		phy-handle = <_phy>; \
-		SWP_LED; \
+		SWP_LED("tp"); \
 	}

 #define GPHY(_n) \
@@ -1,111 +0,0 @@
-#!/bin/sh
-# Raw switch LED Control for systems that do not run iitod
-
-
-LEDS=$(find /sys/class/leds -iname '*mdio-mii*')
-LINK=$(find /sys/class/leds -iname '*mdio-mii*p')
-
-# Disable ALL switch port LEDs
-clear()
-{
-    for led in $LEDS; do
-        echo 0 > "${led}/brightness"
-    done
-}
-
-setup()
-{
-    for led in $LINK; do
-        echo netdev > "${led}/trigger"
-    done
-
-    for led in $LINK; do
-        cd "$led"
-	# No sleep here, it's enough with the delay from previous loop
-        echo 1 > link
-        sleep 0.1
-        echo 1 > rx
-        sleep 0.1
-        echo 1 > tx
-        cd - >/dev/null
-    done
-}
-
-leds()
-{
-    for led in $LINK; do
-         printf "%3s: %s\n" "$(cat "$led/device_name" 2>/dev/null)" "$led"
-    done
-}
-
-list()
-{
-    leds | sort | while read -r port path; do
-        printf "%4s %s\n" "$port" "$(basename "$path")"
-
-        aux=${path%%:tp}:aux
-        if [ -e "$aux" ]; then
-            printf "%3s: %s\n" "" "$(basename "$aux")"
-        fi
-    done
-}
-
-flash()
-{
-    sec=$1
-
-    for led in $LEDS; do
-        echo timer > "${led}/trigger"
-    done
-
-    for led in $LEDS; do
-        echo 84 > "${led}/delay_on"
-        echo 84 > "${led}/delay_off"
-    done
-
-    sleep "$sec"
-    clear
-}
-
-usage()
-{
-    echo "usage: $0 [command]"
-    echo
-    echo "flash [SEC]  Flash all LEDs to locate device in rack, default: 5 sec"
-    echo "list         List all LEDs"
-    echo "setup        Set up and start normal operation"
-    echo "start        Call at system init, clears all LEDs and sets up normal op"
-    echo "stop         Clear all LEDs, may be called at system shutdown"
-    echo
-    echo "Please ensure no other tool or daemon is already managing the LEDs."
-}
-
-cmd=$1; shift
-case $cmd in
-    flash)
-        flash ${1:-5}
-        setup
-        ;;
-    help)
-	usage
-	exit 0
-	;;
-    list | ls)
-        list
-        ;;
-    setup)
-	setup
-	;;
-    start)
-	initctl -nbq cond clear led
-	clear
-	setup
-        ;;
-    stop)
-	clear
-	;;
-    *)
-        usage
-	exit 1
-        ;;
-esac
@@ -1 +0,0 @@
-/usr/libexec/styx/led.sh
@@ -1 +0,0 @@
-RAUC_ARGS="-s"
@@ -1 +0,0 @@
-/var/lib/dbus/machine-id
@@ -8,11 +8,10 @@ import struct
 import subprocess
 import sys

-onieprom = importlib.machinery.SourceFileLoader("onieprom", "/bin/onieprom").load_module()
-SYSTEM_JSON = "/run/system.json"
+onieprom = importlib.machinery.SourceFileLoader("onieprom","/bin/onieprom").load_module()
+SYSTEM_JSON   = "/run/system.json"
 KKIT_IANA_PEM = 61046

-
 class DTSystem:
    BASE = "/sys/firmware/devicetree/base"
    INFIX = BASE + "/chosen/infix"
@@ -29,9 +28,7 @@ class DTSystem:
            if not os.path.exists(phandle):
                continue

-            with open(phandle, "rb") as f:
-                data = f.read()
-            ph, = struct.unpack(">L", data)
+            ph, = struct.unpack(">L", open(phandle, "rb").read())
            dt[ph] = root

        sys = {}
@@ -43,18 +40,14 @@ class DTSystem:
            if not os.path.exists(phandle):
                continue

-            with open(phandle, "rb") as f:
-                data = f.read()
-            ph, = struct.unpack(">L", data)
+            ph, = struct.unpack(">L", open(phandle, "rb").read())
            if ph not in sys:
                sys[ph] = []
            sys[ph].append(root)

        phs = set(list(dt.keys()) + list(sys.keys()))

-        self.devs = {ph: [Device(ph, dt.get(ph), s if s is not None else "")
-                          for s in (sys.get(ph) or []) if ph is not None]
-                     for ph in phs}
+        self.devs = { ph: [Device(ph, dt.get(ph), s if s is not None else "") for s in (sys.get(ph) or []) if ph is not None]  for ph in phs }
        self.base = Device(0, None, DTSystem.BASE)
        self.infix = Device(0, None, DTSystem.INFIX)

@@ -63,8 +56,7 @@ class DTSystem:
        if not os.path.exists(path):
            return ()

-        with open(path, "rb") as f:
-            data = f.read()
+        data = open(path, "rb").read()
        elems = len(data) // struct.calcsize(">L")
        return struct.unpack(">" + elems * "L", data)

@@ -77,8 +69,7 @@ class DTSystem:
                return {}

            try:
-                with open(dev.attrpath("nvmem"), "rb", 0) as f:
-                    data = onieprom.from_tlv(f)
+                data = onieprom.from_tlv(open(dev.attrpath("nvmem"), "rb", 0))
            except:
                data = {}

@@ -93,18 +84,14 @@ class DTSystem:
        }

    def infix_usb_devices(self, out):
-        names = self.infix.str_array("usb-port-names", ())
-        phs = self.__get_phandle_array("usb-ports")
-        data = dict(zip(names, phs))
+        names=self.infix.str_array("usb-port-names", ())
+        phs=self.__get_phandle_array("usb-ports")
+        data=dict(zip(names,phs))
        if data != {}:
            out["usb-ports"] = []
-        for name, ph in data.items():
-            [out["usb-ports"].extend([{
-                "name": name,
-                "path": dev.attrpath("authorized")}, {
-                    "name": name,
-                    "path": dev.attrpath("authorized_default")
-                }]) for dev in self.devices_from_ph(ph)]
+        for name,ph in data.items():
+            [out["usb-ports"].extend([{"name": name, "path": dev.attrpath("authorized")}, {"name": name, "path": dev.attrpath("authorized_default")}]) for dev in self.devices_from_ph(ph)]
+

    def infix_devices(self, kind):
        phs = self.__get_phandle_array(kind)
@@ -114,7 +101,6 @@ class DTSystem:
        flat_devices = [device for sublist in self.infix_devices("vpds") for device in sublist]
        return [self.into_vpd(device) for device in flat_devices]

-
 class QEMUSystem:
    BASE = "/sys/firmware/qemu_fw_cfg"
    REV = BASE + "/rev"
@@ -124,8 +110,7 @@ class QEMUSystem:
        data = {}
        if os.path.exists(QEMUSystem.VPD):
            try:
-                with open(QEMUSystem.VPD, "rb", 0) as f:
-                    data = onieprom.from_tlv(f)
+                data = onieprom.from_tlv(open(QEMUSystem.VPD, "rb", 0))
            except:
                pass

@@ -142,27 +127,31 @@ class QEMUSystem:
    def usb_ports(self):
        ports = [
            {
-                "name": "USB",
-                "path": "/sys/bus/usb/devices/usb1/authorized"
-            }, {
-                "name": "USB",
-                "path": "/sys/bus/usb/devices/usb1/authorized_default"
-            }, {
-                "name": "USB2",
-                "path": "/sys/bus/usb/devices/usb2/authorized"
-            }, {
-                "name": "USB2",
-                "path": "/sys/bus/usb/devices/usb2/authorized_default"
-            }]
+            "name": "USB",
+            "path": "/sys/bus/usb/devices/usb1/authorized"
+
+        },
+        {
+            "name": "USB",
+            "path": "/sys/bus/usb/devices/usb1/authorized_default"
+
+        },
+        {
+            "name": "USB2",
+            "path": "/sys/bus/usb/devices/usb2/authorized"
+        },
+        {
+            "name": "USB2",
+            "path": "/sys/bus/usb/devices/usb2/authorized_default"
+
+        }]
        return ports
-
-
 class Device:
    def __init__(self, ph, dtpath, syspath):
        self.ph, self.dtpath, self.syspath = ph, dtpath, syspath

    def available(self):
-        return self.syspath is not None
+        return self.syspath != None

    def __getitem__(self, attr):
        return self.attr(attr).decode("utf-8").strip("\0")
@@ -170,6 +159,7 @@ class Device:
    def __setitem__(self, attr, value):
        return self.attr(attr, val=value.encode("utf-8"))

+
    def attrpath(self, attr):
        return os.path.join(self.syspath, attr)

@@ -178,16 +168,13 @@ class Device:

    def attr(self, attr, default=None, val=None):
        if not self.hasattr(attr):
-            return default if val is None else False
+            return default if val == None else False

        if val:
-            with open(self.attrpath(attr), "wb") as f:
-                f.write(val)
+            open(self.attrpath(attr), "wb").write(value)
            return True

-        with open(self.attrpath(attr), "rb") as f:
-            data = f.read()
-        return data
+        return open(self.attrpath(attr), "rb").read()

    def str(self, attr, default=None):
        val = self.attr(attr)
@@ -207,9 +194,7 @@ class Device:
        if not self.hasdtattr(attr):
            return default

-        with open(self.dtattrpath(attr), "rb") as f:
-            data = f.read()
-        return data
+        return open(self.dtattrpath(attr), "rb").read()

    def dtstr(self, attr, default=None):
        val = self.dtattr(attr)
@@ -227,7 +212,6 @@ def vpd_get_json_ve(vpd, pem):

    return out

-
 def vpd_get_pwhash(vpd):
    if not vpd.get("trusted"):
        return None
@@ -235,9 +219,8 @@ def vpd_get_pwhash(vpd):
    kkit = vpd_get_json_ve(vpd, KKIT_IANA_PEM)
    return kkit.get("pwhash")

-
 def vpd_inject(out, vpds):
-    out["vpd"] = {vpd["board"]: vpd for vpd in vpds}
+    out["vpd"] = { vpd["board"]: vpd for vpd in vpds }

    product = out["vpd"].get("product", {}).get("data", {})
    hoistattrs = ("vendor", "product-name", "part-number", "serial-number", "mac-address")
@@ -251,7 +234,6 @@ def vpd_inject(out, vpds):
            out["factory-password-hash"] = pwhash
            break

-
 def qemu_base_mac():
    """Find MAC address of first non-loopback interface, subtract with 1"""
    base_path = '/sys/class/net'
@@ -262,8 +244,7 @@ def qemu_base_mac():
            continue
        try:
            # pylint: disable=invalid-name
-            fn = os.path.join(base_path, iface, 'address')
-            with open(fn, 'r', encoding='ascii') as f:
+            with open(os.path.join(base_path, iface, 'address'), 'r', encoding='ascii') as f:
                mac = f.read().strip()
            interfaces.append((mac, iface))
        except FileNotFoundError:
@@ -280,7 +261,6 @@ def qemu_base_mac():

    return None

-
 def probe_qemusystem(out):
    """Probe Qemu based test systems and 'make run'"""
    admin_hash = "$5$mI/zpOAqZYKLC2WU$i7iPzZiIjOjrBF3NyftS9CCq8dfYwHwrmUK097Jca9A"
@@ -308,7 +288,6 @@ def probe_qemusystem(out):
    subprocess.run("initctl -nbq cond set qemu".split(), check=False)
    return 0

-
 def probe_dtsystem(out):
    """Probe DTS based system, expects a VPD in ONIE PROM format."""
    dtsys = DTSystem()
@@ -318,8 +297,6 @@ def probe_dtsystem(out):
    if model:
        out["product-name"] = model

-    out["compatible"] = dtsys.base.str_array("compatible")
-
    staticpw = dtsys.infix.str("factory-password-hash")
    if not out["factory-password-hash"]:
        out["factory-password-hash"] = staticpw
@@ -327,7 +304,6 @@ def probe_dtsystem(out):
    vpd_inject(out, vpds)
    return 0

-
 def main():
    out = {
        "vendor": None,
@@ -362,6 +338,5 @@ def main():
    shutil.chown(SYSTEM_JSON, user="root", group="wheel")
    return err

-
 if __name__ == "__main__":
    sys.exit(main())
@@ -1,48 +1,22 @@
 #!/bin/sh
-# Find, install, and run product specific files and script in /etc
-# before resuming bootstrap.
-#
-# Use /etc/product/init.d/S01-myscript for scripts, may be a symlink, it
-# will be called with `start` as its only argument.
-#
-# The compatible array is listed in the same order as the device tree,
-# most significant to least.  Hence the reverse.[], to ensure overrides
-# are applied in order of significance.
+# Find and install any product specific files in /etc before bootstrap
 ident=$(basename "$0")

-PRODUCT_INIT=/etc/product/init.d
 PREFIXD=/usr/share/product
-COMPATIBLES=$(jq -r '.compatible | reverse.[] | ascii_downcase' /run/system.json)
+PRODUCT=$(jq -r '."product-name" | ascii_downcase' /run/system.json)

 note()
 {
    logger -I $$ -k -p user.notice -t "$ident" "$1"
 }

-found=false
-for PRODUCT in $COMPATIBLES; do
-    DIR="$PREFIXD/$PRODUCT"
-    if [ -d "$DIR" ]; then
-        note "Using vendor/product-specific defaults for $PRODUCT."
-        for dir in "$DIR"/*; do
-            [ -d "$dir" ] && cp -a "$dir" /
-        done
-        found=true
-    fi
-done
-
-if [ "$found" = false ]; then
-    note "No vendor/product-specific directory found, using built-in defaults."
+DIR="$PREFIXD/$PRODUCT"
+if [ -z "$PRODUCT" ] || [ ! -d "$DIR" ]; then
+    note "No vendor/product specific directory found, using built-in defaults."
+    exit 0
 fi

-# Conditions for bootstrap services, this enables product specific
-# init scripts to prevent select services from starting.
-initctl -nbq cond set led
-
-note "Calling runparts $PRODUCT_INIT/S[0-9]+.* start"
-/usr/libexec/finit/runparts -bsp "$PRODUCT_INIT"
-
-# Product specific init done.
-initctl -nbq cond set product
-
-exit 0
+note "Using vendor/product specific defaults."
+for dir in "$DIR"/*; do
+    [ -d "$dir" ] && cp -a "$dir" /
+done
@@ -46,11 +46,7 @@ while [ "$1" ]; do
    [ $txqs -lt 2 ] && continue
    [ $txqs -gt 8 ] && txqs=8

-    output=$(tc qdisc add dev $iface root mqprio hw 1 \
-		num_tc $txqs $(map $txqs) $(queues $txqs) 2>&1) || true
-    if echo "$output" | grep -q "does not support hardware offload"; then
-        echo "Skipping $iface, hardware offload not supported."
-    elif [ -n "$output" ]; then
-	echo "$output"
-    fi
+    tc qdisc add dev $iface root mqprio hw 1 \
+       num_tc $txqs $(map $txqs) $(queues $txqs) || true
 done
+
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec initctl -bq cond set ixinit
+exec initctl -bq cond set ixinit-done
@@ -4,7 +4,7 @@ Change Log
 All notable changes to the project are documented in this file.


-[v24.10.2][] - 2024-11-08
+[v24.10.2][UNRELEASED]
 -------------------------

 ### Changes
@@ -22,30 +22,12 @@ All notable changes to the project are documented in this file.
 - Support for saving and restoring system clock from a disk file.  This
  allows restoring the system clock to a sane date in case the RTC is
  disabled or does not have a valid time, issue #794
- Update device discovery chapter with information on `infix.local` mDNS
-  alias, `netbrowse` support to discover *all* local units, and command
-  examples for disabling LLDP and mDNS services, issue #786
- Updated OSPF documentation to include information on *global OSPF
-  settings* (`redistribution`, `explicit-router-id`, etc.), issue #812
- Added information on *forwarding of IEEE reserved group addresses*
-  to bridge section of networking documentation, issue #788
- Add support for bootstrap conditions and early init product overrides
- Styx: enable second Ethernet port LED in device tree, again, rename
-  it: yellow -> aux, and make sure it is turned off at boot
- Styx: disable second port LED for the 4xSFP slots, does not work
- Styx: override iitod (LED daemon) with a product specific LED script

 ### Fixes
 - Fix #685: DSA conduit interface not always detected, randomly causing
  major issues configuring systems with multiple switch cores
 - Fix #778: reactivate OpenSSL backend for libssh/libssh2 for NanoPI R2S.
-  This fixes a regression in v24.10.0 causing loss of NETCONF support
- Fix #809: enable syslog logging for RAUC
- Fix harmless bootstrap log error message on systems without USB ports:
-  `jq: error (at <stdin>:0): Cannot iterate over null (null)`
- Change confusing `tc` log error message: `Error: does not support
-  hardware offload` to `Skipping $iface, hardware offload not supported.`
-
+  This fixes a regression in v24.10.0 causing loss of NETCONF supprt


 [v24.10.1][] - 2024-10-18
@@ -1294,7 +1276,6 @@ Supported YANG models in addition to those used by sysrepo and netopeer:

 [buildroot]:  https://buildroot.org/
 [UNRELEASED]: https://github.com/kernelkit/infix/compare/v24.10.1...HEAD
-[v24.10.2]:   https://github.com/kernelkit/infix/compare/v24.10.1...v24.10.2
 [v24.10.1]:   https://github.com/kernelkit/infix/compare/v24.10.0...v24.10.1
 [v24.10.0]:   https://github.com/kernelkit/infix/compare/v24.09.0...v24.10.0
 [v24.09.0]:   https://github.com/kernelkit/infix/compare/v24.08.0...v24.09.0
@@ -16,14 +16,14 @@ seen in the response.

 In the example below, the PC is connected to Infix via interface *tap0*
 (*tap0* is *if1* in Figure 1) and Infix responds with address
-*fe80::ff:fec0:ffed*.
+*fe80::ff:fe00:0*.

 ```
 linux-pc:# ping -6 -L -c 3 ff02::1%tap0
 PING ff02::1%tap0(ff02::1%tap0) 56 data bytes
-64 bytes from fe80::ff:fec0:ffed%tap0: icmp_seq=1 ttl=64 time=0.558 ms
-64 bytes from fe80::ff:fec0:ffed%tap0: icmp_seq=2 ttl=64 time=0.419 ms
-64 bytes from fe80::ff:fec0:ffed%tap0: icmp_seq=3 ttl=64 time=0.389 ms
+64 bytes from fe80::ff:fe00:0%tap0: icmp_seq=1 ttl=64 time=0.558 ms
+64 bytes from fe80::ff:fe00:0%tap0: icmp_seq=2 ttl=64 time=0.419 ms
+64 bytes from fe80::ff:fe00:0%tap0: icmp_seq=3 ttl=64 time=0.389 ms

 --- ff02::1%tap0 ping statistics ---
 3 packets transmitted, 3 received, 0% packet loss, time 2043ms
@@ -34,9 +34,9 @@ linux-pc:#
 The PC could connect then connect to Infix, e.g., using SSH.

 ```
-linux-pc:# ssh admin@fe80::ff:fec0:ffed%tap0
-admin@fe80::ff:fec0:ffed%tap0's password: admin
-admin@infix-c0-ff-ee:~$ 
+linux-pc:# ssh admin@fe80::ff:fe00:0%tap0
+admin@fe80::ff:fe00:0%tap0's password: admin
+admin@infix-00-00-00:~$ 
 ```

 ## Discovery mechanisms available in Infix
@@ -55,18 +55,18 @@ linux-pc:# tcpdump -i tap0 -Qin -v ether proto 0x88cc
 tcpdump: listening on tap0, link-type EN10MB (Ethernet), snapshot length 262144 bytes
 15:51:52.061071 LLDP, length 193
    Chassis ID TLV (1), length 7
-      Subtype MAC address (4): 02:00:00:c0:ff:ee (oui Unknown)
+      Subtype MAC address (4): 02:00:00:00:00:00 (oui Unknown)
    Port ID TLV (2), length 7
-      Subtype MAC address (3): 02:00:00:c0:ff:ee (oui Unknown)
+      Subtype MAC address (3): 02:00:00:00:00:00 (oui Unknown)
    Time to Live TLV (3), length 2: TTL 120s
-    System Name TLV (5), length 14: infix-c0-ff-ee
+    System Name TLV (5), length 14: infix-00-00-00
    System Description TLV (6), length 91
      Infix by KernelKit Linux 5.19.17 #1 SMP PREEMPT_DYNAMIC Wed Jun 7 08:47:23 CEST 2023 x86_64
    System Capabilities TLV (7), length 4
      System  Capabilities [Bridge, WLAN AP, Router, Station Only] (0x009c)
      Enabled Capabilities [Station Only] (0x0080)
    Management Address TLV (8), length 24
-      Management Address length 17, AFI IPv6 (2): fe80::ff:fec0:ffed
+      Management Address length 17, AFI IPv6 (2): fe80::ff:fe00:0
      Interface Index Interface Numbering (2): 2
    Port Description TLV (4), length 4: eth0
    Organization specific TLV (127), length 9: OUI IEEE 802.3 Private (0x00120f)
@@ -97,11 +97,11 @@ linux-pc:# sudo tcpdump -i tap0 -Qin -v ether proto 0x88cc
 tcpdump: listening on tap0, link-type EN10MB (Ethernet), snapshot length 262144 bytes
 15:46:07.908665 LLDP, length 207
    Chassis ID TLV (1), length 7
-      Subtype MAC address (4): 02:00:00:c0:ff:ee (oui Unknown)
+      Subtype MAC address (4): 02:00:00:00:00:00 (oui Unknown)
    Port ID TLV (2), length 7
-      Subtype MAC address (3): 02:00:00:c0:ff:ee (oui Unknown)
+      Subtype MAC address (3): 02:00:00:00:00:00 (oui Unknown)
    Time to Live TLV (3), length 2: TTL 120s
-    System Name TLV (5), length 14: infix-c0-ff-ee
+    System Name TLV (5), length 14: infix-00-00-00
    System Description TLV (6), length 91
      Infix by KernelKit Linux 5.19.17 #1 SMP PREEMPT_DYNAMIC Wed Jun 7 08:47:23 CEST 2023 x86_64
    System Capabilities TLV (7), length 4
@@ -134,15 +134,6 @@ linux-pc:#
    (LLDP)](https://github.com/lldp/lldpd) includes *lldpcli*, which
    is handy to sniff and display LLDP packets.

-The LLDP service can be disabled using the following commands.
-
-```
-admin@infix-c0-ff-ee:/> configure
-admin@infix-c0-ff-ee:/config/> no lldp 
-admin@infix-c0-ff-ee:/config/> leave
-admin@infix-c0-ff-ee:/> 
-```
-
 ### mDNS

 DNS-SD/mDNS can be used to discover Infix units and services. Infix
@@ -153,138 +144,33 @@ be used to search for devices advertising their services via mDNS.

 ```
 linux-pc:# avahi-browse -ar
-+   tap0 IPv6 infix-c0-ff-ee                                SFTP File Transfer   local
-+   tap0 IPv4 infix-c0-ff-ee                                SFTP File Transfer   local
-+   tap0 IPv6 infix-c0-ff-ee                                SSH Remote Terminal  local
-+   tap0 IPv4 infix-c0-ff-ee                                SSH Remote Terminal  local
-=   tap0 IPv4 infix-c0-ff-ee                                SFTP File Transfer   local
-   hostname = [infix-c0-ff-ee.local]
+   tap0 IPv6 infix-00-00-00                                SFTP File Transfer   local
+   tap0 IPv4 infix-00-00-00                                SFTP File Transfer   local
+   tap0 IPv6 infix-00-00-00                                SSH Remote Terminal  local
+   tap0 IPv4 infix-00-00-00                                SSH Remote Terminal  local
+=   tap0 IPv4 infix-00-00-00                                SFTP File Transfer   local
+   hostname = [infix-00-00-00.local]
   address = [10.0.1.1]
   port = [22]
   txt = []
-=   tap0 IPv4 infix-c0-ff-ee                                SSH Remote Terminal  local
-   hostname = [infix-c0-ff-ee.local]
+=   tap0 IPv4 infix-00-00-00                                SSH Remote Terminal  local
+   hostname = [infix-00-00-00.local]
   address = [10.0.1.1]
   port = [22]
   txt = []
-=   tap0 IPv6 infix-c0-ff-ee                                SFTP File Transfer   local
-   hostname = [infix-c0-ff-ee.local]
-   address = [fe80::ff:fec0:ffed]
+=   tap0 IPv6 infix-00-00-00                                SFTP File Transfer   local
+   hostname = [infix-00-00-00.local]
+   address = [fe80::ff:fe00:0]
   port = [22]
   txt = []
-=   tap0 IPv6 infix-c0-ff-ee                                SSH Remote Terminal  local
-   hostname = [infix-c0-ff-ee.local]
-   address = [fe80::ff:fec0:ffed]
+=   tap0 IPv6 infix-00-00-00                                SSH Remote Terminal  local
+   hostname = [infix-00-00-00.local]
+   address = [fe80::ff:fe00:0]
   port = [22]
   txt = []
 ^C
 linux-pc:#
 ```
-
-Additionally, *avahi-resolve-host-name* can be used to verify domain
-name mappings for IP addresses. By default, it translates from IPv4
-addresses. This function allows users to confirm that addresses are
-mapped correctly.
-
-```
-linux-pc:# avahi-resolve-host-name infix-c0-ff-ee.local
-infix-c0-ff-ee.local	10.0.1.1
-linux-pc:#
-```
-
-Thanks to mDNS we can use the advertised name instead of the IP
-address for operations like `ping` and `ssh` as shown below:
-
-```
-linux-pc:# ping infix-c0-ff-ee.local -c 3
-PING infix-c0-ff-ee.local (10.0.1.1) 56(84) bytes of data.
-64 bytes from 10.0.1.1: icmp_seq=1 ttl=64 time=0.852 ms
-64 bytes from 10.0.1.1: icmp_seq=2 ttl=64 time=1.12 ms
-64 bytes from 10.0.1.1: icmp_seq=3 ttl=64 time=1.35 ms
-
--- infix-c0-ff-ee.local ping statistics ---
-3 packets transmitted, 3 received, 0% packet loss, time 2003ms
-rtt min/avg/max/mdev = 0.852/1.105/1.348/0.202 ms
-
-linux-pc:# ssh admin@infix-c0-ff-ee.local
-(admin@infix-c0-ff-ee.local) Password: 
-.-------.
-|  . .  | Infix -- a Network Operating System
-|-. v .-| https://kernelkit.org
-'-'---'-
-
-Run the command 'cli' for interactive OAM
-
-linux-pc:#
-```
-
-To disable mDNS/mDNS-SD, type the commands:
-```
-admin@infix-c0-ff-ee:/> configure 
-admin@infix-c0-ff-ee:/config/> no mdns
-admin@infix-c0-ff-ee:/config/> leave
-```
-
-#### Human-Friendly Hostname Alias
-
-Each Infix unit will advertise itself as *infix.local*, in addition to
-its full hostname (e.g., *infix-c0-ff-ee.local* or *foo.local*).  This
-alias works seamlessly on a network with a single Infix device, and
-makes it easy to connect when the exact hostname is not known in
-advance. The examples below show how the alias can be used for
-actions such as pinging or establishing an SSH connection:
-
-```
-linux-pc:# ping infix.local -c 3
-PING infix.local (10.0.1.1) 56(84) bytes of data.
-64 bytes from 10.0.1.1: icmp_seq=1 ttl=64 time=0.751 ms
-64 bytes from 10.0.1.1: icmp_seq=2 ttl=64 time=2.28 ms
-64 bytes from 10.0.1.1: icmp_seq=3 ttl=64 time=1.42 ms
-
--- infix.local ping statistics ---
-3 packets transmitted, 3 received, 0% packet loss, time 2003ms
-rtt min/avg/max/mdev = 0.751/1.482/2.281/0.626 ms
-
-linux-pc:# ssh admin@infix.local
-(admin@infix.local) Password: 
-.-------.
-|  . .  | Infix -- a Network Operating System
-|-. v .-| https://kernelkit.org
-'-'---'-
-
-Run the command 'cli' for interactive OAM
-
-linux-pc:#
-```
-
-When multiple Infix devices are present on the LAN the alias will not
-uniquely identify a device; *infix.local* will refer to any of the
-Infix devices, likely the one that first appeared.
-
-> When multiple Infix units are present, use the full hostname (e.g.,
-> *infix-c0-ff-ee.local* or *foo.local*) rather than the alias
-> infix.local to deterministically connect to a unit.
-
-
-#### Netbrowse service to find all your devices
-
-Another mDNS alias that all Infix devices can advertise is
-*network.local*. This is a web service which basically runs avahi-browse
-and displays a table of other Infix devices and their services. 
-
-![Netbrowse Service - network.local](img/network-local.png)
-
-With multiple Infix devices on the LAN, one will be your portal to
-access all others, if it goes down another will take its place.
-
-To disable the netbrowse service, the following commands can be used:
-```
-admin@infix-c0-ff-ee:/> configure 
-admin@infix-c0-ff-ee:/config/> edit web
-admin@infix-c0-ff-ee:/config/web/> no netbrowse
-admin@infix-c0-ff-ee:/config/web/> leave
-```
-
 [^2]: [mdns-scan](http://0pointer.de/lennart/projects/mdns-scan/): a
    tool for scanning for mDNS/DNS-SD published services on the local
    network
@@ -383,32 +383,6 @@ an IGMP/MLD fast-leave port.
 [RFC3376]: https://www.rfc-editor.org/rfc/rfc3376.html
 [RFC3810]: https://www.rfc-editor.org/rfc/rfc3810.html

-#### Forwarding of IEEE Reserved Group Addresses
-
-Addresses in range `01:80:C2:00:00:0X` are used by various bridge
-signaling protocols, and are not forwarded by default. Still, it is
-sometimes useful to let the bridge forward such packets, and Infix
-supports this by specifying protocol names or the last address
-*nibble* as decimal value `0..15`.
-
-```
-admin@example:/config/> edit interface br0 bridge
-admin@example:/config/interface/br0/bridge/> set ieee-group-forward <?>
-  [0..15]  List of IEEE link-local protocols to forward, e.g., STP, LLDP
-  dot1x    802.1X Port-Based Network Access Control.
-  lacp     802.3 Slow Protocols, e.g., LACP.
-  lldp     802.1AB Link Layer Discovery Protocol (LLDP).
-  stp      Spanning Tree (STP/RSPT/MSTP).
-admin@example:/config/interface/br0/bridge/> set ieee-group-forward
-```
-
-The following example configures bridge *br0* to forward LLDP packets.
-
-```
-admin@example:/config/interface/br0/bridge/> set ieee-group-forward lldp
-admin@example:/config/interface/br0/bridge/>
-```
-
 ### VLAN Interfaces

 Creating a VLAN can be done in many ways. This section assumes VLAN
@@ -1037,38 +1011,6 @@ an Ethernet interface can be done as follows.
    admin@example:/config/routing/control-plane-protocol/ospfv2/name/default/ospf/area/0.0.0.0/interface/e0/> set interface-type point-to-point
    admin@example:/config/routing/control-plane-protocol/ospfv2/name/default/ospf/area/0.0.0.0/interface/e0/>

-#### OSPF global settings
-
-In addition to *area* and *interface* specific settings, OSPF provides
-global settings for route redistribution and OSPF router identifier.
-
-```
-admin@example:/config/> edit routing control-plane-protocol ospfv2 name default ospf
-admin@example:/config/routing/control-plane-protocol/ospfv2/name/default/ospf/> set ?
-  area                     List of OSPF areas.
-  default-route-advertise  Distribute default route to network
-  explicit-router-id       Defined in RFC 2328.  A 32-bit number
-  redistribute             Redistribute protocols into OSPF
-admin@example:/config/routing/control-plane-protocol/ospfv2/name/default/ospf/> set
-```
-
- Explicit router ID: By default the router will pick an IP address
-  from one of its OSPF interfaces as OSPF router ID. An explicit ID is
-  used to get a deterministic behavior, e.g., `set explicit-router-id
-  1.1.1.1`.
- Redistribution: `set redistribute static` and `set redistribute connected`
-  can be used to include static or connected routes into the OSPF routing
-  domain. These routes are redistributed as *external type-2* (E2)
-  routes.
- Advertising default route: An OSPF router can be made to distribute
-  a default route into the OSPF domain by command `set
-  default-route-advertise enabled`. This route is distributed as long
-  as the router itself has an *active* default route in its routing
-  table. By adding command `set default-route-advertise always` the
-  router will distribute a default route even when it lacks a default
-  route. The default route will be distributed as an *external type-2*
-  (E2) route.
-

 #### Debug OSPFv2

@@ -1,6 +1,6 @@
 #set DEBUG=1

-run name:bootstrap log:prio:user.notice norestart <usr/ixinit> \
+run name:bootstrap log:prio:user.notice norestart <usr/ixinit-done> \
 	[S] /usr/libexec/confd/bootstrap \
 	-- Bootstrapping YANG datastore

@@ -1 +1 @@
-service [S0123456789] <!usr/product,usr/led> iitod -- LED daemon
+service [S0123456789] <!pid/syslogd> iitod -- LED daemon
@@ -1,7 +1,7 @@
 From 4be3e500b670f7b98e3dd6696b8e51e83f122c65 Mon Sep 17 00:00:00 2001
 From: Christian Marangi <ansuelsmth@gmail.com>
 Date: Thu, 25 Jan 2024 21:36:59 +0100
-Subject: [PATCH 01/34] net: phy: add support for PHY LEDs polarity modes
+Subject: [PATCH 01/33] net: phy: add support for PHY LEDs polarity modes
 Organization: Addiva Elektronik

 Add support for PHY LEDs polarity modes. Some PHY require LED to be set
@@ -22,7 +22,6 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 Reviewed-by: Andrew Lunn <andrew@lunn.ch>
 Link: https://lore.kernel.org/r/20240125203702.4552-4-ansuelsmth@gmail.com
 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/phy/phy_device.c | 16 ++++++++++++++++
 include/linux/phy.h          | 22 ++++++++++++++++++++++
@@ -1,7 +1,7 @@
 From 4833b140cd11a57dd9f59754cdacfd71bc564c8f Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Mon, 4 Dec 2023 11:08:11 +0100
-Subject: [PATCH 02/34] net: mvmdio: Support setting the MDC frequency on XSMI
+Subject: [PATCH 02/33] net: mvmdio: Support setting the MDC frequency on XSMI
 controllers
 Organization: Addiva Elektronik

@@ -14,7 +14,6 @@ Reviewed-by: Andrew Lunn <andrew@lunn.ch>
 Tested-by: Andrew Lunn <andrew@lunn.ch>
 Link: https://lore.kernel.org/r/20231204100811.2708884-4-tobias@waldekranz.com
 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/ethernet/marvell/mvmdio.c | 44 +++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
@@ -1,7 +1,7 @@
 From 50a2973e8a520a82e9f9ec15a1f69e059ce7a334 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 14 Dec 2023 14:50:23 +0100
-Subject: [PATCH 03/34] net: dsa: mv88e6xxx: Create API to read a single stat
+Subject: [PATCH 03/33] net: dsa: mv88e6xxx: Create API to read a single stat
 counter
 Organization: Addiva Elektronik

@@ -16,7 +16,6 @@ Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
 Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
 Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/dsa/mv88e6xxx/chip.c | 162 ++++++++++++++++++-------------
 drivers/net/dsa/mv88e6xxx/chip.h |  27 +++---
@@ -1,7 +1,7 @@
 From 5916503e23e7f85796c1f927747e66b9535bac53 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 14 Dec 2023 14:50:25 +0100
-Subject: [PATCH 04/34] net: dsa: mv88e6xxx: Give each hw stat an ID
+Subject: [PATCH 04/33] net: dsa: mv88e6xxx: Give each hw stat an ID
 Organization: Addiva Elektronik

 With the upcoming standard counter group support, we are no longer
@@ -16,7 +16,6 @@ Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
 Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
 Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/dsa/mv88e6xxx/chip.c | 138 +++++++++++++++++--------------
 1 file changed, 75 insertions(+), 63 deletions(-)
@@ -1,7 +1,7 @@
 From 32dda6562734ec8ee667bc546f3ef56794d5bf82 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 14 Dec 2023 14:50:26 +0100
-Subject: [PATCH 05/34] net: dsa: mv88e6xxx: Add "eth-mac" counter group
+Subject: [PATCH 05/33] net: dsa: mv88e6xxx: Add "eth-mac" counter group
 support
 Organization: Addiva Elektronik

@@ -12,7 +12,6 @@ Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
 Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
 Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/dsa/mv88e6xxx/chip.c | 39 ++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
@@ -1,7 +1,7 @@
 From 36adbdd466ec550cab8b2ae54177f674c02cf631 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 14 Dec 2023 14:50:27 +0100
-Subject: [PATCH 06/34] net: dsa: mv88e6xxx: Limit histogram counters to
+Subject: [PATCH 06/33] net: dsa: mv88e6xxx: Limit histogram counters to
 ingress traffic
 Organization: Addiva Elektronik

@@ -27,7 +27,6 @@ Reviewed-by: Andrew Lunn <andrew@lunn.ch>
 Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
 Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/dsa/mv88e6xxx/chip.c    | 6 +++---
 drivers/net/dsa/mv88e6xxx/global1.c | 7 +++----
@@ -1,7 +1,7 @@
 From abfa532c1149525b128b8c76d80965f55e208240 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 14 Dec 2023 14:50:28 +0100
-Subject: [PATCH 07/34] net: dsa: mv88e6xxx: Add "rmon" counter group support
+Subject: [PATCH 07/33] net: dsa: mv88e6xxx: Add "rmon" counter group support
 Organization: Addiva Elektronik

 Report the applicable subset of an mv88e6xxx port's counters using
@@ -11,7 +11,6 @@ Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
 Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
 Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
 Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/dsa/mv88e6xxx/chip.c | 42 ++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
@@ -1,13 +1,11 @@
 From 4407b94b4a08536fccb6eea2826955ff12d63ec2 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 Nov 2023 19:44:32 +0100
-Subject: [PATCH 09/34] net: dsa: mv88e6xxx: Add LED infrastructure
+Subject: [PATCH 09/33] net: dsa: mv88e6xxx: Add LED infrastructure
 Organization: Addiva Elektronik

 Parse DT for LEDs and register them for devices that support it,
 though no actual implementations exist yet.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/dsa/mv88e6xxx/Makefile |   1 +
 drivers/net/dsa/mv88e6xxx/chip.c   |   5 +-
@@ -1,15 +1,13 @@
 From a5cf5c0353db07e74d7a29dd4d5c2cb7775d5bec Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 Nov 2023 21:59:35 +0100
-Subject: [PATCH 10/34] net: dsa: mv88e6xxx: Add LED support for 6393X
+Subject: [PATCH 10/33] net: dsa: mv88e6xxx: Add LED support for 6393X
 Organization: Addiva Elektronik

 Trigger support:
 - "none"
 - "timer"
 - "netdev"
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/dsa/mv88e6xxx/chip.c |   1 +
 drivers/net/dsa/mv88e6xxx/leds.c | 226 +++++++++++++++++++++++++++++++
@@ -1,15 +1,13 @@
 From be94ec851dbb8e55c3f5e82f197b2dc59566aea2 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Mar 2024 10:27:24 +0100
-Subject: [PATCH 11/34] net: dsa: mv88e6xxx: Fix timeout on waiting for PPU on
+Subject: [PATCH 11/33] net: dsa: mv88e6xxx: Fix timeout on waiting for PPU on
 6393X
 Organization: Addiva Elektronik

 In a multi-chip setup, delays of up to 750ms are observed before the
 device (6393X) signals completion of PPU initialization (Global 1,
 register 0, bit 15). Therefore, increase the timeout threshold to 1s.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/dsa/mv88e6xxx/chip.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
@@ -1,7 +1,7 @@
 From 69092f83541e6539ab82eec3052325c403675de4 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 16 Jan 2024 16:00:55 +0100
-Subject: [PATCH 12/34] net: dsa: Support MDB memberships whose L2 addresses
+Subject: [PATCH 12/33] net: dsa: Support MDB memberships whose L2 addresses
 overlap
 Organization: Addiva Elektronik

@@ -29,8 +29,6 @@ as long as the count is positive. Fortunately, all the infrastructure
 needed to do this is already in place, since it is also needed on CPU
 and DSA ports. Thus, "implement" this by simply removing the guards
 which previously skipped reference countung on user ports.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 net/dsa/switch.c | 16 ----------------
 1 file changed, 16 deletions(-)
@@ -1,7 +1,7 @@
 From 7c19df77212d0728874515e97cf297863a6ff2cd Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 19 Sep 2023 18:38:10 +0200
-Subject: [PATCH 13/34] net: phy: marvell10g: Support firmware loading on
+Subject: [PATCH 13/33] net: phy: marvell10g: Support firmware loading on
 88X3310
 Organization: Addiva Elektronik

@@ -11,8 +11,6 @@ its RAM, ask userspace for the binary and load it over XMDIO.
 We have no choice but to bail out of the probe if firmware is not
 available, as the device does not have any built-in image on which to
 fall back.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/phy/marvell10g.c | 161 +++++++++++++++++++++++++++++++++++
 1 file changed, 161 insertions(+)
@@ -1,15 +1,13 @@
 From 0c34b42b7a72ddf1af6f3534870d647801e493fa Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 21 Nov 2023 20:15:24 +0100
-Subject: [PATCH 14/34] net: phy: marvell10g: Fix power-up when strapped to
+Subject: [PATCH 14/33] net: phy: marvell10g: Fix power-up when strapped to
 start powered down
 Organization: Addiva Elektronik

 On devices which are hardware strapped to start powered down (PDSTATE
 == 1), make sure that we clear the power-down bit on all units
 affected by this setting.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/phy/marvell10g.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
@@ -1,7 +1,7 @@
 From 6576918d3348f8e20802379d568d7632228af4d7 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 15 Nov 2023 20:58:42 +0100
-Subject: [PATCH 15/34] net: phy: marvell10g: Add LED support for 88X3310
+Subject: [PATCH 15/33] net: phy: marvell10g: Add LED support for 88X3310
 Organization: Addiva Elektronik

 Pickup the LEDs from the state in which the hardware reset or
@@ -17,8 +17,6 @@ Trigger support:
 	   software blinking
 - "netdev": Offload link or duplex information to the solid behavior;
  	    tx and/or rx activity to blink behavior.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/phy/marvell10g.c | 422 +++++++++++++++++++++++++++++++++++
 1 file changed, 422 insertions(+)
@@ -1,7 +1,7 @@
 From 1ad7f010e46133c725df5cab4d85f71f689ca191 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 12 Dec 2023 09:51:05 +0100
-Subject: [PATCH 16/34] net: phy: marvell10g: Support LEDs tied to a single
+Subject: [PATCH 16/33] net: phy: marvell10g: Support LEDs tied to a single
 media side
 Organization: Addiva Elektronik

@@ -14,8 +14,6 @@ tied to a particular media side, and use that information to refine
 the offloading of the "netdev" trigger, such that LEDs attached to the
 RJ45 jack only lights up when a copper link is established, and vice
 versa for the SFP cage.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/phy/marvell10g.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)
@@ -1,7 +1,7 @@
 From 11b9a3e328241edede03b6615bb9b0f1a40b9b7d Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 24 Nov 2023 23:29:55 +0100
-Subject: [PATCH 17/34] nvmem: layouts: onie-tlv: Let device probe even when
+Subject: [PATCH 17/33] nvmem: layouts: onie-tlv: Let device probe even when
 TLV is invalid
 Organization: Addiva Elektronik

@@ -13,8 +13,6 @@ be successfully probed.

 Therefore, settle for reporting data corruption issues in the log, and
 simply refrain from registering any cells in those cases.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/nvmem/layouts/onie-tlv.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
@@ -1,7 +1,7 @@
 From ce1148b5c2e33541ad13ff2c4769d0b37d4e42b9 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 4 Mar 2024 16:47:28 +0100
-Subject: [PATCH 18/34] net: bridge: avoid classifying unknown multicast as
+Subject: [PATCH 18/33] net: bridge: avoid classifying unknown multicast as
 mrouters_only
 Organization: Addiva Elektronik

@@ -1,7 +1,7 @@
 From ce74ee8c5461cc53851ca323b4dfc9937cab0e41 Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Tue, 5 Mar 2024 06:44:41 +0100
-Subject: [PATCH 19/34] net: bridge: Ignore router ports when forwarding L2
+Subject: [PATCH 19/33] net: bridge: Ignore router ports when forwarding L2
 multicast
 Organization: Addiva Elektronik

@@ -1,10 +1,9 @@
 From 3c9b05198e0b7193f2dcddc1860cd77f0adbc3a2 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 21 Mar 2024 19:12:15 +0100
-Subject: [PATCH 20/34] net: dsa: Support EtherType based priority overrides
+Subject: [PATCH 20/33] net: dsa: Support EtherType based priority overrides
 Organization: Addiva Elektronik

-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 include/net/dsa.h |  4 ++++
 net/dsa/slave.c   | 56 +++++++++++++++++++++++++++++++++++++++++++++--
@@ -1,11 +1,10 @@
 From 333134a4ff2b8dd7fb00a75560254de96d1082ad Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Fri, 22 Mar 2024 16:15:43 +0100
-Subject: [PATCH 21/34] net: dsa: mv88e6xxx: Support EtherType based priority
+Subject: [PATCH 21/33] net: dsa: mv88e6xxx: Support EtherType based priority
 overrides
 Organization: Addiva Elektronik

-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/dsa/mv88e6xxx/chip.c    | 64 +++++++++++++++++++++++++++++
 drivers/net/dsa/mv88e6xxx/chip.h    | 21 ++++++++++
@@ -1,7 +1,7 @@
 From cdddc24c05cedc0d0fabc48da17ec26aeb7c1ef9 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 10:10:19 +0100
-Subject: [PATCH 22/34] net: phy: Do not resume PHY when attaching
+Subject: [PATCH 22/33] net: phy: Do not resume PHY when attaching
 Organization: Addiva Elektronik

 The PHY should not start negotiating with its link-partner until
@@ -15,8 +15,6 @@ Otherwise, drivers that attached to their PHYs during
 probing (e.g. DSA) would end up with a physical link being
 established, even though the corresponding interface was still
 administratively down.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/phy/phy_device.c | 1 -
 1 file changed, 1 deletion(-)
@@ -1,7 +1,7 @@
 From 1ec21a3fc54fb447501fd7edbf692b00a31fe3ec Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 27 Mar 2024 15:52:43 +0100
-Subject: [PATCH 23/34] net: dsa: mv88e6xxx: Improve indirect register access
+Subject: [PATCH 23/33] net: dsa: mv88e6xxx: Improve indirect register access
 perf on 6393
 Organization: Addiva Elektronik

@@ -13,8 +13,6 @@ previous families).
 Therefore, add a new set of SMI operations which remaps accesses to
 such registers to the corresponding directly addressable register. All
 other accesses use the regular indirect interface.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/dsa/mv88e6xxx/chip.c    |  7 +++
 drivers/net/dsa/mv88e6xxx/global1.h |  3 ++
@@ -1,7 +1,7 @@
 From 5d7be493dcaa75ee69d521043062389d7772f8dc Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Thu, 4 Apr 2024 16:36:30 +0200
-Subject: [PATCH 24/34] net: bridge: drop delay for applying strict multicast
+Subject: [PATCH 24/33] net: bridge: drop delay for applying strict multicast
 filtering
 Organization: Addiva Elektronik

@@ -1,7 +1,7 @@
 From 492a824661dbc188b5abeb7434b5cf67c2016415 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Mon, 22 Apr 2024 23:18:01 +0200
-Subject: [PATCH 25/34] net: dsa: mv88e6xxx: Honor ports being managed via
+Subject: [PATCH 25/33] net: dsa: mv88e6xxx: Honor ports being managed via
 in-band-status
 Organization: Addiva Elektronik

@@ -13,8 +13,6 @@ USXGMII autoneg)
 This state is the default set up by mv88e6xxx_port_setup_mac(), so all
 we have to do is to make the phylink MAC callbacks no-ops in cases
 when in-band-status is being used.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/dsa/mv88e6xxx/chip.c | 6 ++++++
 1 file changed, 6 insertions(+)
@@ -1,7 +1,7 @@
 From c9c9597a47b00b720f5223c83ab05bb89481eda8 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 24 Apr 2024 21:35:26 +0200
-Subject: [PATCH 26/34] net: dsa: mv88e6xxx: Fix port policy config on 6393X
+Subject: [PATCH 26/33] net: dsa: mv88e6xxx: Fix port policy config on 6393X
 Organization: Addiva Elektronik

 mv88e6393x_port_policy_{read,write} expect the `pointer` argument to
@@ -16,7 +16,6 @@ never enabled on DSA ports, which broke standalone port isolation in
 multichip switch trees made up of 6393X decices.

 Fixes: 6584b26020fc ("net: dsa: mv88e6xxx: implement .port_set_policy for Amethyst")
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/dsa/mv88e6xxx/port.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
@@ -1,7 +1,7 @@
 From 4ff224b5f5de1347a1f686aa85cb918a7db18879 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 24 Apr 2024 22:41:04 +0200
-Subject: [PATCH 27/34] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user
+Subject: [PATCH 27/33] net: dsa: mv88e6xxx: Limit rsvd2cpu policy to user
 ports on 6393X
 Organization: Addiva Elektronik

@@ -29,8 +29,6 @@ Before this change, due to rsvd2cpu being enabled on the CPU port, the
 switch would try to trap it back to the CPU. Given that the CPU is
 trusted, instead assume that it indeed meant for the packet to be
 forwarded like any other.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/dsa/mv88e6xxx/port.c | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)
@@ -1,7 +1,7 @@
 From f0d4beabe769fec594b309c3f1ebb79cfdbede8b Mon Sep 17 00:00:00 2001
 From: Joachim Wiberg <troglobit@gmail.com>
 Date: Mon, 29 Apr 2024 15:14:51 +0200
-Subject: [PATCH 28/34] usb: core: adjust log level for unauthorized devices
+Subject: [PATCH 28/33] usb: core: adjust log level for unauthorized devices
 Organization: Addiva Elektronik

 The fact that a USB device currently is not authorized is not an error,
@@ -1,7 +1,7 @@
 From 5f96d718c850084504c53ec0b8d9fcf75ea9996c Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 15 May 2024 13:50:58 +0200
-Subject: [PATCH 29/34] net: dsa: mv88e6xxx: Grab register lock during counter
+Subject: [PATCH 29/33] net: dsa: mv88e6xxx: Grab register lock during counter
 snapshotting
 Organization: Addiva Elektronik

@@ -9,8 +9,6 @@ This was missing for the standard counter groups. Since no caller
 already holds the lock, opt for pushing the locking down into
 mv88e6xxx_stats_snapshot() rather than having it duplicated at each
 call site.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/dsa/mv88e6xxx/chip.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
@@ -1,7 +1,7 @@
 From 6d4c436335003259cc02a0f015fd3d1d54e988a2 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Thu, 16 May 2024 14:51:54 +0200
-Subject: [PATCH 30/34] net: bridge: Differentiate MDB additions from
+Subject: [PATCH 30/33] net: bridge: Differentiate MDB additions from
 modifications
 Organization: Addiva Elektronik

@@ -21,8 +21,6 @@ generated.

 Therefore, discriminate new groups from changes to existing groups by
 introducing a RTM_SETMDB events to be used in the latter scenario.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 include/uapi/linux/rtnetlink.h | 2 ++
 net/bridge/br_mdb.c            | 4 ++--
@@ -1,7 +1,7 @@
 From c333c612688d5e974b95fcf4b04f185d7cf4f80d Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 28 May 2024 10:38:42 +0200
-Subject: [PATCH 31/34] net: dsa: tag_dsa: Use tag priority as initial
+Subject: [PATCH 31/33] net: dsa: tag_dsa: Use tag priority as initial
 skb->priority
 Organization: Addiva Elektronik

@@ -19,8 +19,6 @@ Ideally we could then map this priority to an internal one, like we
 can do with an "ingress-qos-map" on VLAN interfaces. Until that is
 implemented, support the setup that is likely to be the most common; a
 1:1 mapping from FPri to skb->priority.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 net/dsa/tag_dsa.c | 7 +++++++
 1 file changed, 7 insertions(+)
@@ -1,7 +1,7 @@
 From 18c025745fd8b8c9b3e688e9d78668a56cf71217 Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Tue, 28 May 2024 11:04:22 +0200
-Subject: [PATCH 32/34] net: dsa: mv88e6xxx: Add mqprio qdisc support
+Subject: [PATCH 32/33] net: dsa: mv88e6xxx: Add mqprio qdisc support
 Organization: Addiva Elektronik

 Add support for attaching mqprio qdisc's to mv88e6xxx ports and use
@@ -24,8 +24,6 @@ are effectively only specifying the QPri.
 Since FPri is always a 3-bit field, even on older chips with only 4
 physical queues, always report 8 queues and let the chip's policy
 handle the mapping down to the "real" number.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/dsa/mv88e6xxx/chip.c | 70 ++++++++++++++++++++++++++++++++
 net/dsa/tag_dsa.c                |  4 +-
@@ -1,7 +1,7 @@
 From f2d4ff12c7a0e644cbeac6675b755fb4a87b362a Mon Sep 17 00:00:00 2001
 From: Tobias Waldekranz <tobias@waldekranz.com>
 Date: Wed, 29 May 2024 13:20:41 +0200
-Subject: [PATCH 33/34] net: dsa: mv88e6xxx: Use VLAN prio over IP when both
+Subject: [PATCH 33/33] net: dsa: mv88e6xxx: Use VLAN prio over IP when both
 are available
 Organization: Addiva Elektronik

@@ -22,8 +22,6 @@ main reasons for choosing the new default:
   packet's priority. As the packet then moves through the network
   core over trusted VLAN trunks, the packet should keep its original
   priority, independent of what inner protocol fields may indicate.
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
 ---
 drivers/net/dsa/mv88e6xxx/chip.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
@@ -1,43 +0,0 @@
-From ceaaa4f44f9b3ec82c4e0a24c2322aae58fa3aa0 Mon Sep 17 00:00:00 2001
-From: Joachim Wiberg <troglobit@gmail.com>
-Date: Wed, 6 Nov 2024 15:39:33 +0100
-Subject: [PATCH 34/34] net: dsa: mb88e6xxx: use EOPNOTSUPP for unsupported
- flags
-Organization: Addiva Elektronik
-
-Make sure to return correct error code for unsupported flags, and
-propagate any error.
-
-Follow-up to a5cf5c0
-
-Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
- drivers/net/dsa/mv88e6xxx/leds.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/net/dsa/mv88e6xxx/leds.c b/drivers/net/dsa/mv88e6xxx/leds.c
-index b2a55d96b506..fe1ed3ed2a8a 100644
--- a/drivers/net/dsa/mv88e6xxx/leds.c
-+++ b/drivers/net/dsa/mv88e6xxx/leds.c
-@@ -99,7 +99,7 @@ static int mv88e6393x_led_flags_to_mode(struct mv88e6xxx_led *led, unsigned long
- 			return i;
- 	}
- 
-	return -EINVAL;
-+	return -EOPNOTSUPP;
- }
- 
- static int mv88e6393x_led_mode_to_flags(struct mv88e6xxx_led *led, u8 mode,
-@@ -216,6 +216,9 @@ static int mv88e6393x_led_hw_control_set(struct mv88e6xxx_led *led,
- {
- 	int mode = mv88e6393x_led_flags_to_mode(led, flags);
- 
-+	if (mode < 0)
-+		return mode;
-+
- 	return mv88e6393x_led_set(led, mode);
- }
- 
-- 
-2.43.0
-
@@ -1,23 +1,19 @@
 #!/bin/sh
 set -e

-if jq -e '.["usb-ports"]' /run/system.json > /dev/null; then
-    usb_ports=$(jq -r '.["usb-ports"] | map(.name) | unique | join(" ")' /run/system.json)
-else
-    usb_ports=""
-fi
+usb_ports=$(cat /run/system.json | jq -r '.["usb-ports"] | map(.name) | unique | join(" ")')

 gen_port()
 {
-    port="$1"
-    cat <<EOF
-{
-    "class": "infix-hardware:usb",
-    "name": "$port",
-    "state": {
-	"admin-state": "unlocked"
-    }
-}
+	local port="$1"
+	cat <<EOF
+    	{
+		"class": "infix-hardware:usb",
+		"name": "$port",
+		"state": {
+    			"admin-state": "unlocked"
+  			}
+    	}
 EOF
 }
 first=1
@@ -28,7 +24,7 @@ cat <<EOF
 EOF
 for port in $usb_ports; do
    if [ $first -eq 0 ]; then
-	echo -n ','
+       echo -n ','
    fi
    first=0;
    gen_port "$port"
@@ -46,211 +46,208 @@ with infamy.Test() as test:


    with test.step("Configure device"):
-        dut1.put_config_dicts(
-            {
-                "ietf-interfaces": {
-                    "interfaces": {
-                         "interface": [
+        dut1.put_config_dict("ietf-interfaces",
                             {
-                                 "name": d1send,
-                                 "enabled": True,
-                                 "bridge-port": {
-                                     "bridge": "br0",
-                                     "pvid": 55
-
-                                 }
-                             },
-                             {
-                                 "name": d1receiver,
-                                 "enabled": True,
-                                 "bridge-port": {
-                                     "bridge": "br0",
-                                     "pvid": 77
-                                 }
-                             },
-                             {
-                                 "name": d1trunk,
-                                 "enabled": True,
-                                 "bridge-port": {
-                                     "bridge": "br0"
-                                 }
-                             },
-                             {
-                                 "name": "vlan55",
-                                 "enabled": True,
-                                 "type": "infix-if-type:vlan",
-                                 "ipv4": {
-                                     "address": [
+                                 "interfaces": {
+                                     "interface": [
                                         {
-                                             "ip": "10.0.1.1",
-                                             "prefix-length": 24
-                                         }
-                                     ]
-                                 },
-                                 "vlan": {
-                                     "id": 55,
-                                     "lower-layer-if": "br0"
-                                 }
+                                             "name": d1send,
+                                             "enabled": True,
+                                             "bridge-port": {
+                                                 "bridge": "br0",
+                                                 "pvid": 55

-                             },
-                             {
-                                 "name": "vlan77",
-                                 "enabled": True,
-                                 "type": "infix-if-type:vlan",
-                                 "ipv4": {
-                                     "address": [
+                                             }
+                                         },
                                         {
-                                             "ip": "10.0.2.1",
-                                             "prefix-length": 24
-                                         }
-                                     ]
-                                 },
-                                 "vlan": {
-                                     "id": 77,
-                                     "lower-layer-if": "br0"
-                                 }
-
-                             },
-                             {
-                                 "name": "br0",
-                                 "enabled": True,
-                                 "type": "infix-if-type:bridge",
-
-                                 "bridge": {
-                                     "vlans": {
-                                         "vlan": [
-                                             {
-                                                 "vid": 55,
-                                                 "untagged": [ d1send ],
-                                                 "tagged": [ d1trunk, "br0" ],
-                                                 "multicast": {
-                                                     "snooping": True
-                                                 }
+                                             "name": d1receiver,
+                                             "enabled": True,
+                                             "bridge-port": {
+                                                 "bridge": "br0",
+                                                 "pvid": 77
+                                             }
+                                         },
+                                         {
+                                             "name": d1trunk,
+                                             "enabled": True,
+                                             "bridge-port": {
+                                                 "bridge": "br0"
+                                             }
+                                         },
+                                         {
+                                             "name": "vlan55",
+                                             "enabled": True,
+                                             "type": "infix-if-type:vlan",
+                                             "ipv4": {
+                                                 "address": [
+                                                     {
+                                                         "ip": "10.0.1.1",
+                                                         "prefix-length": 24
+                                                     }
+                                                 ]
                                             },
-                                             {
-                                                 "vid": 77,
-                                                 "untagged": [ d1receiver ],
-                                                 "tagged": [ d1trunk, "br0" ],
-                                                 "multicast": {
-                                                     "snooping": True
+                                             "vlan": {
+                                                 "id": 55,
+                                                 "lower-layer-if": "br0"
+                                             }
+
+                                         },
+                                         {
+                                             "name": "vlan77",
+                                             "enabled": True,
+                                             "type": "infix-if-type:vlan",
+                                             "ipv4": {
+                                                 "address": [
+                                                     {
+                                                         "ip": "10.0.2.1",
+                                                         "prefix-length": 24
+                                                     }
+                                                 ]
+                                             },
+                                             "vlan": {
+                                                 "id": 77,
+                                                 "lower-layer-if": "br0"
+                                             }
+
+                                         },
+                                         {
+                                             "name": "br0",
+                                             "enabled": True,
+                                             "type": "infix-if-type:bridge",
+
+                                             "bridge": {
+                                                 "vlans": {
+                                                     "vlan": [
+                                                         {
+                                                             "vid": 55,
+                                                             "untagged": [ d1send ],
+                                                             "tagged": [ d1trunk, "br0" ],
+                                                             "multicast": {
+                                                                 "snooping": True
+                                                             }
+                                                         },
+                                                         {
+                                                             "vid": 77,
+                                                             "untagged": [ d1receiver ],
+                                                             "tagged": [ d1trunk, "br0" ],
+                                                             "multicast": {
+                                                                 "snooping": True
+                                                             }
+                                                         }
+                                                     ]
                                                 }
                                             }
-                                         ]
-                                     }
+                                         }
+                                     ]
+
                                 }
-                             }
-                         ]
-                     }
-                },
-                "ietf-system": {
-                    "system": {
-                        "hostname": "dut1"
-                    }
-                }
+                             })
+        dut1.put_config_dict("ietf-system", {
+            "system": {
+                "hostname": "dut1"
            }
-        )
-
-        dut2.put_config_dicts(
-            {
-                "ietf-interfaces": {
-                    "interfaces": {
-                        "interface": [
-                            {
-                                 "name": d2receive,
-                                 "enabled": True,
-                                 "bridge-port": {
-                                     "bridge": "br0",
-                                     "pvid": 55
-                                 }
-                             },
+        })
+        dut2.put_config_dict("ietf-interfaces",
                             {
-                                 "name": d2sender,
-                                 "enabled": True,
-                                 "bridge-port": {
-                                     "bridge": "br0",
-                                     "pvid": 77
-                                 }
-                             },
-                             {
-                                 "name": d2trunk,
-                                 "enabled": True,
-                                 "bridge-port": {
-                                     "bridge": "br0"
-                                 }
-                             },
-                             {
-                                 "name": "vlan55",
-                                 "enabled": True,
-                                 "type": "infix-if-type:vlan",
-                                 "ipv4": {
-                                     "address": [
+                                 "interfaces": {
+                                    "interface": [
+                                        {
+                                             "name": d2receive,
+                                             "enabled": True,
+                                             "bridge-port": {
+                                                 "bridge": "br0",
+                                                 "pvid": 55
+                                             }
+                                         },
                                         {
-                                             "ip": "10.0.1.2",
-                                             "prefix-length": 24
-                                         }
-                                     ]
-                                 },
-                                 "vlan": {
-                                     "id": 55,
-                                     "lower-layer-if": "br0"
-                                 }
-
-                             },
-                             {
-                                 "name": "vlan77",
-                                 "enabled": True,
-                                 "type": "infix-if-type:vlan",
-                                 "ipv4": {
-                                     "address": [
+                                             "name": d2sender,
+                                             "enabled": True,
+                                             "bridge-port": {
+                                                 "bridge": "br0",
+                                                 "pvid": 77
+                                             }
+                                         },
                                         {
-                                             "ip": "10.0.2.2",
-                                             "prefix-length": 24
-                                         }
-                                     ]
-                                 },
-                                 "vlan": {
-                                     "id": 77,
-                                     "lower-layer-if": "br0"
-                                 }
-
-                             },
-                             {
-                                 "name": "br0",
-                                 "enabled": True,
-                                 "type": "infix-if-type:bridge",
-
-                                 "bridge": {
-                                     "vlans": {
-                                         "vlan": [
-                                             {
-                                                 "vid": 55,
-                                                 "untagged": [ d2receive ],
-                                                 "tagged": [ d2trunk, "br0" ],
-                                                 "multicast": {
-                                                     "snooping": True
-                                                 }
+                                             "name": d2trunk,
+                                             "enabled": True,
+                                             "bridge-port": {
+                                                 "bridge": "br0"
+                                             }
+                                         },
+                                         {
+                                             "name": "vlan55",
+                                             "enabled": True,
+                                             "type": "infix-if-type:vlan",
+                                             "ipv4": {
+                                                 "address": [
+                                                     {
+                                                         "ip": "10.0.1.2",
+                                                         "prefix-length": 24
+                                                     }
+                                                 ]
                                             },
-                                             {
-                                                 "vid": 77,
-                                                 "untagged": [ d2sender ],
-                                                 "tagged": [ d2trunk, "br0" ],
-                                                 "multicast": {
-                                                     "snooping": True
+                                             "vlan": {
+                                                 "id": 55,
+                                                 "lower-layer-if": "br0"
+                                             }
+
+                                         },
+                                         {
+                                             "name": "vlan77",
+                                             "enabled": True,
+                                             "type": "infix-if-type:vlan",
+                                             "ipv4": {
+                                                 "address": [
+                                                     {
+                                                         "ip": "10.0.2.2",
+                                                         "prefix-length": 24
+                                                     }
+                                                 ]
+                                             },
+                                             "vlan": {
+                                                 "id": 77,
+                                                 "lower-layer-if": "br0"
+                                             }
+
+                                         },
+                                         {
+                                             "name": "br0",
+                                             "enabled": True,
+                                             "type": "infix-if-type:bridge",
+
+                                             "bridge": {
+                                                 "vlans": {
+                                                     "vlan": [
+                                                         {
+                                                             "vid": 55,
+                                                             "untagged": [ d2receive ],
+                                                             "tagged": [ d2trunk, "br0" ],
+                                                             "multicast": {
+                                                                 "snooping": True
+                                                             }
+                                                         },
+                                                         {
+                                                             "vid": 77,
+                                                             "untagged": [ d2sender ],
+                                                             "tagged": [ d2trunk, "br0" ],
+                                                             "multicast": {
+                                                                 "snooping": True
+                                                             }
+                                                         }
+                                                     ]
                                                 }
                                             }
-                                         ]
-                                     }
+                                         }
+                                     ]
+
                                 }
-                             }
-                        ]
-                    }
-                },
-                "ietf-system": {
-                    "system": {
-                        "hostname": "dut2"
-                    }
-                }
-            })
+                        })
+
+        dut2.put_config_dict("ietf-system", {
+            "system": {
+                "hostname": "dut2"
+            }
+        })

    with infamy.IsolatedMacVlan(hsendd1) as d1send_ns, \
         infamy.IsolatedMacVlan(hreceived1) as d1receive_ns, \
@@ -161,8 +161,8 @@ with infamy.Test() as test:

    with test.step("Wait for R1 and R2 to peer"):
        print("Waiting for R1 and R2 to peer")
-        until(lambda: route.ipv4_route_exist(R1, "192.168.20.0/24", "192.168.100.2", proto="ietf-ospf:ospfv2"), attempts=200)
-        until(lambda: route.ipv4_route_exist(R2, "192.168.10.0/24", "192.168.100.1", proto="ietf-ospf:ospfv2"), attempts=200)
+        until(lambda: route.ipv4_route_exist(R1, "192.168.20.0/24", proto="ietf-ospf:ospfv2"), attempts=200)
+        until(lambda: route.ipv4_route_exist(R2, "192.168.10.0/24", proto="ietf-ospf:ospfv2"), attempts=200)

    with test.step("Verify connectivity from PC:src to PC:dst via fast link"):
        h1net.must_reach("192.168.20.2")
@@ -54,8 +54,7 @@ import infamy
 import infamy.route as route
 from infamy.util import until, parallel
 def config_target1(target, ring1, ring2, cross):
-    target.put_config_dicts({
-        "ietf-interfaces": {
+    target.put_config_dict("ietf-interfaces", {
            "interfaces": {
                "interface": [
                    {
@@ -66,8 +65,7 @@ def config_target1(target, ring1, ring2, cross):
                            "address": [{
                                "ip": "10.0.12.1",
                                "prefix-length": 30
-                            }]
-                        }
+                            }]}
                    },
                    {
                        "name": ring2,
@@ -77,8 +75,7 @@ def config_target1(target, ring1, ring2, cross):
                            "address": [{
                                "ip": "10.0.41.2",
                                "prefix-length": 30
-                            }]
-                        }
+                            }]}
                    },
                    {
                        "name": cross,
@@ -95,103 +92,93 @@ def config_target1(target, ring1, ring2, cross):
                        "name": "lo",
                        "enabled": True,
                        "ipv4": {
-                            "address": [
-                                {
+                            "address": [{
                                    "ip": "11.0.8.1",
                                    "prefix-length": 24
-                                },
-                                {
-                                    "ip": "10.0.0.1",
-                                    "prefix-length": 32
-                                }
-                            ]
+                            },
+                            {
+                                "ip": "10.0.0.1",
+                                "prefix-length": 32
+                           }]
                        }
                    }
                ]
            }
-        },
-        "ietf-routing": {
-            "routing": {
-                "control-plane-protocols": {
-                    "control-plane-protocol": [
-                        {
-                            "type": "infix-routing:ospfv2",
-                            "name": "default",
-                            "ospf": {
-                                "explicit-router-id": "10.0.0.1",
-                                "areas": {
-                                    "area": [
-                                        {
-                                            "area-id": "0.0.0.0",
-                                            "interfaces": {
-                                                "interface": [
-                                                    {
-                                                        "bfd": {
-                                                            "enabled": True
-                                                        },
-                                                        "name": ring1,
-                                                        "hello-interval": 1,
-                                                        "enabled": True
-                                                    }
-                                                ]
-                                            }
+    })
+
+    target.put_config_dict("ietf-routing", {
+        "routing": {
+            "control-plane-protocols": {
+                "control-plane-protocol": [{
+                    "type": "infix-routing:ospfv2",
+                    "name": "default",
+                    "ospf": {
+                        "explicit-router-id": "10.0.0.1",
+                        "areas": {
+                            "area": [{
+                                "area-id": "0.0.0.0",
+                                "interfaces":
+                                {
+                                    "interface": [{
+                                        "bfd": {
+                                            "enabled": True
                                        },
-                                        {
-                                            "area-id": "0.0.0.1",
-                                            "area-type": "nssa-area",
-                                            "summary": False,
-                                            "interfaces": {
-                                                "interface": [
-                                                    {
-                                                        "bfd": {
-                                                            "enabled": True
-                                                        },
-                                                        "name": cross,
-                                                        "hello-interval": 1,
-                                                        "enabled": True,
-                                                        "cost": 2000
-                                                    },
-                                                    {
-                                                        "name": "lo",
-                                                        "enabled": True
-                                                    }
-                                                ]
-                                            }
-                                        },
-                                        {
-                                            "area-id": "0.0.0.2",
-                                            "interfaces": {
-                                                "interface": [
-                                                    {
-                                                        "bfd": {
-                                                            "enabled": True
-                                                        },
-                                                        "name": ring2,
-                                                        "hello-interval": 1,
-                                                        "enabled": True,
-                                                        "interface-type": "point-to-point"
-                                                    }
-                                                ]
-                                            }
-                                        }
-                                    ]
+                                        "name": ring1,
+                                        "hello-interval": 1,
+                                        "enabled": True
+                                    }]
                                }
-                            }
+                            },{
+                            "area-id": "0.0.0.1",
+                            "area-type": "nssa-area",
+                            "summary": False,
+                            "interfaces":
+                                {
+                                    "interface": [{
+                                        "bfd": {
+                                            "enabled": True
+                                        },
+                                        "name": cross,
+                                        "hello-interval": 1,
+                                        "enabled": True,
+                                        "cost": 2000
+                                    },
+                                    {
+                                        "name": "lo",
+                                        "enabled": True
+                                    }]
+
+                                }
+                            },{
+                                "area-id": "0.0.0.2",
+                                "interfaces":
+                                {
+                                    "interface": [{
+                                        "bfd": {
+                                            "enabled": True
+                                        },
+                                        "name": ring2,
+                                        "hello-interval": 1,
+                                        "enabled": True,
+                                        "interface-type": "point-to-point"
+                                    }]
+                                }
+                            }]
                        }
-                    ]
-                }
-            }
-        },
-        "ietf-system": {
-            "system": {
-                "hostname": "R1"
+                    }
+
+                }]
            }
        }
    })
+    target.put_config_dict("ietf-system", {
+            "system": {
+                "hostname": "R1"
+            }
+        })

 def config_target2(target, ring1, ring2, cross):
-    target.put_config_dicts({
-        "ietf-interfaces": {
+    target.put_config_dict("ietf-interfaces", {
            "interfaces": {
                "interface": [
                    {
@@ -202,8 +189,7 @@ def config_target2(target, ring1, ring2, cross):
                            "address": [{
                                "ip": "10.0.23.1",
                                "prefix-length": 30
-                            }]
-                        }
+                            }]}
                    },
                    {
                        "name": ring2,
@@ -213,8 +199,7 @@ def config_target2(target, ring1, ring2, cross):
                            "address": [{
                                "ip": "10.0.12.2",
                                "prefix-length": 30
-                            }]
-                        }
+                            }]}
                    },
                    {
                        "name": cross,
@@ -224,238 +209,212 @@ def config_target2(target, ring1, ring2, cross):
                            "address": [{
                                "ip": "10.0.24.1",
                                "prefix-length": 30
-                            }]
-                        }
+                            }]}
                    },
                    {
                        "name": "lo",
                        "enabled": True,
                        "ipv4": {
-                            "address": [
-                                {
-                                    "ip": "10.0.0.2",
-                                    "prefix-length": 32
-                                },
-                                {
-                                    "ip": "11.0.9.1",
-                                    "prefix-length": 24
-                                },
-                                {
-                                    "ip": "11.0.10.1",
-                                    "prefix-length": 24
-                                },
-                                {
-                                    "ip": "11.0.11.1",
-                                    "prefix-length": 24
-                                },
-                                {
-                                    "ip": "11.0.12.1",
-                                    "prefix-length": 24
-                                },
-                                {
-                                    "ip": "11.0.13.1",
-                                    "prefix-length": 24
-                                },
-                                {
-                                    "ip": "11.0.14.1",
-                                    "prefix-length": 24
-                                },
-                                {
-                                    "ip": "11.0.15.1",
-                                    "prefix-length": 24
-                                }
-                            ]
+                            "address": [{
+                                "ip": "10.0.0.2",
+                                "prefix-length": 32
+                            }, {
+                                "ip": "11.0.9.1",
+                                "prefix-length": 24
+                            }, {
+                                "ip": "11.0.10.1",
+                                "prefix-length": 24
+                            }, {
+                                "ip": "11.0.11.1",
+                                "prefix-length": 24
+                            }, {
+                                "ip": "11.0.12.1",
+                                "prefix-length": 24
+                            }, {
+                                "ip": "11.0.13.1",
+                                "prefix-length": 24
+                            }, {
+                                "ip": "11.0.14.1",
+                                "prefix-length": 24
+                            }, {
+                                "ip": "11.0.15.1",
+                                "prefix-length": 24
+                            }]
                        }
                    }
                ]
            }
-        },
-        "ietf-system": {
+        })
+    target.put_config_dict("ietf-system", {
            "system": {
                "hostname": "R2"
            }
-        },
-        "ietf-routing": {
-            "routing": {
-                "control-plane-protocols": {
-                    "control-plane-protocol": [
-                        {
-                            "type": "infix-routing:ospfv2",
-                            "name": "default",
-                            "ospf": {
-                                "explicit-router-id": "1.1.1.1",
-                                "areas": {
-                                    "area": [
-                                        {
-                                            "area-id": "0.0.0.0",
-                                            "interfaces": {
-                                                "interface": [
-                                                    {
-                                                        "bfd": {
-                                                            "enabled": True
-                                                        },
-                                                        "name": ring2,
-                                                        "hello-interval": 1,
-                                                        "enabled": True
-                                                    },
-                                                    {
-                                                        "name": "lo",
-                                                        "enabled": True
-                                                    }
-                                                ]
-                                            }
+        })
+
+    target.put_config_dict("ietf-routing", {
+        "routing": {
+            "control-plane-protocols": {
+                "control-plane-protocol": [{
+                    "type": "infix-routing:ospfv2",
+                    "name": "default",
+                    "ospf": {
+                        "explicit-router-id": "1.1.1.1",
+                        "areas": {
+                            "area": [{
+                                "area-id": "0.0.0.0",
+                                "interfaces": {
+                                    "interface": [{
+                                        "bfd": {
+                                            "enabled": True
                                        },
-                                        {
-                                            "area-id": "0.0.0.1",
-                                            "area-type": "nssa-area",
-                                            "summary": False,
-                                            "interfaces": {
-                                                "interface": [
-                                                    {
-                                                        "bfd": {
-                                                            "enabled": True
-                                                        },
-                                                        "name": ring1,
-                                                        "hello-interval": 1,
-                                                        "enabled": True
-                                                    }
-                                                ]
-                                            }
-                                        },
-                                        {
-                                            "area-id": "0.0.0.2",
-                                            "interfaces": {
-                                                "interface": [
-                                                    {
-                                                        "bfd": {
-                                                            "enabled": True
-                                                        },
-                                                        "name": cross,
-                                                        "hello-interval": 1,
-                                                        "cost": 2000,
-                                                        "enabled": True
-                                                    }
-                                                ]
-                                            }
-                                        }
-                                    ]
+                                        "name": ring2,
+                                        "hello-interval": 1,
+                                        "enabled": True
+                                    }, {
+                                        "name": "lo",
+                                        "enabled": True
+                                    }]
                                }
-                            }
+                            }, {
+                                "area-id": "0.0.0.1",
+                                "area-type": "nssa-area",
+                                "summary": False,
+                                "interfaces": {
+                                    "interface": [{
+                                        "bfd": {
+                                            "enabled": True
+                                        },
+                                        "name": ring1,
+                                        "hello-interval": 1,
+                                    }]
+                                }
+                            }, {
+                                "area-id": "0.0.0.2",
+                                "interfaces": {
+                                    "interface": [{
+                                        "bfd": {
+                                            "enabled": True
+                                        },
+                                        "name": cross,
+                                        "hello-interval": 1,
+                                        "cost": 2000
+                                    }]
+                                }
+                            }]
                        }
-                    ]
-                }
+                    }
+                }]
            }
        }
    })

+
 def config_target3(target, ring2, cross, link):
-    target.put_config_dicts({
-        "ietf-interfaces": {
-            "interfaces": {
-                "interface": [
-                    {
-                        "name": ring2,
-                        "enabled": True,
-                        "ipv4": {
-                            "forwarding": True,
-                            "address": [{
-                                "ip": "10.0.23.2",
-                                "prefix-length": 30
-                                }]
-                            }
-                    },
-                    {
-                        "name": link,
-                        "enabled": True,
-                        "ipv4": {
-                            "forwarding": True,
-                            "address": [{
-                                "ip": "192.168.3.1",
-                                "prefix-length": 24
+    target.put_config_dict("ietf-interfaces", {
+        "interfaces": {
+            "interface": [
+                {
+                    "name": ring2,
+                    "enabled": True,
+                    "ipv4": {
+                        "forwarding": True,
+                        "address": [{
+                            "ip": "10.0.23.2",
+                            "prefix-length": 30
                            }]
                        }
-                    },
-                    {
-                        "name": cross,
-                        "enabled": True,
-                        "ipv4": {
-                            "forwarding": True,
-                            "address": [{
-                                "ip": "10.0.13.2",
-                                "prefix-length": 30
-                            }]
-                        }
-                    },
-                    {
-                        "name": "lo",
-                        "enabled": True,
-                        "ipv4": {
-                            "address": [{
-                                "ip": "10.0.0.3",
-                                "prefix-length": 32
-                            }]
-                        }
-                        }
-                    ]
-                }
-        },
-        "ietf-system": {
-                "system": {
-                    "hostname": "R3"
-                }
-        },
-        "ietf-routing": {
-            "routing": {
-                "control-plane-protocols": {
-                    "control-plane-protocol": [{
-                        "type": "infix-routing:ospfv2",
-                        "name": "default",
-                        "ospf": {
-                            "explicit-router-id": "10.0.0.3",
-                            "areas": {
-                                "area": [{
-                                    "area-id": "0.0.0.1",
-                                    "area-type": "nssa-area",
-                                    "summary": False,
-                                    "interfaces": {
-                                        "interface": [{
-                                            "bfd": {
-                                                "enabled": True
-                                            },
-                                            "name": cross,
-                                            "hello-interval": 1,
-                                            "enabled": True,
-                                            "cost": 2000
-                                        }, {
-                                            "bfd": {
-                                                "enabled": True
-                                            },
-                                            "name": ring2,
-                                            "hello-interval": 1,
+                },
+                {
+                    "name": link,
+                    "enabled": True,
+                    "ipv4": {
+                        "forwarding": True,
+                        "address": [{
+                            "ip": "192.168.3.1",
+                            "prefix-length": 24
+                        }]
+                    }
+                },
+                {
+                    "name": cross,
+                    "enabled": True,
+                    "ipv4": {
+                        "forwarding": True,
+                        "address": [{
+                            "ip": "10.0.13.2",
+                            "prefix-length": 30
+                        }]
+                    }
+                },
+                {
+                    "name": "lo",
+                    "enabled": True,
+                    "ipv4": {
+                        "address": [{
+                            "ip": "10.0.0.3",
+                            "prefix-length": 32
+                        }]
+                    }
+                    }
+                ]
+            }
+    })
+
+    target.put_config_dict("ietf-system", {
+            "system": {
+                "hostname": "R3"
+            }
+        })
+
+    target.put_config_dict("ietf-routing", {
+        "routing": {
+            "control-plane-protocols": {
+                "control-plane-protocol": [{
+                    "type": "infix-routing:ospfv2",
+                    "name": "default",
+                    "ospf": {
+                        "areas": {
+                            "area": [{
+                                "area-id": "0.0.0.1",
+                                "area-type": "nssa-area",
+                                "summary": False,
+                                "interfaces": {
+                                    "interface": [{
+                                        "bfd": {
                                            "enabled": True
-                                        }, {
-                                            "name": link,
-                                            "enabled": True,
-                                            "passive": True
-                                        }, {
-                                            "name": "lo",
+                                        },
+                                        "name": cross,
+                                        "hello-interval": 1,
+                                        "enabled": True,
+                                        "cost": 2000
+                                    }, {
+                                        "bfd": {
                                            "enabled": True
-                                        }]
-                                    }
-                                }]
-                            }
+                                        },
+                                        "name": ring2,
+                                        "hello-interval": 1,
+                                        "enabled": True
+                                    }, {
+                                        "name": link,
+                                        "enabled": True,
+                                        "passive": True
+                                    }, {
+                                        "name": "lo",
+                                        "enabled": True
+                                    }]
+                                }
+                            }]
                        }
-                    }]
-                }
+                    }
+                }]
            }
        }
    })


 def config_target4(target, ring1, cross, link):
-    target.put_config_dicts({
-        "ietf-interfaces": {
-            "interfaces": {
+    target.put_config_dict("ietf-interfaces", {
+        "interfaces": {
                "interface": [
                    {
                        "name": ring1,
@@ -500,57 +459,57 @@ def config_target4(target, ring1, cross, link):
                    }
                ]
            }
-        },
-        "ietf-system": {
-            "system": {
-                "hostname": "R4"
-            }
-        },
-        "ietf-routing": {
-            "routing": {
-                "control-plane-protocols": {
-                    "control-plane-protocol": [
-                        {
-                            "type": "infix-routing:ospfv2",
-                            "name": "default",
-                            "ospf": {
-                                "explicit-router-id": "10.0.0.4",
-                                "redistribute": {
-                                    "redistribute": [{
-                                            "protocol": "connected"
-                                        }]
-                                },
-                                "areas": {
-                                    "area": [{
-                                        "area-id": "0.0.0.2",
-                                        "interfaces": {
-                                            "interface": [{
-                                                "bfd": {
-                                                    "enabled": True
-                                                },
-                                                "name": ring1,
-                                                "hello-interval": 1,
-                                                "enabled": True,
-                                                "interface-type": "point-to-point"
-                                            }, {
-                                                "bfd": {
-                                                    "enabled": True
-                                                },
-                                                "name": cross,
-                                                "hello-interval": 1,
-                                                "enabled": True,
-                                                "cost": 5000
-                                            }, {
-                                                "name": "lo",
-                                                "enabled": True
-                                            }]
-                                        }
+        })
+
+    target.put_config_dict("ietf-system", {
+        "system": {
+            "hostname": "R4"
+        }
+    })
+
+    target.put_config_dict("ietf-routing", {
+        "routing": {
+            "control-plane-protocols": {
+                "control-plane-protocol": [
+                    {
+                        "type": "infix-routing:ospfv2",
+                        "name": "default",
+                        "ospf": {
+                            "redistribute": {
+                                "redistribute": [{
+                                        "protocol": "connected"
                                    }]
-                                }
+                            },
+                            "areas": {
+                                "area": [{
+                                    "area-id": "0.0.0.2",
+                                    "interfaces": {
+                                        "interface": [{
+                                            "bfd": {
+                                                "enabled": True
+                                            },
+                                            "name": ring1,
+                                            "hello-interval": 1,
+                                            "enabled": True,
+                                            "interface-type": "point-to-point"
+                                        }, {
+                                            "bfd": {
+                                                "enabled": True
+                                            },
+                                            "name": cross,
+                                            "hello-interval": 1,
+                                            "enabled": True,
+                                            "cost": 5000
+                                        }, {
+                                            "name": "lo",
+                                            "enabled": True
+                                        }]
+                                    }
+                                }]
                            }
                        }
-                    ]
-                }
+                    }
+                ]
            }
        }
    })
@@ -27,99 +27,96 @@ from infamy.util import until, parallel


 def config_target1(target, data, link):
-    target.put_config_dicts({
-        "ietf-interfaces": {
-            "interfaces": {
-                "interface": [
-                    {
-                        "name": data,
-                        "enabled": True,
-                        "ipv4": {
-                            "forwarding": True,
-                            "address": [{
-                                "ip": "192.168.10.1",
-                                "prefix-length": 24
-                            }]},
-                        "ipv6": {
-                            "forwarding": True,
-                            "address": [{
-                                "ip": "2001:db8:3c4d:10::1",
-                                "prefix-length": 64
-                            }]
-                        }
+    target.put_config_dict("ietf-interfaces", {
+        "interfaces": {
+            "interface": [
+                {
+                    "name": data,
+                    "enabled": True,
+                    "ipv4": {
+                        "forwarding": True,
+                        "address": [{
+                            "ip": "192.168.10.1",
+                            "prefix-length": 24
+                        }]},
+                    "ipv6": {
+                        "forwarding": True,
+                        "address": [{
+                            "ip": "2001:db8:3c4d:10::1",
+                            "prefix-length": 64
+                        }]
+                    }
+                },
+                {
+                    "name": link,
+                    "enabled": True,
+                    "ipv4": {
+                        "forwarding": True,
+                        "address": [{
+                            "ip": "192.168.50.1",
+                            "prefix-length": 24
+                        }]
                    },
-                    {
-                        "name": link,
-                        "enabled": True,
-                        "ipv4": {
-                            "forwarding": True,
-                            "address": [{
-                                "ip": "192.168.50.1",
-                                "prefix-length": 24
-                            }]
-                        },
-                        "ipv6": {
-                            "forwarding": True,
-                            "address": [{
-                                "ip": "2001:db8:3c4d:50::1",
-                                "prefix-length": 64
-                            }]
-                        }
+                    "ipv6": {
+                        "forwarding": True,
+                        "address": [{
+                            "ip": "2001:db8:3c4d:50::1",
+                            "prefix-length": 64
+                        }]
+                    }
+                },
+                {
+                    "name": "lo",
+                    "enabled": True,
+                    "ipv4": {
+                        "address": [{
+                            "ip": "192.168.100.1",
+                            "prefix-length": 32
+                        }]
                    },
-                    {
-                        "name": "lo",
-                        "enabled": True,
-                        "ipv4": {
-                            "address": [{
-                                "ip": "192.168.100.1",
-                                "prefix-length": 32
-                            }]
-                        },
-                        "ipv6": {
-                            "address": [{
-                                "ip": "2001:db8:3c4d:100::1",
-                                "prefix-length": 128
-                            }]
-                        }
+                    "ipv6": {
+                        "address": [{
+                            "ip": "2001:db8:3c4d:100::1",
+                            "prefix-length": 128
+                        }]
+                    }

+                    }
+            ]
+        }
+    })
+    target.put_config_dict("ietf-routing", {
+        "routing": {
+            "control-plane-protocols": {
+                "control-plane-protocol": [{
+                    "type": "infix-routing:static",
+                    "name": "default",
+                    "static-routes": {
+                        "ipv4": {
+                            "route": [{
+                                "destination-prefix": "192.168.200.1/32",
+                                "next-hop": {
+                                    "next-hop-address": "192.168.50.2"
+                                }
+                            }]
+                        },
+                        "ipv6": {
+                            "route": [{
+                                "destination-prefix": "2001:db8:3c4d:200::1/128",
+                                "next-hop": {
+                                    "next-hop-address": "2001:db8:3c4d:50::2"
+                                }
+                            }]
                        }
-                ]
-            }
-        },
-        "ietf-routing": {
-            "routing": {
-                "control-plane-protocols": {
-                    "control-plane-protocol": [{
-                        "type": "infix-routing:static",
-                        "name": "default",
-                        "static-routes": {
-                            "ipv4": {
-                                "route": [{
-                                    "destination-prefix": "192.168.200.1/32",
-                                    "next-hop": {
-                                        "next-hop-address": "192.168.50.2"
-                                    }
-                                }]
-                            },
-                            "ipv6": {
-                                "route": [{
-                                    "destination-prefix": "2001:db8:3c4d:200::1/128",
-                                    "next-hop": {
-                                        "next-hop-address": "2001:db8:3c4d:50::2"
-                                    }
-                                }]
-                            }
-                        }
-                    }]
-                }
+                    }
+                }]
            }
        }
    })


 def config_target2(target, link):
-    target.put_config_dicts({
-        "ietf-interfaces": {
+    target.put_config_dict("ietf-interfaces", {
            "interfaces": {
                "interface": [
                    {
@@ -160,33 +157,33 @@ def config_target2(target, link):
                    }
                ]
            }
-        },
-        "ietf-routing": {
-            "routing": {
-                "control-plane-protocols": {
-                    "control-plane-protocol": [{
-                        "type": "infix-routing:static",
-                        "name": "default",
-                        "static-routes": {
-                            "ipv4": {
-                                "route": [{
-                                    "destination-prefix": "0.0.0.0/0",
-                                    "next-hop": {
-                                        "next-hop-address": "192.168.50.1"
-                                    }
-                                }]
-                            },
-                            "ipv6": {
-                                "route": [{
-                                    "destination-prefix": "::/0",
-                                    "next-hop": {
-                                        "next-hop-address": "2001:db8:3c4d:50::1"
-                                    }
-                                }]
-                            }
+        })
+
+    target.put_config_dict("ietf-routing", {
+        "routing": {
+            "control-plane-protocols": {
+                "control-plane-protocol": [{
+                    "type": "infix-routing:static",
+                    "name": "default",
+                    "static-routes": {
+                        "ipv4": {
+                            "route": [{
+                                "destination-prefix": "0.0.0.0/0",
+                                "next-hop": {
+                                    "next-hop-address": "192.168.50.1"
+                                }
+                            }]
+                        },
+                        "ipv6": {
+                            "route": [{
+                                "destination-prefix": "::/0",
+                                "next-hop": {
+                                    "next-hop-address": "2001:db8:3c4d:50::1"
+                                }
+                            }]
                        }
-                    }]
-                }
+                    }
+                }]
            }
        }
    })
@@ -14,13 +14,13 @@ with infamy.Test() as test:
        target = env.attach("target", "mgmt")

    with test.step("Set timezone to Australia/Perth"):
-          target.put_config_dicts({"ietf-system": {
+          target.put_config_dict("ietf-system", {
            "system": {
                "clock": {
                    "timezone-name": "Australia/Perth" # always +8:00, no DTS
                    }
            }
-          }})
+          })

    with test.step("Verify current time offset is +08:00"):
        current_datetime=target.get_current_time_with_offset()
@@ -13,13 +13,13 @@ with infamy.Test() as test:
        target = env.attach("target", "mgmt")

    with test.step("Set timezone UTC offset to +12"):
-          target.put_config_dicts({"ietf-system": {
+          target.put_config_dict("ietf-system", {
            "system": {
                "clock": {
                    "timezone-utc-offset": "12"
                    }
            }
-          }})
+          })

    with test.step("Verify current time offset is +12:00"):
        current_datetime=target.get_current_time_with_offset()
@@ -16,7 +16,7 @@ import lxml
 import netconf_client.connect
 import netconf_client.ncclient
 import infamy.iface as iface
-from infamy.transport import Transport,infer_put_dict
+from infamy.transport import Transport
 from netconf_client.error import RpcError
 from . import env

@@ -214,7 +214,7 @@ class Device(Transport):
            else:
                return f"<filter type=\"xpath\" select=\"{xpath}\" {xmlns} />"
        return None
-
+    
    def _parse_response(self, response, parse):
        """Helper function to handle XML response parsing."""
        if not response:
@@ -273,10 +273,10 @@ class Device(Transport):
        xpath_filter = self._build_xpath_filter(xpath, get_data_xpath=True)
        response = self.ncc.get_data(datastore="ds:operational", filter=xpath_filter)
        parsed_data = self._parse_response(response, parse)
-
+        
        if parse and parsed_data:
            return parsed_data.print_dict()
-
+        
        return parsed_data

    def get_config(self, xpath):
@@ -313,16 +313,6 @@ class Device(Transport):
                continue
            break

-    def put_config_dicts(self, models):
-        config = ""
-        infer_put_dict(self.name, models)
-
-        for model in models.keys():
-            mod = self.ly.get_module(model)
-            lyd = mod.parse_data_dict(models[model], no_state=True, validate=False)
-            config+=lyd.print_mem("xml", with_siblings=True, pretty=False)+"\n"
-        return self.put_config(config)
-
    def put_config_dict(self, modname, edit):
        """Convert Python dictionary to XMl and send as configuration"""
        mod = self.ly.get_module(modname)
@@ -354,8 +344,8 @@ class Device(Transport):

    def get_schemas_list(self):
        schemas = []
-        data = self.get_dict("/netconf-state")

+        data = self.get_dict("/netconf-state")
        for d in data["netconf-state"]["schemas"]["schema"]:
            schema = {}
            schema["identifier"] = d['identifier']
@@ -438,3 +428,4 @@ class Device(Transport):
            return current_datetime.text
        else:
            raise ValueError("current-datetime element not found in the response")
+        
@@ -10,7 +10,7 @@ import time
 from requests.auth import HTTPBasicAuth
 from urllib3.exceptions import InsecureRequestWarning
 from dataclasses import dataclass
-from infamy.transport import Transport, infer_put_dict
+from infamy.transport import Transport
 from . import env

 # We know we have a self-signed certificate, silence warning about it
@@ -244,7 +244,7 @@ class Device(Transport):

        # Directly pass the dictionary without using json.dumps
        response = requests_workaround_put(
-            f"{self.restconf_url}/ds/ietf-datastores:{datastore}",
+            f"{self.restconf_url}/ds/ietf-datastores:{datastore}/",
            json=data,
            headers=self.headers,
            auth=self.auth,
@@ -262,18 +262,6 @@ class Device(Transport):
        for k, v in ds.items():
            return {container: v}

-    def put_config_dicts(self, models):
-        infer_put_dict(self.name, models)
-        running = self.get_running()
-
-        for model in models.keys():
-            mod = self.lyctx.get_module(model)
-            lyd = mod.parse_data_dict(models[model], no_state=True, validate=False)
-            running.merge(lyd)
-
-        return self.put_datastore("running", json.loads(running.print_mem("json", with_siblings=True, pretty=False)))
-
-
    def put_config_dict(self, modname, edit):
        """Add @edit to running config and put the whole configuration"""

@@ -1,14 +1,6 @@
 from abc import ABC, abstractmethod
 from infamy.neigh import ll6ping

-def infer_put_dict(name, models):
-    if not models.get("ietf-system"):
-        models["ietf-system"] = { "system": { "hostname": name} }
-    else:
-        if not models["ietf-system"].get("system"):
-            models["ieft-system"]["system"] = {}
-        if not models["ietf-system"]["system"].get("hostname"):
-            models["ietf-system"]["system"]["hostname"] = name

 class Transport(ABC):
    """Common functions for NETCONF/RESTCONF"""