summaryrefslogtreecommitdiff
path: root/common/Makefile
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-05-09 02:14:34 (GMT)
committerTom Rini <trini@konsulko.com>2017-05-12 12:37:33 (GMT)
commit82b9dc63db41ab7601a4caa31922ac58bf1160ef (patch)
treee9d138215f37421fedb05fcffbb96138b1a52ec5 /common/Makefile
parent65a4771085e644c45a129dcc71eb3ab9f1bb24ca (diff)
downloadu-boot-82b9dc63db41ab7601a4caa31922ac58bf1160ef.tar.xz
common: Only build cli_readline.o for CMDLINE on non-SPL
With gcc-6 and later we may get a warning such as: .../common/cli_readline.c:20:21: warning: ‘tab_seq’ defined but not used [-Wunused-const-variable=] static const char tab_seq[] = " "; /* used to expand TABs */ ^~~~~~~ .../common/cli_readline.c:19:19: warning: ‘erase_seq’ defined but not used [-Wunused-const-variable=] static const char erase_seq[] = "\b \b"; /* erase sequence */ ^~~~~~~~~ Because in SPL we're normally not doing interactive commands anyhow, so lets just not compile this at all in SPL. This also means that we need to correct the logic (and comment) about what the drivers/ddr/fsl/ and CONFIG_FSL_DDR_INTERACTIVE requires and this will be included in SPL there. Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common/Makefile')
-rw-r--r--common/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/common/Makefile b/common/Makefile
index bcd2486..14d0184 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -85,6 +85,7 @@ obj-$(CONFIG_SCSI) += scsi.o
obj-$(CONFIG_UPDATE_TFTP) += update.o
obj-$(CONFIG_DFU_TFTP) += update.o
obj-$(CONFIG_USB_KEYBOARD) += usb_kbd.o
+obj-$(CONFIG_CMDLINE) += cli_readline.o cli_simple.o
endif # !CONFIG_SPL_BUILD
@@ -168,11 +169,9 @@ endif
ifdef CONFIG_CMD_EEPROM_LAYOUT
obj-y += eeprom/eeprom_field.o eeprom/eeprom_layout.o
endif
-# We always have this since drivers/ddr/fs/interactive.c needs it
-obj-$(CONFIG_CMDLINE) += cli_simple.o
obj-y += cli.o
-obj-$(CONFIG_CMDLINE) += cli_readline.o
+obj-$(CONFIG_FSL_DDR_INTERACTIVE) += cli_simple.o cli_readline.o
obj-$(CONFIG_CMD_DFU) += dfu.o
obj-y += command.o
obj-y += s_record.o