console: Drop EARLY_CONSOLE option
We have means to easily disable a specific console in romstage if necessary, so this global option makes little sense. The option was initially introduced as a work-around for build issues around CACHE_AS_RAM, ROMCC and ARCH_ARMV7 dependencies for UARTs. Change-Id: I797bdd11a48ddd813d3ee7ccef9a0c050f16f669 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/5607 Tested-by: build bot (Jenkins) Reviewed-by: David Hendricks <dhendrix@chromium.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
parent
28837c6b01
commit
48713a1bf7
|
@ -7,17 +7,9 @@ config BOOTBLOCK_CONSOLE
|
|||
help
|
||||
Use console during the bootblock if supported
|
||||
|
||||
config EARLY_CONSOLE
|
||||
bool "Enable early (pre-RAM) console output."
|
||||
default y if CACHE_AS_RAM
|
||||
default n
|
||||
help
|
||||
Use console during early (pre-RAM) boot stages
|
||||
|
||||
config SQUELCH_EARLY_SMP
|
||||
bool "Squelch AP CPUs from early console."
|
||||
default y
|
||||
depends on EARLY_CONSOLE
|
||||
help
|
||||
When selected only the BSP CPU will output to early console.
|
||||
|
||||
|
|
|
@ -6,8 +6,8 @@ ramstage-y += die.c
|
|||
smm-$(CONFIG_DEBUG_SMI) += init.c console.c vtxprintf.c printk.c
|
||||
smm-$(CONFIG_SMM_TSEG) += die.c
|
||||
|
||||
romstage-$(CONFIG_EARLY_CONSOLE) += vtxprintf.c printk.c
|
||||
romstage-$(CONFIG_EARLY_CONSOLE) += init.c console.c
|
||||
romstage-y += vtxprintf.c printk.c
|
||||
romstage-y += init.c console.c
|
||||
romstage-y += post.c
|
||||
romstage-y += die.c
|
||||
|
||||
|
|
|
@ -9,7 +9,6 @@ config CPU_SPECIFIC_OPTIONS
|
|||
select HAVE_MONOTONIC_TIMER
|
||||
select HAVE_UART_SPECIAL
|
||||
select BOOTBLOCK_CONSOLE
|
||||
select EARLY_CONSOLE
|
||||
|
||||
config BOOTBLOCK_CPU_INIT
|
||||
string
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
config CPU_ARMLTD_CORTEX_A9
|
||||
depends on ARCH_ARMV7
|
||||
bool
|
||||
select EARLY_CONSOLE
|
||||
default n
|
||||
|
||||
if CPU_ARMLTD_CORTEX_A9
|
||||
|
|
|
@ -2,7 +2,6 @@ config CPU_SAMSUNG_EXYNOS5250
|
|||
depends on ARCH_ARMV7
|
||||
select HAVE_MONOTONIC_TIMER
|
||||
select HAVE_UART_SPECIAL
|
||||
select EARLY_CONSOLE
|
||||
select DYNAMIC_CBMEM
|
||||
bool
|
||||
default n
|
||||
|
|
|
@ -26,7 +26,7 @@ romstage-y += power.c
|
|||
romstage-y += mct.c
|
||||
romstage-y += monotonic_timer.c
|
||||
ifeq ($(CONFIG_DRIVERS_UART),y)
|
||||
romstage-$(CONFIG_EARLY_CONSOLE) += uart.c
|
||||
romstage-y += uart.c
|
||||
endif
|
||||
romstage-y += wakeup.c
|
||||
romstage-y += gpio.c
|
||||
|
|
|
@ -2,7 +2,6 @@ config CPU_SAMSUNG_EXYNOS5420
|
|||
depends on ARCH_ARMV7
|
||||
select HAVE_MONOTONIC_TIMER
|
||||
select HAVE_UART_SPECIAL
|
||||
select EARLY_CONSOLE
|
||||
select DYNAMIC_CBMEM
|
||||
bool
|
||||
default n
|
||||
|
|
|
@ -26,7 +26,7 @@ romstage-y += power.c
|
|||
romstage-y += mct.c
|
||||
romstage-y += monotonic_timer.c
|
||||
ifeq ($(CONFIG_DRIVERS_UART),y)
|
||||
romstage-$(CONFIG_EARLY_CONSOLE) += uart.c
|
||||
romstage-y += uart.c
|
||||
endif
|
||||
romstage-y += wakeup.c
|
||||
romstage-y += gpio.c
|
||||
|
|
|
@ -3,7 +3,6 @@ config CPU_TI_AM335X
|
|||
select HAVE_MONOTONIC_TIMER
|
||||
select HAVE_UART_SPECIAL
|
||||
select BOOTBLOCK_CONSOLE
|
||||
select EARLY_CONSOLE
|
||||
bool
|
||||
default n
|
||||
|
||||
|
|
|
@ -25,6 +25,6 @@ endif
|
|||
|
||||
ifeq ($(CONFIG_DRIVERS_UART_PL011),y)
|
||||
bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += pl011.c
|
||||
romstage-$(CONFIG_EARLY_CONSOLE) += pl011.c
|
||||
romstage-y += pl011.c
|
||||
ramstage-y += pl011.c
|
||||
endif
|
||||
|
|
|
@ -35,7 +35,7 @@ if USBDEBUG
|
|||
config USBDEBUG_IN_ROMSTAGE
|
||||
bool "Enable early (pre-RAM) usbdebug"
|
||||
default y
|
||||
depends on EARLY_CBMEM_INIT && EARLY_CONSOLE
|
||||
depends on EARLY_CBMEM_INIT
|
||||
help
|
||||
Configuring USB controllers in system-agent binary may cause
|
||||
problems to usbdebug. Disabling this option delays usbdebug to
|
||||
|
|
|
@ -42,8 +42,7 @@ void __attribute__ ((noreturn)) die(const char *msg);
|
|||
|
||||
#define __CONSOLE_ENABLE__ \
|
||||
((ENV_BOOTBLOCK && CONFIG_BOOTBLOCK_CONSOLE) || \
|
||||
(ENV_ROMSTAGE && CONFIG_EARLY_CONSOLE) || \
|
||||
ENV_RAMSTAGE || (ENV_SMM && CONFIG_DEBUG_SMI))
|
||||
ENV_ROMSTAGE || ENV_RAMSTAGE || (ENV_SMM && CONFIG_DEBUG_SMI))
|
||||
|
||||
#if __CONSOLE_ENABLE__
|
||||
void console_init(void);
|
||||
|
|
|
@ -70,7 +70,7 @@ void main(unsigned long bist)
|
|||
* scrub_ecc() are recovered to stack via xmm0-xmm3.
|
||||
*/
|
||||
#if CONFIG_HW_SCRUBBER
|
||||
#if ! ( CONFIG_USBDEBUG && CONFIG_EARLY_CONSOLE )
|
||||
#if !CONFIG_USBDEBUG_IN_ROMSTAGE
|
||||
unsigned long ret_addr = (unsigned long)((unsigned long*)&bist - 1);
|
||||
e7505_mch_scrub_ecc(ret_addr);
|
||||
#endif
|
||||
|
|
|
@ -28,7 +28,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
|
|||
select HAVE_PIRQ_TABLE
|
||||
select BOARD_ROMSIZE_KB_256
|
||||
select ROMCC
|
||||
select DEFAULT_EARLY_CONSOLE
|
||||
select HAVE_DEBUG_RAM_SETUP
|
||||
|
||||
config MAINBOARD_DIR
|
||||
|
|
Loading…
Reference in New Issue