diff options
| author | Tom Rini <trini@konsulko.com> | 2020-03-10 13:13:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-03-10 13:13:08 -0400 |
| commit | 3a1cb953085ecca1dd2f87288375801ebd580bab (patch) | |
| tree | 3a7bacdbbd6ac9a5d3fe98f1eeb67a30ffac90e4 /include/configs/mx6cuboxi.h | |
| parent | b62cd976543ae1b90050346c870d8357d749fe2d (diff) | |
| parent | 9f656fbee3b433ae1e9daf5d92d46bbdcc9551eb (diff) | |
Merge tag 'u-boot-imx-20200310' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
Fixes for 2020.04
-----------------
- DM : mx6sabresd
- mx6ul_14x14_evk: fix video
- mx8qxp; fix console for booting
- sync DTS with kernel (imx6sx)
- drop obsolete woodburn (mx35)
Travis: https://travis-ci.org/sbabic/u-boot-imx/builds/660550811
Diffstat (limited to 'include/configs/mx6cuboxi.h')
| -rw-r--r-- | include/configs/mx6cuboxi.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 6d47e28fc7..a6690367f8 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -66,7 +66,6 @@ "ramdisk_addr_r=0x13000000\0" \ "ramdiskaddr=0x13000000\0" \ "initrd_high=0xffffffff\0" \ - "fdt_high=0xffffffff\0" \ "ip_dyn=yes\0" \ "console=" CONSOLE_DEV ",115200\0" \ "bootm_size=0x10000000\0" \ |