cmd: Convert CONFIG_CMD_ELF to Kconfig

[platform/kernel/u-boot.git] / include / configs / lsxl.h

diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index 6c8e369..a57e328 100644 (file)
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -37,8 +37,6 @@
 #define CONFIG_MISC_INIT_R
 #define CONFIG_SHOW_BOOT_PROGRESS
 
-#define CONFIG_RANDOM_MACADDR
-#define CONFIG_LIB_RAND
 #define CONFIG_KIRKWOOD_GPIO
 #define CONFIG_OF_LIBFDT
 
@@ -55,9 +53,8 @@
 /*
  * Commands configuration
  */
-#include <config_cmd_default.h>
+#define CONFIG_CMD_BOOTZ
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_EXT2
 #define CONFIG_CMD_FAT
@@ -78,6 +75,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
@@ -87,7 +87,6 @@
 #define CONFIG_SF_DEFAULT_SPEED                25000000
 
 
-#undef CONFIG_SYS_PROMPT
 #define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 
 /*
@@ -125,27 +124,31 @@
        "hdpart=0:1\0"                                                  \
        "kernel_addr=0x00800000\0"                                      \
        "ramdisk_addr=0x01000000\0"                                     \
-       "fdt_addr=0x01ff0000\0"                                         \
+       "fdt_addr=0x00ff0000\0"                                         \
        "bootcmd_legacy=ide reset "                                     \
                "&& 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)           \