diff options
| author | Tom Rini <trini@konsulko.com> | 2017-10-19 15:19:38 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-10-19 15:19:38 (GMT) |
| commit | 0def58f7fd26a237bb08cfbd58ec53372b1ad06b (patch) | |
| tree | ebe443be43edd926ae97b9c96bee15f29b3116ed /configs | |
| parent | 6b0fea33424dcce82b6df0c6b3774601eb1ff36a (diff) | |
| parent | 9af43acba6ea1fe6de29150b8bd3eb0126ba6a15 (diff) | |
| download | u-boot-0def58f7fd26a237bb08cfbd58ec53372b1ad06b.tar.xz | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 | ||||
| -rw-r--r-- | configs/minnowmax_defconfig | 1 | ||||
| -rw-r--r-- | configs/qemu-x86_64_defconfig | 1 | ||||
| -rw-r--r-- | configs/qemu-x86_defconfig | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig index 971cfc6..59bde05 100644 --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig @@ -9,6 +9,7 @@ CONFIG_HAVE_VGA_BIOS=y 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 diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index fc2564c..d1332d3 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -6,6 +6,7 @@ CONFIG_INTERNAL_UART=y CONFIG_DEBUG_UART=y CONFIG_SMP=y CONFIG_HAVE_VGA_BIOS=y +CONFIG_VGA_BIOS_ADDR=0xfffb0000 CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y CONFIG_GENERATE_ACPI_TABLE=y diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index fae4a9c..0cea369 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -14,6 +14,7 @@ CONFIG_SMP=y CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y CONFIG_GENERATE_ACPI_TABLE=y +CONFIG_BUILD_ROM=y CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y CONFIG_BOOTSTAGE=y diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig index ffdb4c3..bf7fbc7 100644 --- a/configs/qemu-x86_defconfig +++ b/configs/qemu-x86_defconfig @@ -5,6 +5,7 @@ CONFIG_SMP=y CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y CONFIG_GENERATE_ACPI_TABLE=y +CONFIG_BUILD_ROM=y CONFIG_FIT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y |