From 917d3565b5c6f064250fece1eebd7dc0f78a1fc0 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Sat, 7 Oct 2017 02:43:52 -0700 Subject: x86: minnowmax: Adjust VGA rom address Adjust VGA rom address to 0xfffb0000 so that u-boot.rom image can be built again. Signed-off-by: Bin Meng Reviewed-by: Stefan Roese --- configs/minnowmax_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'configs') diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index fc2564cd7dc..d1332d369de 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 -- cgit v1.2.3 From 871aa41d4c9ecf8d89b98491dc86d0097fdf80e5 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Mon, 16 Oct 2017 18:08:38 +0000 Subject: x86: provide CONFIG_BUILD_ROM Up to now we depended on an exported variable to build u-boot.rom. We should be able to specify it in the configuration file, too. With this patch this becomes possible using the new Kconfig option CONFIG_BUILD_ROM. This option depends on CONFIG_X86 and is selected in qemu-x86_defconfig and qemu-x86_64_defconfig. Cc: Simon Glass Cc: Bin Meng Signed-off-by: Heinrich Schuchardt Reviewed-by: Bin Meng --- configs/qemu-x86_64_defconfig | 1 + configs/qemu-x86_defconfig | 1 + 2 files changed, 2 insertions(+) (limited to 'configs') diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index fae4a9ca548..0cea3694d0d 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 ffdb4c34c1b..bf7fbc723d1 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 -- cgit v1.2.3 From 9af43acba6ea1fe6de29150b8bd3eb0126ba6a15 Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Tue, 17 Oct 2017 08:09:14 +0200 Subject: x86: conga-qeval20-qa3-e3845-internal-uart_defconfig: Add ACPI resume support I've missed to add the ACPI resume support to this x86 build target. This patch adds the ACPI resume support enabling S3 suspend / resume. Signed-off-by: Stefan Roese Cc: Bin Meng Cc: Simon Glass Reviewed-by: Bin Meng --- configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'configs') diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig index 971cfc66e89..59bde05c806 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 -- cgit v1.2.3