diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2018-12-28 15:48:58 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2019-01-06 14:05:20 +0000 |
| commit | adc4753a8d8c5dc7462547ab148c2d63eabbe4fa (patch) | |
| tree | c93ad6be8d24feaa5a04c03a1d434897189be357 /src/include/console | |
| parent | 085a2268083cfe1d22f696c9070726dcf2dc160f (diff) | |
usbdebug: Make the EHCI debug console work in the bootblock
Currently this needlessly initializes the hardware in the both the
romstage and the bootblock, but it works.
Build option is renamed to USBDEBUG_IN_PRE_RAM to reflect the
use better, related support files can be built to pre-ram stages
regardless of usbdebug being enabled or not.
Tested on Google/peppy (adapted to C_ENVIRONMENT_BOOTBLOCK).
Change-Id: Ib77f2fc7f3d8fa524405601bae15cce9f76ffc6f
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/30480
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'src/include/console')
| -rw-r--r-- | src/include/console/usb.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/include/console/usb.h b/src/include/console/usb.h index 45a501d536..d58a6a6e50 100644 --- a/src/include/console/usb.h +++ b/src/include/console/usb.h @@ -29,8 +29,9 @@ unsigned char usb_rx_byte(int idx); int usb_can_rx_byte(int idx); #define __CONSOLE_USB_ENABLE__ (IS_ENABLED(CONFIG_CONSOLE_USB) && \ - ((ENV_ROMSTAGE && IS_ENABLED(CONFIG_USBDEBUG_IN_ROMSTAGE)) || \ - (ENV_POSTCAR && IS_ENABLED(CONFIG_USBDEBUG_IN_ROMSTAGE)) || \ + ((ENV_BOOTBLOCK && IS_ENABLED(CONFIG_USBDEBUG_IN_PRE_RAM)) || \ + (ENV_ROMSTAGE && IS_ENABLED(CONFIG_USBDEBUG_IN_PRE_RAM)) || \ + (ENV_POSTCAR && IS_ENABLED(CONFIG_USBDEBUG_IN_PRE_RAM)) || \ ENV_RAMSTAGE)) #define USB_PIPE_FOR_CONSOLE 0 @@ -51,7 +52,7 @@ static inline void __usb_tx_flush(void) {} /* */ #if 0 && IS_ENABLED(CONFIG_GDB_STUB) && \ - ((ENV_ROMSTAGE && IS_ENABLED(CONFIG_USBDEBUG_IN_ROMSTAGE)) \ + ((ENV_ROMSTAGE && IS_ENABLED(CONFIG_USBDEBUG_IN_PRE_RAM)) \ || ENV_RAMSTAGE) static inline void __gdb_hw_init(void) { usbdebug_init(); } static inline void __gdb_tx_byte(u8 data) |