diff options
| author | Simon Glass <sjg@chromium.org> | 2017-01-23 13:31:27 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-25 17:38:45 -0500 |
| commit | a8523a808fd05e4b1c1df63bc40744dd3fd318f4 (patch) | |
| tree | cfd3c2411c94e762da5c76a25f37cec378c88373 | |
| parent | a009f36cfef6c4f60ce7f8d70e3ae8dd98537e30 (diff) | |
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>
| -rw-r--r-- | board/mpl/common/common_util.c | 9 | ||||
| -rw-r--r-- | board/mpl/common/common_util.h | 3 | ||||
| -rw-r--r-- | common/board_r.c | 13 | ||||
| -rw-r--r-- | include/common.h | 3 | ||||
| -rw-r--r-- | include/config_cmd_all.h | 1 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
6 files changed, 0 insertions, 30 deletions
diff --git a/board/mpl/common/common_util.c b/board/mpl/common/common_util.c index 101b6efd81..5ea5a5187b 100644 --- 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 22f5c2e6d8..127853d29b 100644 --- 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 419471cfb8..48fa4ee524 100644 --- 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 35ac78fede..fbbc2cbc52 100644 --- 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 0c4f645930..a0d4e94a04 100644 --- 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 fc98fe52f0..b32c260d32 100644 --- 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 |