Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

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

diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd
index 6679d679ab22c7e16ce60f32a2589cda2a1e7992..8cb8e5fc29a8213151eccc60554052bdfc885662 100644 (file)
--- a/config/u-boot/boot.cmd
+++ b/config/u-boot/boot.cmd
@@ -3,14 +3,12 @@ if test ${boot_dev} = ""; then
        setenv root_dev /dev/mmcblk0p3;
 fi;
 
-if test ${boot_part} = ""; then
-       setenv boot_part 0:1;
+if test ${dev_num} = ""; then
+       setenv dev_num 0;
 fi;
 
-if test ${soc} = "kirkwood"; then
-       setenv kernel_type kirkwood;
-else
-       setenv kernel_type multi;
+if test ${boot_part} = ""; then
+       setenv boot_part ${dev_num}:1;
 fi;
 
 # Import uEnv txt...
@@ -34,13 +32,25 @@ fi;
 if test "${SERIAL-CONSOLE}" = "ON"; then
        if test ${console} = ""; then
                if test "${board}" = "rpi"; then
-                       if test "${fdtfile}" = "bcm2837-rpi-3-b-plus.dtb"; then
-                               setenv console ttyS1,115200n8;
+                       if test ${cpu} = "armv8"; then
+                               if test "${fdtfile}" = "broadcom/bcm2837-rpi-3-b-plus.dtb"; then
+                                       setenv console ttyS1,115200n8;
+                               else
+                                       if test "${fdtfile}" = "broadcom/bcm2837-rpi-3-b.dtb"; then
+                                               setenv console ttyS1,115200n8;
+                                       else
+                                               setenv console ttyAMA0,115200n8;
+                                       fi;
+                               fi;
                        else
-                               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;
                        fi;
                else
@@ -55,17 +65,29 @@ else
 fi;
 
 setenv fdt_high ffffffff;
-fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}-ipfire-${kernel_type};
-fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}-ipfire-${kernel_type}/${fdtfile};
+fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}-ipfire${kernel_type};
+fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}-ipfire${kernel_type}/${fdtfile};
+
+if test "${FDTCMDS}" = ""; then
+       echo ;
+else
+       fdt addr ${fdt_addr_r};
+       run FDTCMDS;
+fi;
+
 setenv ramdisk_addr ${ramdisk_addr_r}
-if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire-${kernel_type}; then
+if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire${kernel_type}; then
        echo Ramdisk loaded...;
 else
        echo Ramdisk not loaded...;
        setenv ramdisk_addr -;
-fi ;
+fi;
+
 bootz ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r};
 booti ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r};
 
+bootz ${kernel_addr_r} - ${fdt_addr_r};
+booti ${kernel_addr_r} - ${fdt_addr_r};
+
 # Recompile with:
 # mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr