Merge remote-tracking branch 'origin/master' into aarch64

[ipfire-2.x.git] / config / u-boot / boot.cmd

diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd
index d740e756e695e9fb89b3018cc7959919d8292908..6679d679ab22c7e16ce60f32a2589cda2a1e7992 100644 (file)
--- a/config/u-boot/boot.cmd
+++ b/config/u-boot/boot.cmd
@@ -34,10 +34,14 @@ fi;
 if test "${SERIAL-CONSOLE}" = "ON"; then
        if test ${console} = ""; then
                if test "${board}" = "rpi"; then
-                       if test "${fdtfile}" = "bcm2837-rpi-3-b.dtb"; then
+                       if test "${fdtfile}" = "bcm2837-rpi-3-b-plus.dtb"; then
                                setenv console ttyS1,115200n8;
                        else
-                               setenv console ttyAMA0,115200n8;
+                               if test "${fdtfile}" = "bcm2837-rpi-3-b.dtb"; then
+                                       setenv console ttyS1,115200n8;
+                               else
+                                       setenv console ttyAMA0,115200n8;
+                               fi;
                        fi;
                else
                        setenv console ttyS0,115200n8;
@@ -61,6 +65,7 @@ else
        setenv ramdisk_addr -;
 fi ;
 bootz ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r};
+booti ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r};
 
 # Recompile with:
 # mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr