diff options
| -rw-r--r-- | src/console/Kconfig | 8 | ||||
| -rw-r--r-- | src/console/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/cpu/allwinner/a10/Kconfig | 1 | ||||
| -rw-r--r-- | src/cpu/armltd/cortex-a9/Kconfig | 1 | ||||
| -rw-r--r-- | src/cpu/samsung/exynos5250/Kconfig | 1 | ||||
| -rw-r--r-- | src/cpu/samsung/exynos5250/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/cpu/samsung/exynos5420/Kconfig | 1 | ||||
| -rw-r--r-- | src/cpu/samsung/exynos5420/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/cpu/ti/am335x/Kconfig | 1 | ||||
| -rw-r--r-- | src/drivers/uart/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/drivers/usb/Kconfig | 2 | ||||
| -rw-r--r-- | src/include/console/console.h | 3 | ||||
| -rw-r--r-- | src/mainboard/aopen/dxplplusu/romstage.c | 2 | ||||
| -rw-r--r-- | src/mainboard/dmp/vortex86ex/Kconfig | 1 |
14 files changed, 8 insertions, 23 deletions
diff --git a/src/console/Kconfig b/src/console/Kconfig index 703e5c7d38..887c1e22ee 100644 --- a/src/console/Kconfig +++ b/src/console/Kconfig @@ -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. diff --git a/src/console/Makefile.inc b/src/console/Makefile.inc index e3b3780324..435d7049ea 100644 --- a/src/console/Makefile.inc +++ b/src/console/Makefile.inc @@ -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 diff --git a/src/cpu/allwinner/a10/Kconfig b/src/cpu/allwinner/a10/Kconfig index 63c44620c5..fbb95a1695 100644 --- a/src/cpu/allwinner/a10/Kconfig +++ b/src/cpu/allwinner/a10/Kconfig @@ -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 diff --git a/src/cpu/armltd/cortex-a9/Kconfig b/src/cpu/armltd/cortex-a9/Kconfig index 04861a623c..9a81db6530 100644 --- a/src/cpu/armltd/cortex-a9/Kconfig +++ b/src/cpu/armltd/cortex-a9/Kconfig @@ -1,7 +1,6 @@ config CPU_ARMLTD_CORTEX_A9 depends on ARCH_ARMV7 bool - select EARLY_CONSOLE default n if CPU_ARMLTD_CORTEX_A9 diff --git a/src/cpu/samsung/exynos5250/Kconfig b/src/cpu/samsung/exynos5250/Kconfig index 2fda9b3e4d..4adc000571 100644 --- a/src/cpu/samsung/exynos5250/Kconfig +++ b/src/cpu/samsung/exynos5250/Kconfig @@ -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 diff --git a/src/cpu/samsung/exynos5250/Makefile.inc b/src/cpu/samsung/exynos5250/Makefile.inc index 3d5b5b4bf7..a5e3456752 100644 --- a/src/cpu/samsung/exynos5250/Makefile.inc +++ b/src/cpu/samsung/exynos5250/Makefile.inc @@ -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 diff --git a/src/cpu/samsung/exynos5420/Kconfig b/src/cpu/samsung/exynos5420/Kconfig index e46d8893e8..3bc7486840 100644 --- a/src/cpu/samsung/exynos5420/Kconfig +++ b/src/cpu/samsung/exynos5420/Kconfig @@ -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 diff --git a/src/cpu/samsung/exynos5420/Makefile.inc b/src/cpu/samsung/exynos5420/Makefile.inc index 844b8353c5..279e803a4c 100644 --- a/src/cpu/samsung/exynos5420/Makefile.inc +++ b/src/cpu/samsung/exynos5420/Makefile.inc @@ -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 diff --git a/src/cpu/ti/am335x/Kconfig b/src/cpu/ti/am335x/Kconfig index fdc5824cdb..3eb4950f1c 100644 --- a/src/cpu/ti/am335x/Kconfig +++ b/src/cpu/ti/am335x/Kconfig @@ -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 diff --git a/src/drivers/uart/Makefile.inc b/src/drivers/uart/Makefile.inc index 5164282219..c4feb9a605 100644 --- a/src/drivers/uart/Makefile.inc +++ b/src/drivers/uart/Makefile.inc @@ -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 diff --git a/src/drivers/usb/Kconfig b/src/drivers/usb/Kconfig index f225ac12fb..b0baa42756 100644 --- a/src/drivers/usb/Kconfig +++ b/src/drivers/usb/Kconfig @@ -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 diff --git a/src/include/console/console.h b/src/include/console/console.h index 78426b24bf..9e98bfc59c 100644 --- a/src/include/console/console.h +++ b/src/include/console/console.h @@ -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); diff --git a/src/mainboard/aopen/dxplplusu/romstage.c b/src/mainboard/aopen/dxplplusu/romstage.c index 98701f9b23..94546b160a 100644 --- a/src/mainboard/aopen/dxplplusu/romstage.c +++ b/src/mainboard/aopen/dxplplusu/romstage.c @@ -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 diff --git a/src/mainboard/dmp/vortex86ex/Kconfig b/src/mainboard/dmp/vortex86ex/Kconfig index 4b130b8e25..e70d51dddd 100644 --- a/src/mainboard/dmp/vortex86ex/Kconfig +++ b/src/mainboard/dmp/vortex86ex/Kconfig @@ -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 |