lsxl: switch from bootm to bootz for boot commands

[karo-tx-uboot.git] / include / configs / lsxl.h

diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index dff90250a01939d86e5cc6215a47298f924af2aa..c354c292960ad511049e4acbe4f0fac5ee673d1d 100644 (file)
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -56,6 +56,7 @@
  * Commands configuration
  */
 #include <config_cmd_default.h>
+#define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_ENV
@@ -78,6 +79,9 @@
  */
 #include "mv-common.h"
 
+/* loading initramfs images without uimage header */
+#define CONFIG_SUPPORT_RAW_INITRD
+
 /* ST M25P40 */
 #undef CONFIG_SPI_FLASH_MACRONIX
 #define CONFIG_SPI_FLASH_STMICRO
@@ -130,22 +134,26 @@
                "&& load ide ${hdpart} ${kernel_addr} /uImage.buffalo " \
                "&& load ide ${hdpart} ${ramdisk_addr} /initrd.buffalo "\
                "&& bootm ${kernel_addr} ${ramdisk_addr}\0"             \
-       "bootcmd_net=bootp ${kernel_addr} uImage "                      \
-               "&& tftpboot ${ramdisk_addr} uInitrd "                  \
+       "bootcmd_net=bootp ${kernel_addr} vmlinuz "                     \
+               "&& tftpboot ${ramdisk_addr} initrd.img "               \
+               "&& setenv ramdisk_len ${filesize} "                    \
                "&& tftpboot ${fdt_addr} " CONFIG_FDTFILE " "           \
-               "&& bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0" \
+               "&& bootz ${kernel_addr} "                              \
+                       "${ramdisk_addr}:${ramdisk_len} ${fdt_addr}\0"  \
        "bootcmd_hdd=ide reset "                                        \
-               "&& load ide ${hdpart} ${kernel_addr} /uImage "         \
-               "&& load ide ${hdpart} ${ramdisk_addr} /uInitrd "       \
-               "&& load ide ${hdpart} ${fdt_addr} "                    \
-                       "/" CONFIG_FDTFILE " "                          \
-               "&& bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0" \
+               "&& load ide ${hdpart} ${kernel_addr} /vmlinuz "        \
+               "&& load ide ${hdpart} ${ramdisk_addr} /initrd.img "    \
+               "&& setenv ramdisk_len ${filesize} "                    \
+               "&& load ide ${hdpart} ${fdt_addr} /dtb "               \
+               "&& bootz ${kernel_addr} "                              \
+                       "${ramdisk_addr}:${ramdisk_len} ${fdt_addr}\0"  \
        "bootcmd_usb=usb start "                                        \
-               "&& load usb 0:1 ${kernel_addr} /uImage "               \
-               "&& load usb 0:1 ${ramdisk_addr} /uInitrd "             \
-               "&& load usb 0:1 ${fdt_addr} "                          \
-                       "/" CONFIG_FDTFILE " "                          \
-               "&& bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0" \
+               "&& load usb 0:1 ${kernel_addr} /vmlinuz "              \
+               "&& load usb 0:1 ${ramdisk_addr} /initrd.img "          \
+               "&& setenv ramdisk_len ${filesize} "                    \
+               "&& load usb 0:1 ${fdt_addr} " CONFIG_FDTFILE " "       \
+               "&& bootz ${kernel_addr} "                              \
+                       "${ramdisk_addr}:${ramdisk_len} ${fdt_addr}\0"  \
        "bootcmd_rescue=run config_nc_dhcp; run nc\0"                   \
        "eraseenv=sf probe 0 "                                          \
                "&& sf erase " __stringify(CONFIG_ENV_OFFSET)           \