From 60665e82a43bc9c412e5d4f4afb5d1e1ac5801f3 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 12 Apr 2021 20:35:16 +0800 Subject: [PATCH] mediatek: sync with upstram source Signed-off-by: Tianling Shen --- .../base-files/lib/preinit/79_move_config | 2 - .../mt7622/base-files/lib/upgrade/platform.sh | 48 ++----------------- .../112-dts-fix-bpi64-lan-names.patch | 10 +++- .../113-dts-fix-bpi64-leds-and-buttons.patch | 8 ++-- .../114-dts-bpi64-disable-rtc.patch | 21 ++++++++ ...ek-Split-PCIe-node-for-MT2712-MT7622.patch | 2 +- 6 files changed, 38 insertions(+), 53 deletions(-) create mode 100644 target/linux/mediatek/patches-5.10/114-dts-bpi64-disable-rtc.patch diff --git a/target/linux/mediatek/mt7622/base-files/lib/preinit/79_move_config b/target/linux/mediatek/mt7622/base-files/lib/preinit/79_move_config index 1d1c4b831c..9767afac09 100644 --- a/target/linux/mediatek/mt7622/base-files/lib/preinit/79_move_config +++ b/target/linux/mediatek/mt7622/base-files/lib/preinit/79_move_config @@ -1,5 +1,3 @@ -#!/bin/sh - . /lib/upgrade/common.sh RECOVERY_PART=/dev/mmcblk0p6 diff --git a/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh index 49c4a82714..21672c2965 100755 --- a/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh +++ b/target/linux/mediatek/mt7622/base-files/lib/upgrade/platform.sh @@ -2,46 +2,6 @@ REQUIRE_IMAGE_METADATA=1 RAMFS_COPY_BIN='fw_printenv fw_setenv blockdev' RAMFS_COPY_DATA='/etc/fw_env.config /var/lock/fw_printenv.lock' -get_cmdline_var() { - local var=$1 - local cmdlinevar tmp - local cmdline="$(cat /proc/cmdline)" - - for cmdlinevar in $cmdline; do - tmp=${cmdlinevar##${var}} - [ "=" = "${tmp:0:1}" ] && echo ${tmp:1} - done -} - -get_rootdev() { - local rootvol rootdev - rootvol=$(get_cmdline_var root) - rootvol=$(basename $rootvol) - [ -e /sys/class/block/$rootvol ] || { - rootvol=${rootvol%%[0-9]} - [ -e /sys/class/block/$rootvol ] && echo $rootvol - rootvol=${rootvol%%p} - [ -e /sys/class/block/$rootvol ] && echo $rootvol - return - } - [ -e /sys/class/block/$rootvol/partition ] || { - echo $rootvol - return - } - rootdev=$(busybox readlink -f /sys/class/block/$rootvol) - rootdev=$(basename ${rootdev%%/${rootvol}}) - [ -e /sys/class/block/$rootdev ] && echo $rootdev -} - -get_partition() { - for partname in /sys/class/block/$1/*/name; do - [ "$(cat ${partname})" = "$2" ] && { - basename ${partname%%/name} - break - } - done -} - platform_do_upgrade() { local board=$(board_name) local file_type=$(identify $1) @@ -126,11 +86,9 @@ platform_check_image() { platform_copy_config_mmc() { [ -e "$UPGRADE_BACKUP" ] || return - local rootdev=$(cat /tmp/sysupgrade.rootdev) - blockdev --rereadpt /dev/$rootdev - local datadev=$(get_partition $rootdev rootfs_data) - [ "$datadev" ] || echo "no rootfs_data partition, cannot keep configuration." >&2 - dd if="$CONF_TAR" of=/dev/$datadev + local datapart=$(cat /tmp/sysupgrade.datapart) + [ "$datapart" ] || echo "no rootfs_data partition, cannot keep configuration." >&2 + dd if="$CONF_TAR" of=/dev/$datapart sync } diff --git a/target/linux/mediatek/patches-5.10/112-dts-fix-bpi64-lan-names.patch b/target/linux/mediatek/patches-5.10/112-dts-fix-bpi64-lan-names.patch index 55c84812d0..6ce85efde9 100644 --- a/target/linux/mediatek/patches-5.10/112-dts-fix-bpi64-lan-names.patch +++ b/target/linux/mediatek/patches-5.10/112-dts-fix-bpi64-lan-names.patch @@ -1,6 +1,14 @@ --- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts +++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts -@@ -160,22 +160,22 @@ +@@ -18,6 +18,7 @@ + + aliases { + serial0 = &uart0; ++ ethernet0 = &gmac0; + }; + + chosen { +@@ -160,22 +161,22 @@ port@1 { reg = <1>; diff --git a/target/linux/mediatek/patches-5.10/113-dts-fix-bpi64-leds-and-buttons.patch b/target/linux/mediatek/patches-5.10/113-dts-fix-bpi64-leds-and-buttons.patch index 03128a5ef8..f88dbc7195 100644 --- a/target/linux/mediatek/patches-5.10/113-dts-fix-bpi64-leds-and-buttons.patch +++ b/target/linux/mediatek/patches-5.10/113-dts-fix-bpi64-leds-and-buttons.patch @@ -1,9 +1,9 @@ --- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts +++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts -@@ -18,6 +18,10 @@ - +@@ -19,6 +19,10 @@ aliases { serial0 = &uart0; + ethernet0 = &gmac0; + led-boot = &led_system_green; + led-failsafe = &led_system_blue; + led-running = &led_system_green; @@ -11,7 +11,7 @@ }; chosen { -@@ -41,8 +45,8 @@ +@@ -42,8 +46,8 @@ compatible = "gpio-keys"; factory { @@ -22,7 +22,7 @@ gpios = <&pio 0 GPIO_ACTIVE_HIGH>; }; -@@ -56,17 +60,25 @@ +@@ -57,17 +61,25 @@ leds { compatible = "gpio-leds"; diff --git a/target/linux/mediatek/patches-5.10/114-dts-bpi64-disable-rtc.patch b/target/linux/mediatek/patches-5.10/114-dts-bpi64-disable-rtc.patch new file mode 100644 index 0000000000..261579bf37 --- /dev/null +++ b/target/linux/mediatek/patches-5.10/114-dts-bpi64-disable-rtc.patch @@ -0,0 +1,21 @@ +--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts ++++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts +@@ -559,12 +559,16 @@ + status = "okay"; + }; + ++&rtc { ++ status = "disabled"; ++}; ++ + &sata { +- status = "disable"; ++ status = "disabled"; + }; + + &sata_phy { +- status = "disable"; ++ status = "disabled"; + }; + + &spi0 { diff --git a/target/linux/mediatek/patches-5.10/602-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch b/target/linux/mediatek/patches-5.10/602-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch index 19468ae037..5e0114328c 100644 --- a/target/linux/mediatek/patches-5.10/602-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch +++ b/target/linux/mediatek/patches-5.10/602-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch @@ -253,7 +253,7 @@ Signed-off-by: chuanjia.liu #interrupt-cells = <1>; --- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts +++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts -@@ -269,18 +269,16 @@ +@@ -270,18 +270,16 @@ }; };