nv41/ns50 coreboot config: review changes based on master (fix CBFS_S…

…IZE for ns50 preventing payload injection from coreboot)

Signed-off-by: Thierry Laurion <[email protected]>

config/coreboot-nitropad-ns50.config

@@ -119,12 +119,12 @@ CONFIG_DIMM_SPD_SIZE=512
 CONFIG_FMDFILE=""
 # CONFIG_NO_POST is not set
 CONFIG_MAINBOARD_VENDOR="Notebook"
-CONFIG_CBFS_SIZE=0xA00000
-CONFIG_CONSOLE_SERIAL=y
+CONFIG_CBFS_SIZE=0x1000000
+# CONFIG_CONSOLE_SERIAL is not set
 CONFIG_MAX_CPUS=24
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 # CONFIG_POST_DEVICE is not set
-CONFIG_POST_IO=y
+# CONFIG_POST_IO is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_DEVICETREE="devicetree.cb"
 # CONFIG_VBOOT is not set
@@ -161,7 +161,7 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_DRIVERS_INTEL_WIFI=y
 CONFIG_IFD_BIN_PATH="../nitrokey-blobs/nitropad-ns51/flashdescriptor-HAP.bin"
 CONFIG_ME_BIN_PATH="../nitrokey-blobs/nitropad-ns51/me.bin"
-CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x40000
+CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_VBT_DATA_SIZE_KB=9
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
@@ -185,7 +185,6 @@ CONFIG_BOARD_NOVACUSTOM_NS5X_ADLP=y
 #
 # CONFIG_BOARD_NOVACUSTOM_NV4X_TGLU is not set
 # CONFIG_BOARD_NOVACUSTOM_NS5X_TGLU is not set
-CONFIG_TTYS0_BAUD=115200
 CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
 CONFIG_D3COLD_SUPPORT=y
 CONFIG_PCIEXP_ASPM=y
@@ -742,23 +741,10 @@ CONFIG_BOOTBLOCK_CONSOLE=y
 CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
 CONFIG_FIXED_UART_FOR_CONSOLE=y
-
-#
-# memory mapped, 8250-compatible
-#
-CONFIG_TTYS0_BASE=0x3f8
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-CONFIG_CONSOLE_SERIAL_115200=y
-# CONFIG_CONSOLE_SERIAL_57600 is not set
-# CONFIG_CONSOLE_SERIAL_38400 is not set
-# CONFIG_CONSOLE_SERIAL_19200 is not set
-# CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
+# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 # CONFIG_CONSOLE_SPI_FLASH is not set
 # CONFIG_CONSOLE_I2C_SMBUS is not set
 # CONFIG_CONSOLE_SYSTEM76_EC is not set
@@ -775,7 +761,6 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
 CONFIG_CONSOLE_USE_LOGLEVEL_PREFIX=y
 CONFIG_CONSOLE_USE_ANSI_ESCAPES=y
 # CONFIG_CMOS_POST is not set
-CONFIG_POST_IO_PORT=0x80
 CONFIG_HWBASE_DEBUG_CB=y
 # end of Console
 

config/coreboot-nitropad-nv41.config

@@ -120,11 +120,11 @@ CONFIG_FMDFILE=""
 # CONFIG_NO_POST is not set
 CONFIG_MAINBOARD_VENDOR="Notebook"
 CONFIG_CBFS_SIZE=0x1000000
-CONFIG_CONSOLE_SERIAL=y
+# CONFIG_CONSOLE_SERIAL is not set
 CONFIG_MAX_CPUS=24
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 # CONFIG_POST_DEVICE is not set
-CONFIG_POST_IO=y
+# CONFIG_POST_IO is not set
 CONFIG_UART_FOR_CONSOLE=0
 CONFIG_DEVICETREE="devicetree.cb"
 # CONFIG_VBOOT is not set
@@ -161,7 +161,7 @@ CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_DRIVERS_INTEL_WIFI=y
 CONFIG_IFD_BIN_PATH="../nitrokey-blobs/nitropad-nv41/flashdescriptor-HAP.bin"
 CONFIG_ME_BIN_PATH="../nitrokey-blobs/nitropad-nv41/me.bin"
-CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x40000
+CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_VBT_DATA_SIZE_KB=9
 CONFIG_CARDBUS_PLUGIN_SUPPORT=y
 CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
@@ -185,7 +185,6 @@ CONFIG_BOARD_NOVACUSTOM_NV4X_ADLP=y
 #
 # CONFIG_BOARD_NOVACUSTOM_NV4X_TGLU is not set
 # CONFIG_BOARD_NOVACUSTOM_NS5X_TGLU is not set
-CONFIG_TTYS0_BAUD=115200
 CONFIG_POWER_STATE_DEFAULT_ON_AFTER_FAILURE=y
 CONFIG_D3COLD_SUPPORT=y
 CONFIG_PCIEXP_ASPM=y
@@ -743,23 +742,10 @@ CONFIG_BOOTBLOCK_CONSOLE=y
 CONFIG_POSTCAR_CONSOLE=y
 CONFIG_SQUELCH_EARLY_SMP=y
 CONFIG_FIXED_UART_FOR_CONSOLE=y
-
-#
-# memory mapped, 8250-compatible
-#
-CONFIG_TTYS0_BASE=0x3f8
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-CONFIG_CONSOLE_SERIAL_115200=y
-# CONFIG_CONSOLE_SERIAL_57600 is not set
-# CONFIG_CONSOLE_SERIAL_38400 is not set
-# CONFIG_CONSOLE_SERIAL_19200 is not set
-# CONFIG_CONSOLE_SERIAL_9600 is not set
-CONFIG_TTYS0_LCS=3
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
+# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set
 # CONFIG_CONSOLE_SPI_FLASH is not set
 # CONFIG_CONSOLE_I2C_SMBUS is not set
 # CONFIG_CONSOLE_SYSTEM76_EC is not set
@@ -776,7 +762,6 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL=7
 CONFIG_CONSOLE_USE_LOGLEVEL_PREFIX=y
 CONFIG_CONSOLE_USE_ANSI_ESCAPES=y
 # CONFIG_CMOS_POST is not set
-CONFIG_POST_IO_PORT=0x80
 CONFIG_HWBASE_DEBUG_CB=y
 # end of Console