[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: luci-app-jd-dailybonus: Keep up to date (coolsnowwolf#6916) ramips: xiaomi cr6606: increase firmware partition size (coolsnowwolf#6915)
skhappy · Jun 2, 2021 · 70db1c5 · 70db1c5
2 parents 62b8708 + 9826d70
commit 70db1c5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 35 deletions.
diff --git a/package/lean/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/client.lua b/package/lean/luci-app-jd-dailybonus/luasrc/model/cbi/jd-dailybonus/client.lua
@@ -10,7 +10,7 @@ s.anonymous = true
 
 o = s:option(DynamicList, "Cookies", translate("账号 Cookie 列表"))
 o.rmempty = false
-o.description = translate('双击输入框或点击添加图标即可调出二维码，扫码后自动填入。')
+o.description = translate('双击输入框可调出二维码，扫码后自动填入。')
 
 o = s:option(DummyValue, '', '')
 o.rawhtml = true

diff --git a/package/lean/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm b/package/lean/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm
@@ -51,7 +51,7 @@
 <script type="text/javascript">
 (function( window, document, undefined ) {
     // 选取 DOM 元素
-    var selector, section = document.querySelector("[data-prefix$='Cookies']");
+    var selector, section = document.querySelector("[id$='Cookies']");
 
     // 遮罩容器
     var mask = document.createElement('div');

diff --git a/package/lean/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/update_service.htm b/package/lean/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/update_service.htm
@@ -1,12 +1,12 @@
 <%+cbi/valueheader%>
 <label class="cbi-value-title"><%= translate("执行") %></label>
 <div class="cbi-value-field">
-    <input class="cbi-button cbi-button-reload" id="update_service" type="button" size="0" onclick="run()" value="<%= translate('手动执行签到') %>" />
+    <input class="btn cbi-button cbi-button-reload" id="update_service" type="button" size="0" onclick="run()" value="<%= translate('手动执行签到') %>" />
 </div>
 
 <label class="cbi-value-title"><%= translate("更新脚本") %></label>
 <div class="cbi-value-field">
-    <input class="cbi-button cbi-button-reload" id="update_script" type="button" size="0" onclick="check_version()" data-version="<%= self.version %>" value="<%= translate('手动检查脚本更新，当前版本：v')..self.version %>" />
+    <input class="btn cbi-button cbi-button-reload" id="update_script" type="button" size="0" onclick="check_version()" data-version="<%= self.version %>" value="<%= translate('手动检查脚本更新，当前版本：v')..self.version %>" />
 </div>
 
 <script type="text/javascript">

diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mi-router-cr6606.dts b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-cr6606.dts
@@ -46,20 +46,18 @@
 		};
 	};
 
-	keys: keys {
+	keys {
 		compatible = "gpio-keys";
 
 		reset {
 			label = "reset";
 			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
-			debounce-interval = <60>;
 			linux,code = <KEY_RESTART>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
-			debounce-interval = <60>;
 			linux,code = <KEY_WPS_BUTTON>;
 		};
 	};
@@ -110,25 +108,13 @@
 		};
 
 		partition@200000 {
-			label = "firmware";
-			compatible = "denx,uimage";
-			reg = <0x200000 0x1e00000>;
+			label = "kernel";
+			reg = <0x200000 0x400000>;
 		};
 
-		partition@2000000 {
-			label = "firmware1";
-			reg = <0x2000000 0x1e00000>;
-		};
-
-		partition@3e00000 {
+		partition@600000 {
 			label = "ubi";
-			reg = <0x3e00000 0x3200000>;
-		};
-
-		partition@7000000 {
-			label = "obr";
-			reg = <0x7000000 0x1000000>;
-			read-only;
+			reg = <0x600000 0x7980000>;
 		};
 	};
 };
@@ -140,17 +126,11 @@
 &pcie1 {
 	wifi@0,0 {
 		compatible = "mediatek,mt76";
-		reg = <0x0 0 0 0 0>;
+		reg = <0x0000 0 0 0 0>;
 		mediatek,mtd-eeprom = <&factory 0x0>;
 	};
 };
 
-&pcie2 {
-	wifi@0,0 {
-		reg = <0x0 0 0 0 0>;
-	};
-};
-
 &gmac0 {
 	mtd-mac-address = <&factory 0x3fff4>;
 };

diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
@@ -1112,14 +1112,14 @@ define Device/xiaomi_mi-router-cr6606
   BLOCKSIZE := 128k
   PAGESIZE := 2048
   UBINIZE_OPTS := -E 5
-  IMAGE_SIZE := 51200k
-  IMAGES += firmware.bin overlay.bin
-  IMAGE/firmware.bin := append-kernel | pad-to 128k | append-rootfs | pad-rootfs
-  IMAGE/overlay.bin := append-ubi | check-size
+  KERNEL_SIZE := 4096k
+  IMAGE_SIZE := 128512k
+  IMAGES += factory.bin
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+  IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | check-size
   DEVICE_VENDOR := Xiaomi
   DEVICE_MODEL := Mi Router CR6606
-  DEVICE_PACKAGES += uboot-envtools kmod-mt7915e wpad-openssl
+  DEVICE_PACKAGES += kmod-mt7915e wpad-openssl uboot-envtools
 endef
 TARGET_DEVICES += xiaomi_mi-router-cr6606