forked from rpms/kernel
		
	Linux v4.14-rc6
This commit is contained in:
		
							parent
							
								
									98fdf67b15
								
							
						
					
					
						commit
						679cf2a896
					
				| @ -1,41 +1,3 @@ | ||||
| From a92507095467d77f4fd05f54ae8d299459c2c3a3 Mon Sep 17 00:00:00 2001 | ||||
| From: Peter Robinson <pbrobinson@gmail.com> | ||||
| Date: Sun, 10 Sep 2017 19:29:23 +0100 | ||||
| Subject: [PATCH 1/2] ARM: dts: bcm283x: Use stdout-path instead of console | ||||
|  bootarg | ||||
| 
 | ||||
| Add the serial port config to "chosen/stdout-path". | ||||
| Create serial0/1 aliases referring to uart0 ant uart1 paths. | ||||
| Remove unneeded earlyprintk. | ||||
| 
 | ||||
| Signed-off-by: Loic Poulain <loic.poulain@xxxxxxxxx> | ||||
| Signed-off-by: Peter Robinson <pbrobinson@gmail.com> | ||||
| ---
 | ||||
|  arch/arm/boot/dts/bcm283x.dtsi | 7 ++++++- | ||||
|  1 file changed, 6 insertions(+), 1 deletion(-) | ||||
| 
 | ||||
| diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
 | ||||
| index 431dcfc900c0..013431e3d7c3 100644
 | ||||
| --- a/arch/arm/boot/dts/bcm283x.dtsi
 | ||||
| +++ b/arch/arm/boot/dts/bcm283x.dtsi
 | ||||
| @@ -20,8 +20,13 @@
 | ||||
|  	#address-cells = <1>; | ||||
|  	#size-cells = <1>; | ||||
|   | ||||
| +	aliases {
 | ||||
| +		serial0 = &uart0;
 | ||||
| +		serial1 = &uart1;
 | ||||
| +	};
 | ||||
| +
 | ||||
|  	chosen { | ||||
| -		bootargs = "earlyprintk console=ttyAMA0";
 | ||||
| +		stdout-path = "serial0:115200n8";
 | ||||
|  	}; | ||||
|   | ||||
|  	thermal-zones { | ||||
| -- 
 | ||||
| 2.13.5 | ||||
| 
 | ||||
| From 50252c318fe2fcfcbd0832fa835e7fd1fafd7d2d Mon Sep 17 00:00:00 2001 | ||||
| From: Peter Robinson <pbrobinson@gmail.com> | ||||
| Date: Sun, 10 Sep 2017 19:30:02 +0100 | ||||
| @ -57,18 +19,6 @@ diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-r | ||||
| index 20725ca487f3..e4488cb3067e 100644
 | ||||
| --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
 | ||||
| +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
 | ||||
| @@ -8,6 +8,11 @@
 | ||||
|  	compatible = "raspberrypi,3-model-b", "brcm,bcm2837"; | ||||
|  	model = "Raspberry Pi 3 Model B"; | ||||
|   | ||||
| +	chosen {
 | ||||
| +		/* 8250 auxiliar UART instead of pl011 */
 | ||||
| +		stdout-path = "serial1:115200n8";
 | ||||
| +	};
 | ||||
| +
 | ||||
|  	memory { | ||||
|  		reg = <0 0x40000000>; | ||||
|  	}; | ||||
| @@ -24,6 +29,11 @@
 | ||||
|  	pinctrl-names = "default"; | ||||
|  	pinctrl-0 = <&uart0_gpio32 &gpclk2_gpio43>; | ||||
|  | ||||
| @ -67,9 +67,9 @@ Summary: The Linux kernel | ||||
| # The next upstream release sublevel (base_sublevel+1) | ||||
| %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) | ||||
| # The rc snapshot level | ||||
| %global rcrev 5 | ||||
| %global rcrev 6 | ||||
| # The git snapshot level | ||||
| %define gitrev 4 | ||||
| %define gitrev 0 | ||||
| # Set rpm version accordingly | ||||
| %define rpmversion 4.%{upstream_sublevel}.0 | ||||
| %endif | ||||
| @ -638,7 +638,7 @@ Patch335: arm-exynos-fix-usb3.patch | ||||
| Patch502: CVE-2017-7477.patch | ||||
| 
 | ||||
| # rhbz 1498016 1498017 | ||||
| Patch503: KEYS-don-t-let-add_key-update-an-uninstantiated-key.patch | ||||
| #Patch503: KEYS-don-t-let-add_key-update-an-uninstantiated-key.patch | ||||
| 
 | ||||
| # 600 - Patches for improved Bay and Cherry Trail device support | ||||
| # Below patches are submitted upstream, awaiting review / merging | ||||
| @ -2212,6 +2212,9 @@ fi | ||||
| # | ||||
| # | ||||
| %changelog | ||||
| * Mon Oct 23 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc6.git0.1 | ||||
| - Linux v4.14-rc6 | ||||
| 
 | ||||
| * Mon Oct 23 2017 Justin M. Forbes <jforbes@fedoraproject.org> | ||||
| - Disable debugging options. | ||||
| 
 | ||||
|  | ||||
							
								
								
									
										3
									
								
								sources
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								sources
									
									
									
									
									
								
							| @ -1,4 +1,3 @@ | ||||
| SHA512 (linux-4.13.tar.xz) = a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2 | ||||
| SHA512 (perf-man-4.13.tar.gz) = 9bcc2cd8e56ec583ed2d8e0b0c88e7a94035a1915e40b3177bb02d6c0f10ddd4df9b097b1f5af59efc624226b613e240ddba8ddc2156f3682f992d5455fc5c03 | ||||
| SHA512 (patch-4.14-rc5.xz) = 1b09fa9e2fae3b6ac172b2f130a84c9a1ea7c6ea89e0b799013814216dd0c5ba7eeae5b0abcd7dad289fd695abc5663b5fdd92cb7993729c52c08c538b73ace2 | ||||
| SHA512 (patch-4.14-rc5-git4.xz) = d8d992d3e244c27318807dcf1079f47f4de7db3f5fd695fc1006f78e0120eba3813aadaba4ff9ccbd5c4d5a63c763381eef1db8502b33ec3815fbbb8660c45b8 | ||||
| SHA512 (patch-4.14-rc6.xz) = f10d13b0bd4f5e3bf295d4ef779cf358011e05c124b06277fef8afcf1a591b147f62717f0128866412fdd7ddddd660c0ae4b82b02b95702f10aabf50292c0ae7 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user