Merge tag 'v2021.01-rc5' into next

[platform/kernel/u-boot.git] / include / configs / km / keymile-common.h

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 5edc8f6..d321ebd 100644 (file)
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -1,99 +1,42 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2008-2011
  * Heiko Schocher, DENX Software Engineering, hs@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_KEYMILE_H
 #define __CONFIG_KEYMILE_H
 
-#define CONFIG_BOOTCOUNT_LIMIT
-
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_ASKENV
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_DEFAULTENV_VARS
-#define CONFIG_CMD_GREPENV
-#define CONFIG_CMD_IMMAP
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_I2C
-#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_MTDPARTS
-
-#undef CONFIG_WATCHDOG         /* disable platform specific watchdog */
-
-#define CONFIG_BOOTDELAY       2 /* autoboot after 2 seconds */
-#undef CONFIG_BOOTARGS         /* the boot command will set bootargs */
+#include <linux/stringify.h>
 
 /*
  * Miscellaneous configurable options
  */
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_LONGHELP                    /* undef to save memory   */
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE              1024    /* Console I/O Buffer Size */
 #else
 #define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size  */
 #endif
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS             32 /* max number of command args */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
 
 #define CONFIG_HUSH_INIT_VAR
 
-#define CONFIG_SYS_ALT_MEMTEST         /* memory test, takes time */
-
-#define CONFIG_BAUDRATE                        115200
 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define CONFIG_LOADS_ECHO
 #define CONFIG_SYS_LOADS_BAUD_CHANGE
 
-#define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_PROMPT "Hit <SPACE> key to stop autoboot in %2ds\n"
-#define CONFIG_AUTOBOOT_STOP_STR        " "
-
-/* Support the IVM EEprom */
-#define        CONFIG_SYS_IVM_EEPROM_ADR       0x50
-#define CONFIG_SYS_IVM_EEPROM_MAX_LEN  0x400
-#define CONFIG_SYS_IVM_EEPROM_PAGE_LEN 0x100
-
-#define        CONFIG_SYS_FLASH_PROTECTION
-
 /*
  * BOOTP options
  */
 #define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-
-/* UBI Support for all Keymile boards */
-#define CONFIG_CMD_UBI
-#define CONFIG_RBTREE
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_CONCAT
-
-#define CONFIG_CMD_CRAMFS
 
 #ifndef CONFIG_KM_DEF_ENV_BOOTPARAMS
 #define CONFIG_KM_DEF_ENV_BOOTPARAMS \
        "actual_bank=0\0"
 #endif
 
-#ifndef CONFIG_KM_DEF_NETDEV
-#define CONFIG_KM_DEF_NETDEV   \
-       "netdev=eth0\0"
-#endif
-
 #ifndef CONFIG_KM_UBI_PARTITION_NAME_BOOT
 #define CONFIG_KM_UBI_PARTITION_NAME_BOOT      "ubi0"
 #endif /* CONFIG_KM_UBI_PARTITION_NAME_BOOT */
@@ -144,12 +87,12 @@
                "set_fdthigh cramfsloadkernel flashargs add_default "   \
                "addpanic boot\0"                                       \
        "develop="                                                      \
-               "tftp 200000 scripts/develop-${arch}.txt && "           \
-               "env import -t 200000 ${filesize} && "                  \
+               "tftp ${load_addr_r} scripts/develop-${arch}.txt && "   \
+               "env import -t ${load_addr_r} ${filesize} && "          \
                "run setup_debug_env\0"                                 \
        "ramfs="                                                        \
-               "tftp 200000 scripts/ramfs-${arch}.txt && "             \
-               "env import -t 200000 ${filesize} && "                  \
+               "tftp ${load_addr_r} scripts/ramfs-${arch}.txt && "     \
+               "env import -t ${load_addr_r} ${filesize} && "          \
                "run setup_debug_env\0"                                 \
        ""
 
@@ -197,8 +140,7 @@
 #define CONFIG_KM_DEF_ENV_FLASH_BOOT                                   \
        "cramfsaddr=" __stringify(CONFIG_KM_CRAMFS_ADDR) "\0"           \
        "cramfsloadkernel=cramfsload ${load_addr_r} ${uimage}\0"        \
-       "ubicopy=ubi read "__stringify(CONFIG_KM_CRAMFS_ADDR)           \
-                       " bootfs${boot_bank}\0"                         \
+       "ubicopy=ubi read ${cramfsaddr} bootfs${boot_bank}\0"           \
        "uimage=" CONFIG_KM_UIMAGE_NAME                                 \
        CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI
 
@@ -214,12 +156,13 @@
        "pnvramsize=" __stringify(CONFIG_KM_PNVRAM) "\0"                \
        "testbootcmd=setenv boot_bank ${test_bank}; "                   \
                "run ${subbootcmds}; reset\0"                           \
+       "env_version=1\0"                                               \
        ""
 
 #ifndef CONFIG_KM_DEF_ENV
 #define CONFIG_KM_DEF_ENV      \
        CONFIG_KM_DEF_ENV_BOOTPARAMS                                    \
-       CONFIG_KM_DEF_NETDEV                                            \
+       "netdev=" __stringify(CONFIG_KM_DEF_NETDEV) "\0"                \
        CONFIG_KM_DEF_ENV_CPU                                           \
        CONFIG_KM_DEF_ENV_BOOTTARGETS                                   \
        CONFIG_KM_DEF_ENV_BOOTARGS                                      \
@@ -235,19 +178,16 @@
                "setenv altbootcmd \'setenv boot_bank ${backup_bank}; " \
                        "run ${subbootcmds}; reset\' && "               \
                "saveenv && saveenv && boot\0"                          \
-       "bootlimit=3\0"                                                 \
        "cramfsloadfdt="                                                \
                "cramfsload ${fdt_addr_r} "                             \
                "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0"             \
-       "fdt_addr_r="__stringify(CONFIG_KM_FDT_ADDR) "\0"               \
+       "fdt_addr_r=" __stringify(CONFIG_KM_FDT_ADDR) "\0"              \
        "init=/sbin/init-overlay.sh\0"                                  \
-       "load_addr_r="__stringify(CONFIG_KM_KERNEL_ADDR) "\0"           \
+       "load_addr_r=" __stringify(CONFIG_KM_KERNEL_ADDR) "\0"          \
        "load=tftpboot ${load_addr_r} ${u-boot}\0"                      \
-       "mtdids=" MTDIDS_DEFAULT "\0"                                   \
-       "mtdparts=" MTDPARTS_DEFAULT "\0"                               \
+       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"                                    \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"                                \
        ""
 #endif /* CONFIG_KM_DEF_ENV */
 
-#define CONFIG_VERSION_VARIABLE        /* include version env variable */
-
 #endif /* __CONFIG_KEYMILE_H */