Drop CONFIG_CMD_DOC

This is not used in U-Boot, and the only usage calls a non-existent
function. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/board/mpl/common/common_util.c b/board/mpl/common/common_util.c
index 101b6efd81ab5654863b6b93c7488354e312e739..5ea5a5187ba9bfe7810baedd1b9aef2c77b50fe1 100644 (file)
--- a/board/mpl/common/common_util.c
+++ b/board/mpl/common/common_util.c
@@ -622,15 +622,6 @@ int do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        return cmd_usage(cmdtp);
 }
 
-
-#if defined(CONFIG_CMD_DOC)
-void doc_init (void)
-{
-  doc_probe(MULTI_PURPOSE_SOCKET_ADDR);
-}
-#endif
-
-
 #ifdef CONFIG_VIDEO
 /******************************************************
  * Routines to display the Board information

diff --git a/board/mpl/common/common_util.h b/board/mpl/common/common_util.h
index 22f5c2e6d8b0d0a2d683635319b0b788715be200..127853d29b64b346934308f1572ce17efc596c45 100644 (file)
--- a/board/mpl/common/common_util.h
+++ b/board/mpl/common/common_util.h
@@ -23,8 +23,5 @@ int get_boot_mode(void);
 void setup_cs_reloc(void);
 
 void check_env(void);
-#if defined(CONFIG_CMD_DOC)
-void doc_init (void);
-#endif
 
 #endif /* _COMMON_UTIL_H_ */

diff --git a/common/board_r.c b/common/board_r.c
index 419471cfb8f4bc3af5b7976892fa3afc75db11a9..48fa4ee52406df7a5fe874b14366c8d81fb67379 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -619,15 +619,6 @@ static int initr_scsi(void)
 }
 #endif
 
-#if defined(CONFIG_CMD_DOC)
-static int initr_doc(void)
-{
-       puts("DOC:   ");
-       doc_init();
-       return 0;
-}
-#endif
-
 #ifdef CONFIG_BITBANGMII
 static int initr_bbmii(void)
 {
@@ -913,10 +904,6 @@ init_fnc_t init_sequence_r[] = {
        INIT_FUNC_WATCHDOG_RESET
        initr_scsi,
 #endif
-#ifdef CONFIG_CMD_DOC
-       INIT_FUNC_WATCHDOG_RESET
-       initr_doc,
-#endif
 #ifdef CONFIG_BITBANGMII
        initr_bbmii,
 #endif

diff --git a/include/common.h b/include/common.h
index 35ac78fede1986ea0f89cbec5a96ba6c5875d73a..fbbc2cbc521a8d51c70ca2436ec8786f0169b97c 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -346,9 +346,6 @@ extern ulong load_addr;             /* Default Load Address */
 extern ulong save_addr;                /* Default Save Address */
 extern ulong save_size;                /* Default Save Size */
 
-/* common/cmd_doc.c */
-void   doc_probe(unsigned long physadr);
-
 /* common/cmd_net.c */
 int do_tftpb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 

diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index 0c4f645930112b9422441a9f36e037e196ebaf23..a0d4e94a048c3f3b9ae0043990dbca6b247a24c3 100644 (file)
--- a/include/config_cmd_all.h
+++ b/include/config_cmd_all.h
@@ -20,7 +20,6 @@
 #define CONFIG_CMD_DATE                /* support for RTC, date/time...*/
 #define CONFIG_CMD_DIAG                /* Diagnostics                  */
 #define CONFIG_CMD_DISPLAY     /* Display support              */
-#define CONFIG_CMD_DOC         /* Disk-On-Chip Support         */
 #define CONFIG_CMD_DTT         /* Digital Therm and Thermostat */
 #define CONFIG_CMD_EEPROM      /* EEPROM read/write support    */
 #define CONFIG_CMD_FDC         /* Floppy Disk Support          */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index fc98fe52f096418345cf8d3d242ad4a1a3769c63..b32c260d321611367135acf5f229d725c09b35db 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -489,7 +489,6 @@ CONFIG_CMD_DEKBLOB
 CONFIG_CMD_DFL
 CONFIG_CMD_DIAG
 CONFIG_CMD_DISPLAY
-CONFIG_CMD_DOC
 CONFIG_CMD_DS4510
 CONFIG_CMD_DS4510_INFO
 CONFIG_CMD_DS4510_MEM