Merge changes Ie53b2f2f,I631945a7,I8073f305,I1b781b3a
* changes:
Sync all dependencies
CI: Build on Fedora 33
clearfog: do not support I2C address translation via LTC4316
busybox: flashing from USB needs `blkdiscard`
diff --git a/.zuul.yaml b/.zuul.yaml
index 53a36fb..71a4ff2 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,6 +1,6 @@
- job:
name: czechlight-clearfog
- parent: run-ci-build-sh-f32
+ parent: run-ci-build-sh-f33
timeout: 3600
post-timeout: 600
vars:
diff --git a/board/czechlight/clearfog/sdn-roadm-clearfog.dtsi b/board/czechlight/clearfog/sdn-roadm-clearfog.dtsi
index 04d5b38..3d07cac 100644
--- a/board/czechlight/clearfog/sdn-roadm-clearfog.dtsi
+++ b/board/czechlight/clearfog/sdn-roadm-clearfog.dtsi
@@ -4,8 +4,6 @@
status = "okay";
};
-#define CLEARFOG_PMBUS_BITBANG
-
/ {
clocks {
spi_uart_clk: osc_max14830 {
@@ -24,7 +22,6 @@
};
};
-#ifdef CLEARFOG_PMBUS_BITBANG
gpio_i2c {
compatible = "i2c-gpio";
sda-gpios = <&gpio0 25 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
@@ -33,10 +30,8 @@
#address-cells = <1>;
#size-cells = <0>;
};
-#endif
};
-#ifdef CLEARFOG_PMBUS_BITBANG
&uart1_pins {
status = "disabled";
};
@@ -44,7 +39,6 @@
&uart1 {
status = "disabled";
};
-#endif
&gpio1 {
spi_int {
@@ -92,18 +86,13 @@
i2c_bitbang_enable {
gpio-hog;
gpios = <7 GPIO_ACTIVE_HIGH>;
-#ifdef CLEARFOG_PMBUS_BITBANG
output-high;
-#else
- output-low;
-#endif
line-name = "I2C bitbang bus";
};
i2c_xor_high {
gpio-hog;
gpios = <6 GPIO_ACTIVE_HIGH>;
- //output-low; // XOR byte 0b0001111
output-high; // XOR byte 0b1001111
line-name = "I2C XOR high";
};
@@ -111,11 +100,7 @@
i2c_xor_enable {
gpio-hog;
gpios = <5 GPIO_ACTIVE_HIGH>;
-#ifdef CLEARFOG_PMBUS_BITBANG
output-low;
-#else
- output-high;
-#endif
line-name = "I2C addr xlate";
};
};
diff --git a/board/czechlight/common/busybox-config b/board/czechlight/common/busybox-config
index af0efe0..174c853 100644
--- a/board/czechlight/common/busybox-config
+++ b/board/czechlight/common/busybox-config
@@ -5,3 +5,6 @@
# rauc
CONFIG_FEATURE_TAR_AUTODETECT=y
CONFIG_FEATURE_SEAMLESS_XZ=y
+
+# initial flashing
+CONFIG_BLKDISCARD=y
diff --git a/submodules/lldp-systemd-networkd-sysrepo b/submodules/lldp-systemd-networkd-sysrepo
index 54c1cd8..99801c1 160000
--- a/submodules/lldp-systemd-networkd-sysrepo
+++ b/submodules/lldp-systemd-networkd-sysrepo
@@ -1 +1 @@
-Subproject commit 54c1cd8d62f7f20eb74cda826089031b4e5f33f4
+Subproject commit 99801c1a47a815f9d3406cee7e17e5d9a164d137
diff --git a/submodules/netconf-cli b/submodules/netconf-cli
index f90a0b5..0745618 160000
--- a/submodules/netconf-cli
+++ b/submodules/netconf-cli
@@ -1 +1 @@
-Subproject commit f90a0b5d9ac8d5cc58d76a4528fb5c9d4eb550e9
+Subproject commit 0745618db372792262e7fc65c13f7e42071dae74
diff --git a/submodules/velia b/submodules/velia
index b9f4d94..08528a7 160000
--- a/submodules/velia
+++ b/submodules/velia
@@ -1 +1 @@
-Subproject commit b9f4d947fc21ea32cfecb1611457d4ff6a3d7c6f
+Subproject commit 08528a7093fd31119a95b3d51dcc33709ce1226f