diff options
| author | Tom Rini | 2019-07-30 19:19:54 -0400 |
|---|---|---|
| committer | Tom Rini | 2019-07-30 19:19:54 -0400 |
| commit | a239147fa2c0c3fe849ccaffd72c4dc4cae2be71 (patch) | |
| tree | 2675e87a98bdd76e337e8cafe2b6f9e660b1f72e /include/asm-generic | |
| parent | 476a3143d7c1a94b795a4804ab894893f490cf33 (diff) | |
| parent | 42a7ce27d97022f4abbba142dfa00d1450512f0a (diff) | |
Merge tag 'video-for-2019.10-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-video
- fix EDID mode filtering
- extend mxc_ipuv3_fb to enable backlight/display
- include fb_base in global_data for DM_VIDEO
- show frame buffer address via board info
as used to be with legacy VIDEO support
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/global_data.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 7c2220643b5..5372d5d8cd9 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -33,7 +33,7 @@ typedef struct global_data { /* We cannot bracket this with CONFIG_PCI due to mpc5xxx */ unsigned long pci_clk; unsigned long mem_clk; -#if defined(CONFIG_LCD) || defined(CONFIG_VIDEO) +#if defined(CONFIG_LCD) || defined(CONFIG_VIDEO) || defined(CONFIG_DM_VIDEO) unsigned long fb_base; /* Base address of framebuffer mem */ #endif #if defined(CONFIG_POST) |