Finish converting CONFIG_WATCHDOG, HW_WATCHDOG and WDT to Kconfig

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

diff --git a/include/configs/display5.h b/include/configs/display5.h
index 40bb3b5..38ac869 100644 (file)
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -47,14 +47,6 @@
 
 #include "imx6_spl.h"
 
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN          (16 * 1024 * 1024)
-
 #define CONFIG_MXC_UART_BASE           UART5_BASE
 
 /* I2C Configs */
@@ -64,16 +56,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 
-#ifndef CONFIG_BOOTCOMMAND
-#define CONFIG_BOOTCOMMAND "if run check_em_pad; then " \
-            "run recovery;" \
-       "else if test ${BOOT_FROM} = FACTORY; then " \
-            "run factory_nfs;" \
-       "else " \
-            "run boot_mmc;" \
-       "fi;fi"
-#endif
-
 #define PARTS_DEFAULT \
        /* Linux partitions */ \
        "partitions=" \
@@ -208,7 +190,6 @@
        "altbootcmd=run recovery\0" \
        "bootdelay=1\0" \
        "baudrate=115200\0" \
-       "bootcmd=" CONFIG_BOOTCOMMAND "\0" \
        "ethact=FEC\0" \
        "netdev=eth0\0" \
        "boot_os=y\0" \
@@ -320,7 +301,6 @@
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
 #define CONFIG_STANDALONE_LOAD_ADDR    0x10001000
-#define CONFIG_SYS_HZ                  1000
 
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
@@ -334,13 +314,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-/* Watchdog */
-#if defined(CONFIG_SPL_BUILD)
-#undef CONFIG_WDT
-#undef CONFIG_WATCHDOG
-#define CONFIG_HW_WATCHDOG
-#endif
-
 /* ENV config */
 #ifdef CONFIG_ENV_IS_IN_SPI_FLASH
 /* The 0x120000 value corresponds to above SPI-NOR memory MAP */