From 27d1d567f306cfd351911e49c4b70a54da55c4df Mon Sep 17 00:00:00 2001
From: Ycarus <ycarus@zugaina.org>
Date: Fri, 14 Sep 2018 14:54:01 +0200
Subject: [PATCH] Remove bootargs in DTS, should make emmc bootable

---
 root/target/linux/mediatek/mt7623/config-4.14 | 28 +++++++++++++++----
 .../0228-arm-dts-mtk-bpi-r2-bootargs.patch    | 12 --------
 2 files changed, 22 insertions(+), 18 deletions(-)
 delete mode 100644 root/target/linux/mediatek/patches-4.14/0228-arm-dts-mtk-bpi-r2-bootargs.patch

diff --git a/root/target/linux/mediatek/mt7623/config-4.14 b/root/target/linux/mediatek/mt7623/config-4.14
index 60ba85a5..e43614eb 100644
--- a/root/target/linux/mediatek/mt7623/config-4.14
+++ b/root/target/linux/mediatek/mt7623/config-4.14
@@ -27,13 +27,16 @@ CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+# CONFIG_ARCH_WANTS_THP_SWAP is not set
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_ARM=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
-# CONFIG_ARM_ATAG_DTB_COMPAT is not set
+CONFIG_ARM_ATAG_DTB_COMPAT=y
+# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
+CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
 CONFIG_ARM_CPU_SUSPEND=y
 # CONFIG_ARM_CPU_TOPOLOGY is not set
 CONFIG_ARM_GIC=y
@@ -115,6 +118,7 @@ CONFIG_CPU_RMAP=y
 CONFIG_CPU_THUMB_CAPABLE=y
 CONFIG_CPU_TLB_V7=y
 CONFIG_CPU_V7=y
+CONFIG_CRASH_CORE=y
 CONFIG_CRC16=y
 # CONFIG_CRC32_SARWATE is not set
 CONFIG_CRC32_SLICEBY8=y
@@ -167,14 +171,20 @@ CONFIG_DEBUG_UART_PHYS=0x11004000
 CONFIG_DEBUG_UART_VIRT=0xf1004000
 CONFIG_DEBUG_UNCOMPRESS=y
 # CONFIG_DEBUG_USER is not set
+CONFIG_DEFAULT_DUMMY=y
+CONFIG_DEFAULT_SCHEDULER=y
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
+# CONFIG_DMA_NOOP_OPS is not set
 CONFIG_DMA_OF=y
+# CONFIG_DMA_VIRT_OPS is not set
+# CONFIG_DRM_LIB_RANDOM is not set
 CONFIG_DTC=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_ELF_CORE=y
+CONFIG_EXPORTFS=y
 CONFIG_EXT4_FS=y
 # CONFIG_F2FS_CHECK_FS is not set
 CONFIG_F2FS_FS=y
@@ -185,6 +195,7 @@ CONFIG_FIXED_PHY=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_FREEZER=y
 CONFIG_FS_MBCACHE=y
+CONFIG_FUTEX_PI=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
@@ -266,6 +277,7 @@ CONFIG_HWMON=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_MTK=y
 CONFIG_HZ_FIXED=0
+CONFIG_HZ_PERIODIC=y
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
@@ -289,6 +301,8 @@ CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_IRQ_WORK=y
 CONFIG_JBD2=y
 CONFIG_KALLSYMS=y
+CONFIG_KEXEC=y
+CONFIG_KEXEC_CORE=y
 CONFIG_LEDS_MT6323=y
 CONFIG_LIBFDT=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
@@ -321,6 +335,11 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 # CONFIG_MMC_TIFM_SD is not set
 CONFIG_MODULES_USE_ELF_REL=y
+# CONFIG_MPTCP_BINDER is not set
+# CONFIG_MPTCP_FULLMESH is not set
+# CONFIG_MPTCP_NDIFFPORTS is not set
+# CONFIG_MPTCP_REDUNDANT is not set
+# CONFIG_MPTCP_ROUNDROBIN is not set
 CONFIG_MTD_BLOCK2MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_M25P80=y
@@ -393,9 +412,6 @@ CONFIG_NET_VENDOR_MEDIATEK=y
 CONFIG_NL80211_TESTMODE=y
 CONFIG_NLS=y
 CONFIG_NO_BOOTMEM=y
-# CONFIG_NO_HZ is not set
-# CONFIG_NO_HZ_COMMON is not set
-# CONFIG_NO_HZ_IDLE is not set
 CONFIG_NR_CPUS=4
 CONFIG_NVMEM=y
 CONFIG_OF=y
@@ -509,6 +525,7 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_OF=y
+CONFIG_THIN_ARCHIVES=y
 # CONFIG_THUMB2_KERNEL is not set
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TIMER_OF=y
@@ -524,8 +541,7 @@ CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_USB=y
 CONFIG_USB_COMMON=y
 # CONFIG_USB_EHCI_HCD is not set
-CONFIG_USB_MTU3=y
-# CONFIG_USB_MTU3_DEBUG is not set
+# CONFIG_USB_MTU3 is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_MTK=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
deleted file mode 100644
index 5ee8306a..00000000
--- a/root/target/linux/mediatek/patches-4.14/0228-arm-dts-mtk-bpi-r2-bootargs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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) rootfstype=squashfs,ext4,jffs2";
- 	};
- 
- 	memory {