From d1acc5831683a713653255b27b1d42ef66825dfe Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Mon, 18 Jul 2022 17:19:57 +0000 Subject: [PATCH] kernel: consistently add devbridge and netdevmedium to kernel configs --- sys/src/9/bcm/pi | 8 +++++--- sys/src/9/bcm/pi2 | 8 +++++--- sys/src/9/bcm64/pi3 | 8 +++++--- sys/src/9/bcm64/pi4 | 4 +++- sys/src/9/imx8/reform | 3 +++ sys/src/9/pc/pc | 6 +++--- sys/src/9/pc64/pc64 | 8 ++++---- sys/src/9/zynq/zynq | 5 +++-- 8 files changed, 31 insertions(+), 19 deletions(-) diff --git a/sys/src/9/bcm/pi b/sys/src/9/bcm/pi index 600d92775..105c8e4ae 100644 --- a/sys/src/9/bcm/pi +++ b/sys/src/9/bcm/pi @@ -13,7 +13,8 @@ dev tls cap fs - ip arp chandial ip ipv6 ipaux iproute netlog nullmedium pktmedium inferno + bridge log + ip arp chandial ip ipv6 ipaux iproute netlog nullmedium pktmedium inferno draw screen swcursor mouse mouse uart gpio @@ -22,10 +23,11 @@ dev usb link - loopbackmedium - ethermedium archbcm usbdwc + ethermedium + loopbackmedium + netdevmedium ip tcp diff --git a/sys/src/9/bcm/pi2 b/sys/src/9/bcm/pi2 index be1b01255..73d1d5f30 100644 --- a/sys/src/9/bcm/pi2 +++ b/sys/src/9/bcm/pi2 @@ -13,7 +13,8 @@ dev tls cap fs - ip arp chandial ip ipv6 ipaux iproute netlog nullmedium pktmedium inferno + bridge log + ip arp chandial ip ipv6 ipaux iproute netlog nullmedium pktmedium inferno draw screen swcursor mouse mouse uart gpio @@ -22,10 +23,11 @@ dev usb link - loopbackmedium - ethermedium archbcm2 usbdwc + ethermedium + loopbackmedium + netdevmedium ip tcp diff --git a/sys/src/9/bcm64/pi3 b/sys/src/9/bcm64/pi3 index 8cc817106..e1cbaa6aa 100644 --- a/sys/src/9/bcm64/pi3 +++ b/sys/src/9/bcm64/pi3 @@ -13,7 +13,8 @@ dev tls cap fs - ip arp chandial ip ipv6 ipaux iproute netlog nullmedium pktmedium inferno + bridge log + ip arp chandial ip ipv6 ipaux iproute netlog nullmedium pktmedium inferno draw screen swcursor mouse mouse uart gpio @@ -23,10 +24,11 @@ dev dtracy link - loopbackmedium - ethermedium archbcm3 usbdwc + ethermedium + loopbackmedium + netdevmedium ip tcp diff --git a/sys/src/9/bcm64/pi4 b/sys/src/9/bcm64/pi4 index 61c7602b8..2300cd31a 100644 --- a/sys/src/9/bcm64/pi4 +++ b/sys/src/9/bcm64/pi4 @@ -14,7 +14,8 @@ dev cap fs ether netif - ip arp chandial ip ipv6 ipaux iproute netlog nullmedium pktmedium inferno + bridge log + ip arp chandial ip ipv6 ipaux iproute netlog nullmedium pktmedium inferno draw screen swcursor mouse mouse uart gpio @@ -31,6 +32,7 @@ link ethergenet ethermii ethermedium loopbackmedium + netdevmedium ip tcp diff --git a/sys/src/9/imx8/reform b/sys/src/9/imx8/reform index 0fba5fc20..186075169 100644 --- a/sys/src/9/imx8/reform +++ b/sys/src/9/imx8/reform @@ -13,6 +13,7 @@ dev cap fs ether netif + bridge log ip arp chandial ip ipv6 ipaux iproute netlog nullmedium pktmedium inferno draw screen swcursor mouse screen swcursor @@ -26,8 +27,10 @@ link etherimx ethermii ethermedium loopbackmedium + netdevmedium i2cimx devi2c pciimx pci + ip tcp udp diff --git a/sys/src/9/pc/pc b/sys/src/9/pc/pc index 6ba1323ed..2dad42576 100644 --- a/sys/src/9/pc/pc +++ b/sys/src/9/pc/pc @@ -20,7 +20,7 @@ dev dtracy ether netif - bridge netif log + bridge log ip arp chandial ip ipv6 ipaux iproute netlog nullmedium pktmedium inferno draw screen vga vgax vgasoft @@ -81,9 +81,9 @@ link ethervirtio pci ethervirtio10 pci ethermedium - pcmciamodem - netdevmedium loopbackmedium + netdevmedium + pcmciamodem usbuhci pci usbohci pci usbehci usbehcipc diff --git a/sys/src/9/pc64/pc64 b/sys/src/9/pc64/pc64 index e385be7a6..e2fbb16f0 100644 --- a/sys/src/9/pc64/pc64 +++ b/sys/src/9/pc64/pc64 @@ -19,8 +19,8 @@ dev fs ether netif - bridge netif log - ip arp chandial ip ipv6 ipaux iproute netlog ethermedium nullmedium pktmedium inferno + bridge log + ip arp chandial ip ipv6 ipaux iproute netlog nullmedium pktmedium inferno draw screen vga vgax vgasoft mouse mouse @@ -79,9 +79,9 @@ link ethervirtio pci ethervirtio10 pci ethermedium -# pcmciamodem - netdevmedium loopbackmedium + netdevmedium +# pcmciamodem usbuhci pci usbohci pci usbehci pci usbehcipc diff --git a/sys/src/9/zynq/zynq b/sys/src/9/zynq/zynq index 42e499e33..4c702d4aa 100644 --- a/sys/src/9/zynq/zynq +++ b/sys/src/9/zynq/zynq @@ -11,8 +11,9 @@ dev env pipe dup - ether netif - ip arp chandial ip ipv6 ipaux iproute netlog nullmedium pktmedium inferno + ether netif + bridge log + ip arp chandial ip ipv6 ipaux iproute netlog nullmedium pktmedium inferno tls cap kprof