From 9e5d121cd9b48eb4d01fbba368884489db40ae36 Mon Sep 17 00:00:00 2001 From: mike_ding Date: Tue, 27 May 2025 10:38:07 +0800 Subject: [PATCH] Support dual image and fix reset button does not work issue Signed-off-by: mike_ding --- .github/workflows/build-dev.yml | 2 +- .../ipq53xx/base-files/lib/upgrade/platform.sh | 6 ++---- .../ipq53xx/dts/ipq5332-sercomm-ap72tip-v4.dts | 2 +- .../ipq53xx/dts/ipq5332-sercomm-ap72tip.dts | 14 +++++++------- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml index cc2cc2495..67168d494 100755 --- a/.github/workflows/build-dev.yml +++ b/.github/workflows/build-dev.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - target: [ 'cig_wf186h', 'cig_wf186w', 'cig_wf188n', 'cig_wf189', 'cig_wf196', 'cig_wf196', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'sonicfi_rap630w-312g', 'sonicfi_rap63xc-211g', 'sonicfi_rap630c-311g', 'sonicfi_rap630w-311g', 'sonicfi_rap630w-211g', 'sonicfi_rap650c', 'sonicfi_rap7110c-341x', 'sonicfi_rap750e-h', 'sonicfi_rap750w-311a', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap105', 'edgecore_eap111', 'edgecore_eap112', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'edgecore_oap103', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4x_3', 'hfcl_ion4xi_w', 'hfcl_ion4x_w', 'indio_um-305ax', 'senao_iap4300m', 'senao_iap2300m', 'senao_jeap6500', 'udaya_a6-id2', 'udaya_a6-od2', 'yuncore_ax820', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655', 'emplus_wap588m', 'zyxel_nwa130be' ] + target: [ 'cig_wf186h', 'cig_wf186w', 'cig_wf188n', 'cig_wf189', 'cig_wf196', 'cig_wf196', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'sonicfi_rap630w-312g', 'sonicfi_rap63xc-211g', 'sonicfi_rap630c-311g', 'sonicfi_rap630w-311g', 'sonicfi_rap630w-211g', 'sonicfi_rap650c', 'sonicfi_rap7110c-341x', 'sonicfi_rap750e-h', 'sonicfi_rap750w-311a', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap105', 'edgecore_eap111', 'edgecore_eap112', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'edgecore_oap103', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4x_3', 'hfcl_ion4xi_w', 'hfcl_ion4x_w', 'indio_um-305ax', 'senao_iap4300m', 'senao_iap2300m', 'senao_jeap6500', 'udaya_a6-id2', 'udaya_a6-od2', 'yuncore_ax820', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655', 'emplus_wap588m', 'zyxel_nwa130be', 'sercomm_ap72tip-v4' ] steps: - uses: actions/checkout@v3 diff --git a/feeds/qca-wifi-7/ipq53xx/base-files/lib/upgrade/platform.sh b/feeds/qca-wifi-7/ipq53xx/base-files/lib/upgrade/platform.sh index f7271cb4b..05355c8f5 100755 --- a/feeds/qca-wifi-7/ipq53xx/base-files/lib/upgrade/platform.sh +++ b/feeds/qca-wifi-7/ipq53xx/base-files/lib/upgrade/platform.sh @@ -86,6 +86,8 @@ platform_do_upgrade() { board=$(board_name) case $board in + sercomm,ap72tip-v4|\ + sercomm,ap72tip|\ cig,wf189w|\ cig,wf189h|\ cig,wf189) @@ -121,10 +123,6 @@ platform_do_upgrade() { sonicfi_dualimage_check nand_upgrade_tar "$1" ;; - sercomm,ap72tip-v4|\ - sercomm,ap72tip) - nand_upgrade_tar "$1" - ;; zyxel,nwa130be) nand_upgrade_tar "$1" ;; diff --git a/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sercomm-ap72tip-v4.dts b/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sercomm-ap72tip-v4.dts index 2778dd24e..449f365d1 100644 --- a/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sercomm-ap72tip-v4.dts +++ b/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sercomm-ap72tip-v4.dts @@ -15,7 +15,7 @@ #include "ipq5332-default-memory.dtsi" / { - model = "Sercomm WiFi-7"; + model = "Sercomm AP72TIP-v4"; compatible = "sercomm,ap72tip-v4", "qcom,ipq5332-ap-mi01.6", "qcom,ipq5332"; aliases { diff --git a/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sercomm-ap72tip.dts b/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sercomm-ap72tip.dts index 9c3e783cd..21398f2c7 100644 --- a/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sercomm-ap72tip.dts +++ b/feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sercomm-ap72tip.dts @@ -15,7 +15,7 @@ #include "ipq5332-default-memory.dtsi" / { - model = "Sercomm WiFi-7"; + model = "Sercomm AP72TIP"; compatible = "sercomm,ap72tip", "qcom,ipq5332-ap-mi01.6", "qcom,ipq5332"; aliases { @@ -255,7 +255,7 @@ gpios = <&tca6416 14 GPIO_ACTIVE_HIGH>; }; }; -/* + gpio_keys { compatible = "gpio-keys"; pinctrl-0 = <&button_pins>; @@ -263,11 +263,11 @@ button@1 { label = "rst"; linux,code = ; - gpios = <&tlmm 25 GPIO_ACTIVE_LOW>; + gpios = <&tlmm 1 GPIO_ACTIVE_LOW>; linux,input-type = <1>; debounce-interval = <60>; }; - };*/ + }; wsi: wsi { id = <0>; @@ -546,13 +546,13 @@ drive-strength = <8>; bias-pull-down; };*/ -/* + button_pins: button-state { - pins = "gpio25"; + pins = "gpio1"; function = "gpio"; drive-strength = <8>; bias-pull-up; - };*/ + }; pwm_pins: pwm-state { pins = "gpio46";