Convert CONFIG_BOOTP_BOOTPATH et al to Kconfig

[people/ms/u-boot.git] / include / configs / lsxl.h

diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index bf5c1a1298285ce47dfc6a34c9a5745a31b68e41..624356afd369a0f5b3e84945cb2e25ed9b0e2d4c 100644 (file)
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -12,12 +12,10 @@
  * Version number information
  */
 #if defined(CONFIG_LSCHLV2)
-#define CONFIG_IDENT_STRING " LS-CHLv2"
 #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage-lschl.cfg
 #define CONFIG_MACH_TYPE 3006
 #define CONFIG_SYS_TCLK 166666667 /* 166 MHz */
 #elif defined(CONFIG_LSXHL)
-#define CONFIG_IDENT_STRING " LS-XHL"
 #define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage-lsxhl.cfg
 #define CONFIG_MACH_TYPE 2663
 /* CONFIG_SYS_TCLK is 200000000 by default */
@@ -35,40 +33,11 @@
 #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
-
-#define CONFIG_SYS_NO_FLASH
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
-
-/*
- * Enable u-boot API for standalone programs.
- */
-#define CONFIG_API
 
 /*
  * Commands configuration
  */
-#include <config_cmd_default.h>
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_ELF
-#define CONFIG_CMD_ENV
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_IDE
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_SF
-#define CONFIG_CMD_SPI
-#define CONFIG_CMD_USB
-#define CONFIG_CMD_FS_GENERIC
-
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
 
 /*
  * mv-common.h should be defined after CMD configs since it used them
@@ -76,28 +45,21 @@
  */
 #include "mv-common.h"
 
+/* loading initramfs images without uimage header */
+
 /* ST M25P40 */
-#undef CONFIG_SPI_FLASH_MACRONIX
-#define CONFIG_SPI_FLASH_STMICRO
 #undef CONFIG_ENV_SPI_MAX_HZ
 #define CONFIG_ENV_SPI_MAX_HZ          25000000
 #undef CONFIG_SF_DEFAULT_SPEED
 #define CONFIG_SF_DEFAULT_SPEED                25000000
 
-
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
-
 /*
  *  Environment variables configurations
  */
 #ifdef CONFIG_SPI_FLASH
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
 #define CONFIG_SYS_MAX_FLASH_SECT      8
-#define CONFIG_ENV_IS_IN_SPI_FLASH     1
 #define CONFIG_ENV_SECT_SIZE           0x10000 /* 64K */
-#else
-#define CONFIG_ENV_IS_NOWHERE
 #endif
 
 #define CONFIG_ENV_SIZE                        0x10000 /* 64k */
@@ -107,8 +69,6 @@
  * Default environment variables
  */
 #define CONFIG_LOADADDR                0x00800000
-#define CONFIG_BOOTCOMMAND     "run bootcmd_${bootsource}"
-#define CONFIG_BOOTARGS                "console=ttyS0,115200 root=/dev/sda2"
 
 #if defined(CONFIG_LSXHL)
 #define CONFIG_FDTFILE "kirkwood-lsxhl.dtb"
@@ -123,27 +83,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} 0x00100000 /uImage.buffalo "     \
-               "&& load ide ${hdpart} 0x00800000 /initrd.buffalo "     \
-               "&& bootm 0x00100000 0x00800000\0"                      \
-       "bootcmd_net=bootp ${kernel_addr} uImage "                      \
-               "&& tftpboot ${ramdisk_addr} uInitrd "                  \
+               "&& 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} 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)           \
@@ -157,7 +121,7 @@
        "standard_env=setenv ipaddr; setenv netmask; setenv serverip; " \
                "setenv ncip; setenv gatewayip; setenv ethact; "        \
                "setenv bootfile; setenv dnsip; "                       \
-               "setenv bootsource hdd; run ser\0"                      \
+               "setenv bootsource legacy; run ser\0"                   \
        "restore_env=run standard_env; saveenv; reset\0"                \
        "ser=setenv stdin serial; setenv stdout serial; "               \
                "setenv stderr serial\0"                                \
@@ -175,8 +139,7 @@
 #undef CONFIG_RESET_PHY_R
 #endif /* CONFIG_CMD_NET */
 
-#ifdef CONFIG_CMD_IDE
-#undef CONFIG_IDE_LED
+#ifdef CONFIG_IDE
 #undef CONFIG_SYS_IDE_MAXBUS
 #define CONFIG_SYS_IDE_MAXBUS          1
 #undef CONFIG_SYS_IDE_MAXDEVICE