From a2bc2540c2d004b475b401ccf0b162c2452857bb Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Sat, 29 May 2021 08:10:49 +0200 Subject: Allow to build romstage sources inside the bootblock Having a separate romstage is only desirable: - with advanced setups like vboot or normal/fallback - boot medium is slow at startup (some ARM SOCs) - bootblock is limited in size (Intel APL 32K) When this is not the case there is no need for the extra complexity that romstage brings. Including the romstage sources inside the bootblock substantially reduces the total code footprint. Often the resulting code is 10-20k smaller. This is controlled via a Kconfig option. TESTED: works on qemu x86, arm and aarch64 with and without VBOOT. Change-Id: Id68390edc1ba228b121cca89b80c64a92553e284 Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/55068 Reviewed-by: Julius Werner Tested-by: build bot (Jenkins) Reviewed-by: Felix Held --- src/include/console/cbmem_console.h | 2 +- src/include/console/console.h | 2 +- src/include/console/qemu_debugcon.h | 2 +- src/include/console/system76_ec.h | 2 +- src/include/console/uart.h | 2 +- src/include/console/usb.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/include/console') diff --git a/src/include/console/cbmem_console.h b/src/include/console/cbmem_console.h index 9a814b9a54..84a95dd593 100644 --- a/src/include/console/cbmem_console.h +++ b/src/include/console/cbmem_console.h @@ -10,7 +10,7 @@ void cbmemc_tx_byte(unsigned char data); #define __CBMEM_CONSOLE_ENABLE__ (CONFIG(CONSOLE_CBMEM) && \ (ENV_RAMSTAGE || ENV_SEPARATE_VERSTAGE || ENV_POSTCAR || \ - ENV_ROMSTAGE || (ENV_BOOTBLOCK && CONFIG(BOOTBLOCK_CONSOLE)) || \ + ENV_SEPARATE_ROMSTAGE || (ENV_BOOTBLOCK && CONFIG(BOOTBLOCK_CONSOLE)) || \ (ENV_SMM && CONFIG(DEBUG_SMI)))) #if __CBMEM_CONSOLE_ENABLE__ diff --git a/src/include/console/console.h b/src/include/console/console.h index fb257ba16c..7e9a439c07 100644 --- a/src/include/console/console.h +++ b/src/include/console/console.h @@ -44,7 +44,7 @@ static inline int get_console_loglevel(void) #define __CONSOLE_ENABLE__ \ ((ENV_BOOTBLOCK && CONFIG(BOOTBLOCK_CONSOLE)) || \ (ENV_POSTCAR && CONFIG(POSTCAR_CONSOLE)) || \ - ENV_SEPARATE_VERSTAGE || ENV_ROMSTAGE || ENV_RAMSTAGE || \ + ENV_SEPARATE_VERSTAGE || ENV_SEPARATE_ROMSTAGE || ENV_RAMSTAGE || \ ENV_LIBAGESA || (ENV_SMM && CONFIG(DEBUG_SMI))) #if __CONSOLE_ENABLE__ diff --git a/src/include/console/qemu_debugcon.h b/src/include/console/qemu_debugcon.h index 155bfdaf29..ed1d8e0836 100644 --- a/src/include/console/qemu_debugcon.h +++ b/src/include/console/qemu_debugcon.h @@ -9,7 +9,7 @@ void qemu_debugcon_init(void); void qemu_debugcon_tx_byte(unsigned char data); #if CONFIG(CONSOLE_QEMU_DEBUGCON) && \ - (ENV_ROMSTAGE || ENV_RAMSTAGE || ENV_POSTCAR || ENV_BOOTBLOCK) + (ENV_SEPARATE_ROMSTAGE || ENV_RAMSTAGE || ENV_POSTCAR || ENV_BOOTBLOCK) static inline void __qemu_debugcon_init(void) { qemu_debugcon_init(); } static inline void __qemu_debugcon_tx_byte(u8 data) { diff --git a/src/include/console/system76_ec.h b/src/include/console/system76_ec.h index 2aa265a1ff..6e9311a4b8 100644 --- a/src/include/console/system76_ec.h +++ b/src/include/console/system76_ec.h @@ -11,7 +11,7 @@ void system76_ec_flush(void); void system76_ec_print(uint8_t byte); #define __CONSOLE_SYSTEM76_EC_ENABLE__ (CONFIG(CONSOLE_SYSTEM76_EC) && \ - (ENV_BOOTBLOCK || ENV_ROMSTAGE || ENV_RAMSTAGE \ + (ENV_BOOTBLOCK || ENV_SEPARATE_ROMSTAGE || ENV_RAMSTAGE \ || ENV_SEPARATE_VERSTAGE || ENV_POSTCAR \ || (ENV_SMM && CONFIG(DEBUG_SMI)))) diff --git a/src/include/console/uart.h b/src/include/console/uart.h index ca03ecb77d..3f9e5b01da 100644 --- a/src/include/console/uart.h +++ b/src/include/console/uart.h @@ -62,7 +62,7 @@ static inline void *uart_platform_baseptr(unsigned int idx) void oxford_remap(unsigned int new_base); #define __CONSOLE_SERIAL_ENABLE__ (CONFIG(CONSOLE_SERIAL) && \ - (ENV_BOOTBLOCK || ENV_ROMSTAGE || ENV_RAMSTAGE || ENV_SEPARATE_VERSTAGE \ + (ENV_BOOTBLOCK || ENV_SEPARATE_ROMSTAGE || ENV_RAMSTAGE || ENV_SEPARATE_VERSTAGE \ || ENV_POSTCAR || (ENV_SMM && CONFIG(DEBUG_SMI)))) #if __CONSOLE_SERIAL_ENABLE__ diff --git a/src/include/console/usb.h b/src/include/console/usb.h index 30591c2329..fa8d511d35 100644 --- a/src/include/console/usb.h +++ b/src/include/console/usb.h @@ -15,7 +15,7 @@ int usb_can_rx_byte(int idx); #define __CONSOLE_USB_ENABLE__ (CONFIG(CONSOLE_USB) && \ ((ENV_BOOTBLOCK && CONFIG(USBDEBUG_IN_PRE_RAM)) || \ - (ENV_ROMSTAGE && CONFIG(USBDEBUG_IN_PRE_RAM)) || \ + (ENV_SEPARATE_ROMSTAGE && CONFIG(USBDEBUG_IN_PRE_RAM)) || \ (ENV_POSTCAR && CONFIG(USBDEBUG_IN_PRE_RAM)) || \ (ENV_SEPARATE_VERSTAGE && CONFIG(USBDEBUG_IN_PRE_RAM)) || \ ENV_RAMSTAGE)) -- cgit v1.2.3