mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-19 13:48:06 +00:00
mediatek: fix sysupgrade board detection
boardnames were changed with the recent target update. the sysupgrade board detection was not updated properly. Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
parent
003e15221a
commit
da352c4623
@ -20,11 +20,12 @@ platform_check_image() {
|
|||||||
local board=$(cat /tmp/sysinfo/board_name)
|
local board=$(cat /tmp/sysinfo/board_name)
|
||||||
|
|
||||||
case "$board" in
|
case "$board" in
|
||||||
NAND)
|
mediatek,mt7623-rfb-nand-ephy |\
|
||||||
|
mediatek,mt7623-rfb-nand)
|
||||||
nand_do_platform_check $board $1
|
nand_do_platform_check $board $1
|
||||||
return $?
|
return $?
|
||||||
;;
|
;;
|
||||||
eMMC)
|
mediatek,mt7623-rfb-emmc)
|
||||||
local kernel_length=`(tar xf $tar_file sysupgrade-$board/kernel -O | wc -c) 2> /dev/null`
|
local kernel_length=`(tar xf $tar_file sysupgrade-$board/kernel -O | wc -c) 2> /dev/null`
|
||||||
local rootfs_length=`(tar xf $tar_file sysupgrade-$board/root -O | wc -c) 2> /dev/null`
|
local rootfs_length=`(tar xf $tar_file sysupgrade-$board/root -O | wc -c) 2> /dev/null`
|
||||||
;;
|
;;
|
||||||
@ -46,7 +47,8 @@ platform_check_image() {
|
|||||||
platform_pre_upgrade() {
|
platform_pre_upgrade() {
|
||||||
local board=$(cat /tmp/sysinfo/board_name)
|
local board=$(cat /tmp/sysinfo/board_name)
|
||||||
case "$board" in
|
case "$board" in
|
||||||
NAND)
|
mediatek,mt7623-rfb-nand-ephy |\
|
||||||
|
mediatek,mt7623-rfb-nand)
|
||||||
nand_do_upgrade $1
|
nand_do_upgrade $1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -25,6 +25,9 @@ endif
|
|||||||
)
|
)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
COMPAT_NAND:=mediatek,mt7623-rfb-nand
|
||||||
|
COMPAT_NAND_EPHY:=mediatek,mt7623-rfb-nand-ephy
|
||||||
|
|
||||||
define Image/Build/squashfs
|
define Image/Build/squashfs
|
||||||
$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
|
$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
|
||||||
$(CP) $(KDIR)/root.squashfs $(BIN_DIR)/$(IMG_PREFIX)-root.squashfs
|
$(CP) $(KDIR)/root.squashfs $(BIN_DIR)/$(IMG_PREFIX)-root.squashfs
|
||||||
@ -39,8 +42,8 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
|
|||||||
$(CP) $(KDIR)/uImage-NAND-initramfs $(BIN_DIR)/$(IMG_PREFIX)-uImage-NAND-initramfs
|
$(CP) $(KDIR)/uImage-NAND-initramfs $(BIN_DIR)/$(IMG_PREFIX)-uImage-NAND-initramfs
|
||||||
$(CP) $(KDIR)/uImage-NAND-ePHY-initramfs $(BIN_DIR)/$(IMG_PREFIX)-uImage-NAND-ePHY-initramfs
|
$(CP) $(KDIR)/uImage-NAND-ePHY-initramfs $(BIN_DIR)/$(IMG_PREFIX)-uImage-NAND-ePHY-initramfs
|
||||||
endif
|
endif
|
||||||
$(call Image/Build/SysupgradeNAND,NAND,$(1),$(KDIR)/uImage-NAND)
|
$(call Image/Build/SysupgradeNAND,NAND,$(1),$(KDIR)/uImage-NAND,$$(COMPAT_NAND))
|
||||||
$(call Image/Build/SysupgradeNAND,NAND-ePHY,$(1),$(KDIR)/uImage-NAND-ePHY)
|
$(call Image/Build/SysupgradeNAND,NAND-ePHY,$(1),$(KDIR)/uImage-NAND-ePHY,$$(COMPAT_NAND_EPHY))
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Image/Build
|
define Image/Build
|
||||||
|
Loading…
Reference in New Issue
Block a user