This pull request brings in a fix for default serial console setup on

RPi3, so it now comes up with no config.txt/cmdline.txt settings in
 the firmware.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE/JuuFDWp9/ZkuCBXtdYpNtH8nugFAlnX+yoACgkQtdYpNtH8
 nui1EA/+I731RqdL+jbZdsw3/f0QWZeIL9iUvQmdi0XYpqd7PjK/CptDadY4vmwS
 XNqcfI9B6HAa7pj3skP5zOFkrdp/h4pfIvQ2IcsXEUTd0O0C82aI7R+CaaY9WC++
 p6xlowYggSiw86Mkr/5Azbg/+zU6ZQWKnNeI+gpKGe84Ze5+r91zYjgz4t86+sVJ
 2m2E06rBQsYvIS/YA+otfmDIIiUcC/2ads11WmC6Cufx8bOxEdOrLaoiwUwHHYRY
 SRCyupkkDggUVZUTTFp1DNRfXbfiMBJuEKOMCulhVIXPEKGWYorg5ywdk3TodyFl
 /G05HigHCLsb9S8QOajRFzp/mgzXU0WxdkEmAlaTspKU4MGdQ24WdcG5HYxJPovE
 acdsvPjmDdPTb3+mRhvbMgcdmkkT5+KHYmjlV51CHyn9wB0gH9uhoYj+orz1ksTb
 fx/0pzkGOqMW4gJ+/0aJPjQ4H1QTTbPSiKgm1dvwsivSXOJuabPrsCRP99xaZ0UY
 Utns2Ok3uL4MT0mRjO6cWOcU9eo+ZgaXFYTFgcgFvZ7lAAJpX0FGOTQyKngg0gjZ
 5J5Lu8C56COe5PAwakgsvhgXQpVOYC1DsGmhY4VxJI9aIz62FW8WgrtvDA36cuS6
 3pwrf7I2uMJKZDAMy4OeXV1OBm+DQXgaR2tari3lSrJFZyweKnE=
 =5wQi
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJZ2AD3AAoJEIfQlpxEBwcEeLEQAL+3RPM4igNyJlYV8m2s5UmA
 xYj3ek3FMTo23AZHA5Vs5o3EPliMyAcwak1yEPfYRIVOmjr0MJ0Eo/goFcj/XQzX
 8X5Du0MqahrgEyYN7IN1y9dAdcEH4XOaV4MAtzH58GGPr56FsekpER3iSmpti7y2
 5im/UnYvYUkjhbp8DcOBhigN8XhygOwApRWVREPxGCIoNaXaj+zI2ntz3X1/GMhI
 ufASi/VPu9dVa95VR10MBpC2Dbrm050gVQKSNcOjvgy950Djjft+XeIe41ge2zUH
 XMIVMpNT+ybgdME6DBbEc4nNfhcZMhDtsibd7P6GNEM2vsg27xkPoBy2GXPrn0IP
 HDb0lbMvEhiqgbuBiKe1djkgOMma9JtuvhgNmRxOh2uOH41RtF9bP+ny52gpEf0g
 N4FRoqCdfhXhgWobg/msvx3tnoDjKpneHNukXKpl7fAGhiY/Uj8mtKKJBcJiKwkO
 PgO/JPQHPPWA7BouP5wgKNuGVp3isM5UxGdSPRV6EL6uNYVBNAJOU2uOcIpia5G6
 Jy2j8ry4qYsH+nBj3QuM16DjKHm9GVPVnMAQkLRC4hObiY54d0PHGsj3gpDS967j
 M8A+pvNPS3RzAoc8gX+t8/63cGy+/j5STkgF5UPxxqzzfwJyaNaSj5xs8Ww3Ao7f
 cWnuHctDP974RwxrXddJ
 =pMRq
 -----END PGP SIGNATURE-----

Merge tag 'bcm2835-dt-fixes-2017-10-06' into devicetree/next

This pull request brings in a fix for default serial console setup on
RPi3, so it now comes up with no config.txt/cmdline.txt settings in
the firmware.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
This commit is contained in:
Florian Fainelli 2017-10-06 15:17:19 -07:00
commit 2e7a84aadd
3 changed files with 14 additions and 7 deletions

View File

@ -18,12 +18,9 @@ / {
compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";
model = "Raspberry Pi Zero W";
/* Needed by firmware to properly init UARTs */
aliases {
uart0 = "/soc/serial@7e201000";
uart1 = "/soc/serial@7e215040";
serial0 = "/soc/serial@7e201000";
serial1 = "/soc/serial@7e215040";
chosen {
/* 8250 auxiliary UART instead of pl011 */
stdout-path = "serial1:115200n8";
};
leds {

View File

@ -8,6 +8,11 @@ / {
compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
model = "Raspberry Pi 3 Model B";
chosen {
/* 8250 auxiliary UART instead of pl011 */
stdout-path = "serial1:115200n8";
};
memory {
reg = <0 0x40000000>;
};

View File

@ -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 {