mirror of
				https://github.com/Ysurac/openmptcprouter.git
				synced 2025-03-09 15:40:20 +00:00 
			
		
		
		
	Merge branch 'master' of https://github.com/Ysurac/openmptcprouter
This commit is contained in:
		
						commit
						5a74e146f0
					
				
					 2 changed files with 20 additions and 9 deletions
				
			
		| 
						 | 
				
			
			@ -57,6 +57,7 @@ CONFIG_ATAGS_PROC=y
 | 
			
		|||
CONFIG_AUTO_ZRELADDR=y
 | 
			
		||||
CONFIG_BLK_DEV_LOOP=y
 | 
			
		||||
CONFIG_BLK_MQ_PCI=y
 | 
			
		||||
CONFIG_BOUNCE=y
 | 
			
		||||
# CONFIG_CACHE_L2X0 is not set
 | 
			
		||||
CONFIG_CC_STACKPROTECTOR=y
 | 
			
		||||
# CONFIG_CC_STACKPROTECTOR_NONE is not set
 | 
			
		||||
| 
						 | 
				
			
			@ -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 vmalloc=496M"
 | 
			
		||||
CONFIG_CMDLINE="earlyprintk console=ttyS0,115200 vmalloc=476M"
 | 
			
		||||
CONFIG_CMDLINE_EXTEND=y
 | 
			
		||||
CONFIG_COMMON_CLK=y
 | 
			
		||||
CONFIG_COMMON_CLK_MEDIATEK=y
 | 
			
		||||
| 
						 | 
				
			
			@ -270,7 +271,7 @@ CONFIG_HAVE_SMP=y
 | 
			
		|||
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 | 
			
		||||
CONFIG_HAVE_UID16=y
 | 
			
		||||
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 | 
			
		||||
# CONFIG_HIGHMEM is not set
 | 
			
		||||
CONFIG_HIGHMEM=y
 | 
			
		||||
# CONFIG_HIGHPTE is not set
 | 
			
		||||
CONFIG_HOTPLUG_CPU=y
 | 
			
		||||
CONFIG_HWMON=y
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,13 +1,23 @@
 | 
			
		|||
Index: linux-4.9.44/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
 | 
			
		||||
===================================================================
 | 
			
		||||
--- linux-4.9.44.orig/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts	2017-09-02 08:21:11.998199513 +0800
 | 
			
		||||
+++ linux-4.9.44/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts	2017-09-02 08:33:09.452252584 +0800
 | 
			
		||||
@@ -18,7 +18,7 @@
 | 
			
		||||
--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts	2018-12-26 16:53:06.778501203 +0100
 | 
			
		||||
+++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts	2018-12-26 16:55:46.280213376 +0100
 | 
			
		||||
@@ -22,6 +22,7 @@
 | 
			
		||||
 	};
 | 
			
		||||
 */
 | 
			
		||||
 
 | 
			
		||||
 	memory {
 | 
			
		||||
-		reg = <0 0x80000000 0 0x20000000>;
 | 
			
		||||
+		device_type = "memory";
 | 
			
		||||
+		reg = <0 0x80000000 0 0x80000000>;
 | 
			
		||||
 	};
 | 
			
		||||
 
 | 
			
		||||
 	aliases {
 | 
			
		||||
@@ -115,11 +116,6 @@
 | 
			
		||||
 		};
 | 
			
		||||
 	};
 | 
			
		||||
 
 | 
			
		||||
-	memory@80000000 {
 | 
			
		||||
-		device_type = "memory";
 | 
			
		||||
-		reg = <0 0x80000000 0 0x40000000>;
 | 
			
		||||
-	};
 | 
			
		||||
-
 | 
			
		||||
 	mt7530: switch@0 {
 | 
			
		||||
 		compatible = "mediatek,mt7530";
 | 
			
		||||
 	};
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue