diff options
| author | John Crispin <john@phrozen.org> | 2017-05-03 10:31:55 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2017-05-03 10:31:55 +0200 |
| commit | 1ff71ccd5e30e34045df53b553b080d7609226a0 (patch) | |
| tree | 0ac75b7c4628cf2757b6573cf0ba550d92286f0c /target/linux/mediatek | |
| parent | b65c619d024ea7609e17e7113415603364ddf385 (diff) | |
| download | upstream-1ff71ccd5e30e34045df53b553b080d7609226a0.tar.gz upstream-1ff71ccd5e30e34045df53b553b080d7609226a0.tar.bz2 upstream-1ff71ccd5e30e34045df53b553b080d7609226a0.zip | |
mediatek: fix sysupgrade on eMMC boards
Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/mediatek')
| -rw-r--r-- | target/linux/mediatek/config-4.9 | 2 | ||||
| -rw-r--r-- | target/linux/mediatek/files/arch/arm/boot/dts/mt7623-eMMC.dts | 1 | ||||
| -rw-r--r-- | target/linux/mediatek/image/Makefile | 13 |
3 files changed, 9 insertions, 7 deletions
diff --git a/target/linux/mediatek/config-4.9 b/target/linux/mediatek/config-4.9 index 88332e431f..9f5b200040 100644 --- a/target/linux/mediatek/config-4.9 +++ b/target/linux/mediatek/config-4.9 @@ -61,7 +61,7 @@ CONFIG_CLKSRC_OF=y CONFIG_CLKSRC_PROBE=y CONFIG_CLONE_BACKWARDS=y CONFIG_CMDLINE="earlyprintk console=ttyS0,115200 rootfstype=squashfs,jffs2" -CONFIG_CMDLINE_FORCE=y +CONFIG_CMDLINE_EXTEND=y CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_MEDIATEK=y CONFIG_COMMON_CLK_MT2701=y diff --git a/target/linux/mediatek/files/arch/arm/boot/dts/mt7623-eMMC.dts b/target/linux/mediatek/files/arch/arm/boot/dts/mt7623-eMMC.dts index fe1a42d282..be7bced254 100644 --- a/target/linux/mediatek/files/arch/arm/boot/dts/mt7623-eMMC.dts +++ b/target/linux/mediatek/files/arch/arm/boot/dts/mt7623-eMMC.dts @@ -23,6 +23,7 @@ chosen { stdout-path = &uart2; + bootargs = "earlyprintk block2mtd.block2mtd=/dev/mmcblk0,65536,eMMC,5 mtdparts=eMMC:256k(mbr)ro,512k(uboot)ro,256k(config)ro,256k(factory)ro,32M(kernel),32M(recovery),1024M(rootfs),2048M(usrdata),-(bmtpool) rootfstype=squashfs,jffs2"; }; memory { diff --git a/target/linux/mediatek/image/Makefile b/target/linux/mediatek/image/Makefile index 177e4f723b..d515a04d5b 100644 --- a/target/linux/mediatek/image/Makefile +++ b/target/linux/mediatek/image/Makefile @@ -15,16 +15,17 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) $(call Image/BuilduImage,$1,-initramfs) $(CP) $(KDIR)/uImage-$(1)-initramfs $(BIN_DIR)/$(IMG_PREFIX)-uImage-$(1)-initramfs endif - mkdir -p "$(KDIR_TMP)/sysupgrade-$(1)/" - echo "BOARD=$(1)" > "$(KDIR_TMP)/sysupgrade-$(1)/CONTROL" - $(CP) "$(KDIR)/root.$(2)" "$(KDIR_TMP)/sysupgrade-$(1)/root" - $(CP) "$(KDIR)/uImage-$(1)" "$(KDIR_TMP)/sysupgrade-$(1)/kernel" + mkdir -p "$(KDIR_TMP)/sysupgrade-$(3)/" + echo "BOARD=$(3)" > "$(KDIR_TMP)/sysupgrade-$(3)/CONTROL" + $(CP) "$(KDIR)/root.$(2)" "$(KDIR_TMP)/sysupgrade-$(3)/root" + $(CP) "$(KDIR)/uImage-$(1)" "$(KDIR_TMP)/sysupgrade-$(3)/kernel" (cd "$(KDIR_TMP)"; $(TAR) cvf \ - "$(BIN_DIR)/$(IMG_PREFIX)-$(1)-sysupgrade.tar" sysupgrade-$(1) \ + "$(BIN_DIR)/$(IMG_PREFIX)-$(3)-sysupgrade.tar" sysupgrade-$(3) \ $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \ ) endef +COMPAT_EMMC:=mediatek,mt7623-rfb-emmc COMPAT_NAND:=mediatek,mt7623-rfb-nand COMPAT_NAND_EPHY:=mediatek,mt7623-rfb-nand-ephy @@ -32,7 +33,7 @@ define Image/Build/squashfs $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) $(CP) $(KDIR)/root.squashfs $(BIN_DIR)/$(IMG_PREFIX)-root.squashfs - $(call Image/Build/SysupgradeCombined,eMMC,squashfs) + $(call Image/Build/SysupgradeCombined,eMMC,squashfs,$$(COMPAT_EMMC)) $(call Image/BuilduImage,NAND) $(call Image/BuilduImage,NAND-ePHY) |