diff --git a/build.sh b/build.sh index 5d048185..93eff390 100755 --- a/build.sh +++ b/build.sh @@ -243,6 +243,10 @@ if [ "$OMR_KERNEL" != "5.4" ] && [ "$OMR_TARGET" != "x86_64" ] && [ "$OMR_TARGET echo "# CONFIG_PACKAGE_kmod-r8168 is not set" >> "$OMR_TARGET/source/.config" fi +if [ "$OMR_TARGET" = "rutx" -a "$OMR_KERNEL" = "5.4" ]; then + echo "CONFIG_PACKAGE_kmod-r2ec=y" >> "$OMR_TARGET/source/.config" +fi + if [ "$OMR_TARGET" = "bpi-r1" -a "$OMR_OPENWRT" = "master" ]; then # We disable mc in master, because it leads to unknown compilation errors on bpi-r1 target # No time to check this, now, cause i am focused on make this target work diff --git a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-08_10.dts b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-08_10.dts index 0404ede3..22984ac2 100644 --- a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-08_10.dts +++ b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-08_10.dts @@ -2,7 +2,7 @@ #include "qcom-ipq4018-rutx-shiftreg.dtsi" / { - model = "RUTX08/10"; + model = "Teltonika RUTX08/10"; soc { gpio-export { diff --git a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-09_11.dts b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-09_11.dts index 707011a4..6bf9ec40 100644 --- a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-09_11.dts +++ b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-09_11.dts @@ -2,7 +2,7 @@ #include "qcom-ipq4018-rutx-shiftreg.dtsi" / { - model = "RUTX09/11"; + model = "Teltonika RUTX09/11"; soc { gpio-export { diff --git a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-12.dts b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-12.dts index d39f64e9..8b02bf9a 100644 --- a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-12.dts +++ b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-12.dts @@ -2,7 +2,7 @@ #include "qcom-ipq4018-rutx-shiftreg.dtsi" / { - model = "RUTX12"; + model = "Teltonika RUTX12"; soc { gpio-export { diff --git a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-R1.dts b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-R1.dts index 5f30195b..3742fc27 100644 --- a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-R1.dts +++ b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-R1.dts @@ -3,7 +3,7 @@ #include "qcom-ipq4018-rutx-i2c.dtsi" // SFP / { - model = "RUTXR1"; + model = "Teltonika RUTXR1"; soc { gpio-export { diff --git a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-STM32.dts b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-STM32.dts index c6e53f02..ddb8b72c 100644 --- a/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-STM32.dts +++ b/root/target/linux/ipq40xx/dts/qcom-ipq4018-rutx-STM32.dts @@ -2,7 +2,7 @@ #include "qcom-ipq4018-rutx-i2c.dtsi" / { - model = "RUTX STM32"; + model = "Teltonika RUTX STM32"; io_expander = "stm32"; soc { diff --git a/root/target/linux/ipq40xx/image/generic.mk b/root/target/linux/ipq40xx/image/generic.mk index 42cefb88..9f3507a7 100644 --- a/root/target/linux/ipq40xx/image/generic.mk +++ b/root/target/linux/ipq40xx/image/generic.mk @@ -843,7 +843,8 @@ define Device/teltonika_rutx IMAGE/factory.bin := append-ubi | qsdk-ipq-factory-nand | append-rutx-metadata IMAGES += sysupgrade.bin IMAGE/sysupgrade.bin := append-ubi | qsdk-ipq-factory-nand | append-metadata - DEVICE_PACKAGES := ipq-wifi-teltonika_rutx kmod-bluetooth kmod-r2ec + #DEVICE_PACKAGES := ipq-wifi-teltonika_rutx kmod-bluetooth kmod-r2ec + DEVICE_PACKAGES := ipq-wifi-teltonika_rutx kmod-bluetooth HW_SUPPORT := io_expander%stm32:shiftreg_1 endef TARGET_DEVICES += teltonika_rutx