diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-12 18:46:07 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-12 18:46:07 -0400 |
| commit | 5939afc9611e8ba4a86b96e67670b765ee27668e (patch) | |
| tree | 369402e0305a7b8f9f905baec6387bfd9683ba71 /common/board_f.c | |
| parent | d7ae932152ddf58125a05f4eb28596d9b31bdb1e (diff) | |
| parent | ec1fa18561f818bee252da2c331d371ad26037d2 (diff) | |
Merge branch '2019-08-11-master-imports'
- environment cleanup
- HiKey 960 support
- Some PCI fixes
Diffstat (limited to 'common/board_f.c')
| -rw-r--r-- | common/board_f.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/common/board_f.c b/common/board_f.c index 4760d728f37..31181a9dc45 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -14,11 +14,13 @@ #include <console.h> #include <cpu.h> #include <dm.h> -#include <environment.h> +#include <env.h> +#include <env_internal.h> #include <fdtdec.h> #include <fs.h> #include <i2c.h> #include <initcall.h> +#include <lcd.h> #include <malloc.h> #include <mapmem.h> #include <os.h> @@ -425,13 +427,6 @@ static int reserve_video(void) gd->relocaddr = lcd_setmem(gd->relocaddr); gd->fb_base = gd->relocaddr; # endif /* CONFIG_FB_ADDR */ -#elif defined(CONFIG_VIDEO) && \ - (!defined(CONFIG_PPC)) && \ - !defined(CONFIG_ARM) && !defined(CONFIG_X86) && \ - !defined(CONFIG_M68K) - /* reserve memory for video display (always full pages) */ - gd->relocaddr = video_setmem(gd->relocaddr); - gd->fb_base = gd->relocaddr; #endif return 0; |