diff --git a/root/target/linux/mediatek/image/Makefile b/root/target/linux/mediatek/image/Makefile index 1fc02451..fc1c58c8 100644 --- a/root/target/linux/mediatek/image/Makefile +++ b/root/target/linux/mediatek/image/Makefile @@ -42,9 +42,12 @@ define Build/sysupgrade-bpi-r2-sd dd bs="1024" if="$(IMAGE_ROOTFS)" of="$@" seek="67584" endef define Build/sysupgrade-bpi-r2-emmc + rm -f $@.recovery + mkfs.fat -C $@.recovery 3070 dd bs="1024" if="$(STAGING_DIR_IMAGE)/mtk-bpi-r2-preloader-emmc.bin" of="$@" seek="0" dd bs="1024" if="$(STAGING_DIR_IMAGE)/mtk-bpi-r2-uboot.bin" of="$@" seek="320" dd bs="1024" if="$(IMAGE_KERNEL)" of="$@" seek="2048" + dd bs="1024" if="$@.recovery" of="$@" seek="33792" dd bs="1024" if="$(IMAGE_ROOTFS)" of="$@" seek="67584" endef @@ -52,7 +55,7 @@ endef define Device/Default PROFILES = Default $$(DEVICE_NAME) KERNEL_NAME := zImage -# FILESYSTEMS := squashfs + FILESYSTEMS := squashfs DEVICE_DTS_DIR := $(DTS_DIR) IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata diff --git a/root/target/linux/mediatek/mt7623/config-4.14 b/root/target/linux/mediatek/mt7623/config-4.14 index e43614eb..7fb1f3b6 100644 --- a/root/target/linux/mediatek/mt7623/config-4.14 +++ b/root/target/linux/mediatek/mt7623/config-4.14 @@ -53,6 +53,7 @@ CONFIG_ARM_THUMBEE=y CONFIG_ARM_UNWIND=y CONFIG_ARM_VIRT_EXT=y CONFIG_ATAGS=y +CONFIG_ATAGS_PROC=y CONFIG_AUTO_ZRELADDR=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_MQ_PCI=y @@ -72,7 +73,7 @@ CONFIG_CLEANCACHE=y CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_MMIO=y CONFIG_CLONE_BACKWARDS=y -CONFIG_CMDLINE="earlyprintk console=ttyS0,115200 rootfstype=squashfs,ext4,jffs2" +CONFIG_CMDLINE="earlyprintk console=ttyS0,115200 vmalloc=496M debug=7 initcall_debug=1 rootfstype=ext4,squashfs,jffs2" CONFIG_CMDLINE_FROM_BOOTLOADER=y CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_MEDIATEK=y diff --git a/root/target/linux/mediatek/patches-4.14/0228-arm-dts-mtk-bpi-r2-bootargs.patch b/root/target/linux/mediatek/patches-4.14/0228-arm-dts-mtk-bpi-r2-bootargs.patch new file mode 100644 index 00000000..9971abcf --- /dev/null +++ b/root/target/linux/mediatek/patches-4.14/0228-arm-dts-mtk-bpi-r2-bootargs.patch @@ -0,0 +1,12 @@ +Index: linux-4.14.51/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts +=================================================================== +--- linux-4.14.51.orig/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts ++++ linux-4.14.51/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts +@@ -19,6 +19,7 @@ + + chosen { + stdout-path = "serial2:115200n8"; ++ bootargs = "earlyprintk console=tty1 fbcon=map:0 console=ttyS0,115200 block2mtd.block2mtd=/dev/mmcblk1,65536,RootFs,5 mtdparts=RootFs:512k(mbr)ro,512k(uboot)ro,512k(config)ro,512k(factory)ro,32M(kernel),32M(recovery),1024M(rootfs),2048M(usrdata),-(bmtpool) block2mtd.block2mtd=/dev/mmcblk0,65536,eMMC,5 mtdparts=eMMC:512k(mbr)ro,512k(uboot)ro,512k(config)ro,512k(factory)ro,32M(kernel),32M(recovery),1024M(rootfs),2048M(usrdata),-(bmtpool) rootfstype=ext4,squashfs,jffs2"; + }; + + memory {