common: delete CONFIG_SYS_64BIT_VSPRINTF and CONFIG_SYS_64BIT_STRTOUL

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

diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
index e0be07b..0fbd8f4 100644 (file)
--- a/include/configs/bfin_adi_common.h
+++ b/include/configs/bfin_adi_common.h
@@ -12,6 +12,13 @@
 # include <config_cmd_default.h>
 # if ADI_CMDS_NETWORK
 #  define CONFIG_CMD_DHCP
+#  define CONFIG_BOOTP_SUBNETMASK
+#  define CONFIG_BOOTP_GATEWAY
+#  define CONFIG_BOOTP_DNS
+#  define CONFIG_BOOTP_NTPSERVER
+#  define CONFIG_BOOTP_RANDOM_DELAY
+#  define CONFIG_KEEP_SERVERADDR
+#  define CONFIG_CMD_DNS
 #  define CONFIG_CMD_PING
 #  ifdef CONFIG_BFIN_MAC
 #   define CONFIG_CMD_MII
@@ -38,11 +45,17 @@
 #  define CONFIG_CMD_USB_STORAGE
 #  define CONFIG_DOS_PARTITION
 # endif
+# ifdef CONFIG_NAND_PLAT
+#  define CONFIG_CMD_NAND
+# endif
 # ifdef CONFIG_POST
 #  define CONFIG_CMD_DIAG
 # endif
 # ifdef CONFIG_RTC_BFIN
 #  define CONFIG_CMD_DATE
+#  if ADI_CMDS_NETWORK
+#   define CONFIG_CMD_SNTP
+#  endif
 # endif
 # ifdef CONFIG_SPI
 #  define CONFIG_CMD_EEPROM
@@ -71,6 +84,7 @@
 # define CONFIG_CMD_STRINGS
 # if defined(__ADSPBF51x__) || defined(__ADSPBF52x__) || defined(__ADSPBF54x__)
 #  define CONFIG_CMD_OTP
+#  define CONFIG_CMD_SPIBOOTLDR
 # endif
 #endif
 
@@ -102,22 +116,37 @@
 #else
 # define CONFIG_BOOTDELAY      5
 #endif
-#define CONFIG_BOOTCOMMAND     "run ramboot"
+#ifndef CONFIG_BOOTCOMMAND
+# define CONFIG_BOOTCOMMAND    "run ramboot"
+#endif
 #ifdef CONFIG_VIDEO
 # define CONFIG_BOOTARGS_VIDEO "console=tty0 "
 #else
 # define CONFIG_BOOTARGS_VIDEO ""
 #endif
+#ifndef CONFIG_BOOTARGS_ROOT
+# define CONFIG_BOOTARGS_ROOT "/dev/mtdblock0 rw"
+#endif
 #define CONFIG_BOOTARGS        \
-       "root=/dev/mtdblock0 rw " \
+       "root=" CONFIG_BOOTARGS_ROOT " " \
        "clkin_hz=" MK_STR(CONFIG_CLKIN_HZ) " " \
        "earlyprintk=" \
                "serial," \
                "uart" MK_STR(CONFIG_UART_CONSOLE) "," \
                MK_STR(CONFIG_BAUDRATE) " " \
        CONFIG_BOOTARGS_VIDEO \
-       "console=ttyBF0," MK_STR(CONFIG_BAUDRATE)
-
+       "console=ttyBF" MK_STR(CONFIG_UART_CONSOLE) "," MK_STR(CONFIG_BAUDRATE)
+#if defined(CONFIG_CMD_NAND)
+# define NAND_ENV_SETTINGS \
+       "nandargs=set bootargs " CONFIG_BOOTARGS "\0" \
+       "nandboot=" \
+               "nand read $(loadaddr) 0x20000 0x100000;" \
+               "run nandargs;" \
+               "bootm" \
+               "\0"
+#else
+# define NAND_ENV_SETTINGS
+#endif
 #if defined(CONFIG_CMD_NET)
 # if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS)
 #  define UBOOT_ENV_FILE "u-boot.bin"
@@ -141,8 +170,8 @@
                "nand write $(loadaddr) 0 0x40000"
 # else
 #  define UBOOT_ENV_UPDATE \
-               "protect off 0x20000000 0x2003FFFF;" \
-               "erase 0x20000000 0x2003FFFF;" \
+               "protect off 0x20000000 +$(filesize);" \
+               "erase 0x20000000 +$(filesize);" \
                "cp.b $(loadaddr) 0x20000000 $(filesize)"
 # endif
 # define NETWORK_ENV_SETTINGS \
@@ -155,19 +184,23 @@
                "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):" \
                   "$(hostname):eth0:off" \
                "\0" \
+       \
+       "ramfile=uImage\0" \
        "ramargs=set bootargs " CONFIG_BOOTARGS "\0" \
        "ramboot=" \
-               "tftp $(loadaddr) uImage;" \
+               "tftp $(loadaddr) $(ramfile);" \
                "run ramargs;" \
                "run addip;" \
                "bootm" \
                "\0" \
+       \
+       "nfsfile=vmImage\0" \
        "nfsargs=set bootargs " \
                "root=/dev/nfs rw " \
                "nfsroot=$(serverip):$(rootpath),tcp,nfsvers=3" \
                "\0" \
        "nfsboot=" \
-               "tftp $(loadaddr) vmImage;" \
+               "tftp $(loadaddr) $(nfsfile);" \
                "run nfsargs;" \
                "run addip;" \
                "bootm" \
@@ -176,6 +209,7 @@
 # define NETWORK_ENV_SETTINGS
 #endif
 #define CONFIG_EXTRA_ENV_SETTINGS \
+       NAND_ENV_SETTINGS \
        NETWORK_ENV_SETTINGS \
        "flashboot=bootm 0x20100000\0"
 
@@ -196,4 +230,9 @@
 # define CONFIG_NET_RETRY_COUNT 20
 #endif
 
+/*
+ * Misc Settings
+ */
+#define CONFIG_LZMA
+
 #endif