diff options
| author | Simon Glass <sjg@chromium.org> | 2019-12-06 21:42:16 -0700 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2019-12-15 11:44:16 +0800 |
| commit | f09d4edf4bf7ffe046ca37731850cc99e3e1d758 (patch) | |
| tree | df253787b9ec1374d1d95c313855b9024849d0c2 /arch | |
| parent | 592434139bf943cbc6c80f1467221904a3c917ec (diff) | |
| download | u-boot-f09d4edf4bf7ffe046ca37731850cc99e3e1d758.tar.gz u-boot-f09d4edf4bf7ffe046ca37731850cc99e3e1d758.tar.xz u-boot-f09d4edf4bf7ffe046ca37731850cc99e3e1d758.zip | |
x86: fsp: Make graphics support common to FSP1/2
Both versions of FSP can use the same graphics support, so move it into
the common directory.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/lib/fsp/Makefile | 3 | ||||
| -rw-r--r-- | arch/x86/lib/fsp/fsp_graphics.c (renamed from arch/x86/lib/fsp1/fsp_graphics.c) | 2 | ||||
| -rw-r--r-- | arch/x86/lib/fsp1/Makefile | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/lib/fsp/Makefile b/arch/x86/lib/fsp/Makefile index 9e34856473..da6c0a886a 100644 --- a/arch/x86/lib/fsp/Makefile +++ b/arch/x86/lib/fsp/Makefile @@ -4,4 +4,7 @@ obj-y += fsp_common.o obj-y += fsp_dram.o +ifndef CONFIG_SPL_BUILD +obj-$(CONFIG_VIDEO_FSP) += fsp_graphics.o +endif obj-y += fsp_support.o diff --git a/arch/x86/lib/fsp1/fsp_graphics.c b/arch/x86/lib/fsp/fsp_graphics.c index 52e71334f9..91d2d08557 100644 --- a/arch/x86/lib/fsp1/fsp_graphics.c +++ b/arch/x86/lib/fsp/fsp_graphics.c @@ -7,7 +7,7 @@ #include <dm.h> #include <vbe.h> #include <video.h> -#include <asm/fsp1/fsp_support.h> +#include <asm/fsp/fsp_support.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/lib/fsp1/Makefile b/arch/x86/lib/fsp1/Makefile index 870de71bd7..1cf5e54191 100644 --- a/arch/x86/lib/fsp1/Makefile +++ b/arch/x86/lib/fsp1/Makefile @@ -5,5 +5,4 @@ obj-y += fsp_car.o obj-y += fsp_common.o obj-y += fsp_dram.o -obj-$(CONFIG_VIDEO_FSP) += fsp_graphics.o obj-y += fsp_support.o |