diff options
author | Tom Rini <trini@konsulko.com> | 2017-08-08 17:06:19 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-08-08 17:06:19 -0400 |
commit | d529124fdcf941c34074fd1ce600f4b1b4a7dd07 (patch) | |
tree | e395438990ef82f468eedae5dee0a0fd2048a1f5 /configs/conga-qeval20-qa3-e3845_defconfig | |
parent | f0ca30fa19ee57e2f8452a1d0b8a30eb923d7e22 (diff) | |
parent | 6a5691e297fc44a7c963b15903828fed33d40ba0 (diff) | |
download | u-boot-d529124fdcf941c34074fd1ce600f4b1b4a7dd07.tar.gz |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'configs/conga-qeval20-qa3-e3845_defconfig')
-rw-r--r-- | configs/conga-qeval20-qa3-e3845_defconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig index e4f97130fc..5903edb363 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -2,12 +2,13 @@ CONFIG_X86=y CONFIG_VENDOR_CONGATEC=y CONFIG_TARGET_CONGA_QEVAL20_QA3_E3845=y CONFIG_DEFAULT_DEVICE_TREE="conga-qeval20-qa3-e3845" -CONFIG_DEBUG_UART=y CONFIG_SMP=y CONFIG_HAVE_VGA_BIOS=y +CONFIG_VGA_BIOS_ADDR=0xfffa0000 CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y CONFIG_GENERATE_ACPI_TABLE=y +CONFIG_HAVE_ACPI_RESUME=y CONFIG_SEABIOS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y @@ -46,8 +47,6 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_INTEL=y CONFIG_WINBOND_W83627=y CONFIG_E1000=y -CONFIG_DEBUG_UART_BASE=0x3f8 -CONFIG_DEBUG_UART_CLOCK=1843200 CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y |