Right now some console specific objects are included in the bootblock even if CONFIG_BOOTBLOCK_CONSOLE is disabled while others are not. Make all of them conditional and also fix a preprocessor misuse in bootblock_simple.c and a stray (useless) die() in the Exynos wakeup code that made inclusion of those files necessary. BRANCH=none BUG=none TEST=boot tested on pit Change-Id: Ia7f9d17654466f199b0e13afbdc9e14c9706530f Signed-off-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: https://chromium-review.googlesource.com/168772 Reviewed-by: David Hendrix <dhendrix@chromium.org>
30 lines
912 B
Makefile
30 lines
912 B
Makefile
ramstage-y += printk.c
|
|
ramstage-y += console.c
|
|
ramstage-y += vtxprintf.c
|
|
ramstage-y += vsprintf.c
|
|
ramstage-y += post.c
|
|
ramstage-y += die.c
|
|
|
|
smm-y += printk.c
|
|
smm-y += vtxprintf.c
|
|
smm-$(CONFIG_SMM_TSEG) += die.c
|
|
|
|
romstage-$(CONFIG_EARLY_CONSOLE) += vtxprintf.c
|
|
romstage-y += console.c
|
|
romstage-y += post.c
|
|
romstage-y += die.c
|
|
|
|
bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += vtxprintf.c
|
|
bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += console.c
|
|
bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += die.c
|
|
|
|
ramstage-$(CONFIG_CONSOLE_SERIAL8250) += uart8250_console.c
|
|
ramstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem_console.c
|
|
ramstage-$(CONFIG_USBDEBUG) += usbdebug_console.c
|
|
ramstage-$(CONFIG_CONSOLE_NE2K) += ne2k_console.c
|
|
ramstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c
|
|
|
|
|
|
$(obj)/console/console.ramstage.o : $(obj)/build.h
|
|
$(obj)/console/console.romstage.o : $(obj)/build.h
|
|
$(obj)/console/console.bootblock.o : $(obj)/build.h
|