From 94e9cbdf033d9f3bdd605ddba8b9400c15fe3eca Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Tue, 5 Jun 2018 22:12:37 -0400 Subject: [PATCH] Bringing x230 par with librem13_v2 --- boards/x230/x230.config | 21 ++++---------------- config/coreboot-x230.config | 39 +++++++++++++++++++++++++++---------- 2 files changed, 33 insertions(+), 27 deletions(-) diff --git a/boards/x230/x230.config b/boards/x230/x230.config index 1e3ea9205..b31d532e0 100644 --- a/boards/x230/x230.config +++ b/boards/x230/x230.config @@ -3,6 +3,7 @@ export CONFIG_COREBOOT=y CONFIG_COREBOOT_CONFIG=config/coreboot-x230.config CONFIG_LINUX_CONFIG=config/linux-x230.config +export CONFIG_COREBOOT=y CONFIG_CRYPTSETUP=y CONFIG_FLASHROM=y CONFIG_FLASHTOOLS=y @@ -29,24 +30,10 @@ export CONFIG_TPM=y export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOT_REQ_HASH=n export CONFIG_BOOT_REQ_ROLLBACK=n -export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on" +export CONFIG_BOOT_KERNEL_ADD="iommu=pt" export CONFIG_BOOT_KERNEL_REMOVE="" export CONFIG_BOOT_DEV="/dev/sda1" export CONFIG_BOOT_GUI_MENU_NAME="x230 Heads Boot Menu" export CONFIG_USB_BOOT_DEV="/dev/sdb1" - -# This board has two SPI flash chips, an 8 MB that holds the IFD, -# the ME image and part of the coreboot image, and a 4 MB one that -# has the rest of the coreboot and the reset vector. -# -# When flashing via an external programmer it is easiest to have -# to separate files for these pieces. -all: $(build)/$(BOARD)/$(BOARD)-8.rom -$(build)/$(BOARD)/$(BOARD)-8.rom: $(build)/$(BOARD)/coreboot.rom - $(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none) - @sha256sum $@ - -all: $(build)/$(BOARD)/$(BOARD)-4.rom -$(build)/$(BOARD)/$(BOARD)-4.rom: $(build)/$(BOARD)/coreboot.rom - $(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none) - @sha256sum $@ +export CONFIG_WARNING_BG_COLOR="--background-gradient 0 0 0 150 125 0" +export CONFIG_ERROR_BG_COLOR="--background-gradient 0 0 0 150 0 0" diff --git a/config/coreboot-x230.config b/config/coreboot-x230.config index 926fb49d4..485ec23e2 100644 --- a/config/coreboot-x230.config +++ b/config/coreboot-x230.config @@ -112,6 +112,7 @@ CONFIG_MAINBOARD_VENDOR="LENOVO" CONFIG_MAX_CPUS=8 CONFIG_CACHE_ROM_SIZE_OVERRIDE=0x0 CONFIG_CBFS_SIZE=0x700000 +CONFIG_UART_FOR_CONSOLE=0 CONFIG_VGA_BIOS_ID="8086,0166" # CONFIG_ONBOARD_VGA_IS_PRIMARY is not set CONFIG_DIMM_SPD_SIZE=256 @@ -138,6 +139,7 @@ CONFIG_TPM_PIRQ=0x0 CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0 CONFIG_FMDFILE="" CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00 +CONFIG_TTYS0_LCS=3 CONFIG_DRIVERS_UART_8250IO=y CONFIG_IFD_GBE_SECTION="" # CONFIG_BOARD_LENOVO_G505S is not set @@ -163,7 +165,7 @@ CONFIG_BOARD_LENOVO_X230=y # CONFIG_BOARD_LENOVO_X60 is not set # CONFIG_BOARD_LENOVO_Z61T is not set CONFIG_CPU_ADDR_BITS=36 -CONFIG_DEFAULT_CONSOLE_LOGLEVEL=5 +CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 # CONFIG_USBDEBUG is not set CONFIG_DRIVERS_PS2_KEYBOARD=y # CONFIG_PCIEXP_L1_SUB_STATE is not set @@ -219,6 +221,7 @@ CONFIG_PCIEXP_COMMON_CLOCK=y CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT="northbridge/intel/sandybridge/bootblock.c" CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT="southbridge/intel/bd82x6x/bootblock.c" CONFIG_CACHE_MRC_SIZE_KB=512 +CONFIG_TTYS0_BASE=0x3f8 CONFIG_STACK_SIZE=0x1000 CONFIG_CONSOLE_CBMEM=y CONFIG_UART_PCI_ADDR=0 @@ -226,6 +229,7 @@ CONFIG_HPET_MIN_TICKS=0x80 # CONFIG_SOC_INTEL_KABYLAKE is not set # CONFIG_SOC_LOWRISC_LOWRISC is not set # CONFIG_SOC_MARVELL_MVMAP2315 is not set +CONFIG_TTYS0_BAUD=115200 # CONFIG_SOC_MEDIATEK_MT8173 is not set # CONFIG_SOC_NVIDIA_TEGRA124 is not set # CONFIG_SOC_NVIDIA_TEGRA210 is not set @@ -481,7 +485,7 @@ CONFIG_SPI_FLASH_WINBOND=y # CONFIG_SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B is not set # CONFIG_SPI_FLASH_HAS_VOLATILE_GROUP is not set # CONFIG_HAVE_SPI_CONSOLE_SUPPORT is not set -# CONFIG_DRIVERS_UART is not set +CONFIG_DRIVERS_UART=y # CONFIG_DRIVERS_UART_8250IO_SKIP_INIT is not set CONFIG_NO_UART_ON_SUPERIO=y # CONFIG_UART_OVERRIDE_INPUT_CLOCK_DIVIDER is not set @@ -518,7 +522,7 @@ CONFIG_GFX_GMA_INTERNAL_PORT="LVDS" CONFIG_GFX_GMA_ANALOG_I2C_PORT="PCH_DAC" # CONFIG_DRIVER_INTEL_I210 is not set # CONFIG_DRIVERS_INTEL_MIPI_CAMERA is not set -CONFIG_DRIVERS_INTEL_WIFI=y +# CONFIG_DRIVERS_INTEL_WIFI is not set # CONFIG_USE_SAR is not set # CONFIG_DRIVERS_LENOVO_HYBRID_GRAPHICS is not set # CONFIG_DRIVER_MAXIM_MAX77686 is not set @@ -565,16 +569,31 @@ CONFIG_TPM=y # Console # CONFIG_SQUELCH_EARLY_SMP=y -# CONFIG_CONSOLE_SERIAL is not set +CONFIG_CONSOLE_SERIAL=y + +# +# I/O mapped, 8250-compatible +# + +# +# Serial port base address = 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_SPKMODEM is not set # CONFIG_CONSOLE_NE2K is not set CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 -# CONFIG_CONSOLE_CBMEM_DUMP_TO_UART is not set # CONFIG_CONSOLE_SPI_FLASH is not set -# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8 is not set +CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_7 is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_6 is not set -CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y +# CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5 is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_4 is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_3 is not set # CONFIG_DEFAULT_CONSOLE_LOGLEVEL_2 is not set @@ -583,8 +602,7 @@ CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y # CONFIG_CMOS_POST is not set # CONFIG_CONSOLE_POST is not set # CONFIG_NO_EARLY_BOOTBLOCK_POSTCODES is not set -# CONFIG_HWBASE_DEBUG_CB is not set -CONFIG_HWBASE_DEBUG_NULL=y +CONFIG_HWBASE_DEBUG_CB=y CONFIG_HAVE_ACPI_RESUME=y # CONFIG_ACPI_HUGE_LOWMEM_BACKUP is not set CONFIG_RESUME_PATH_SAME_AS_BOOT=y @@ -628,7 +646,7 @@ CONFIG_PAYLOAD_LINUX=y CONFIG_PAYLOAD_FILE="../../build/x230/bzImage" CONFIG_PAYLOAD_OPTIONS="" # CONFIG_PXE is not set -CONFIG_LINUX_COMMAND_LINE="quiet" +CONFIG_LINUX_COMMAND_LINE="intel_iommu=on iommu=pt" CONFIG_LINUX_INITRD="../../build/x230/initrd.cpio.xz" # CONFIG_PAYLOAD_IS_FLAT_BINARY is not set @@ -643,6 +661,7 @@ CONFIG_LINUX_INITRD="../../build/x230/initrd.cpio.xz" # # Debugging # +# CONFIG_GDB_STUB is not set # CONFIG_FATAL_ASSERTS is not set # CONFIG_DEBUG_CBFS is not set CONFIG_HAVE_DEBUG_RAM_SETUP=y