diff --git a/patch/u-boot/u-boot-sunxi/h3-add-disp2-video-driver-jernej.patch b/patch/u-boot/u-boot-sunxi/h3-add-disp2-video-driver-jernej.patch
index f53f5c897..ad6a66021 100644
--- a/patch/u-boot/u-boot-sunxi/h3-add-disp2-video-driver-jernej.patch
+++ b/patch/u-boot/u-boot-sunxi/h3-add-disp2-video-driver-jernej.patch
@@ -144,7 +144,6 @@ index be9fcfd..02d4a8c 100644
  void clock_set_mipi_pll(unsigned int hz);
  unsigned int clock_get_pll3(void);
 diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h b/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h
-index 5f93830..2cbc630 100644
 --- a/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h
 +++ b/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h
 @@ -18,6 +18,8 @@
@@ -179,7 +178,6 @@ index 5f93830..2cbc630 100644
  
 diff --git a/arch/arm/include/asm/arch-sunxi/display2.h b/arch/arm/include/asm/arch-sunxi/display2.h
 new file mode 100644
-index 0000000..04790a8
 --- /dev/null
 +++ b/arch/arm/include/asm/arch-sunxi/display2.h
 @@ -0,0 +1,282 @@
@@ -466,7 +464,6 @@ index 0000000..04790a8
 +
 +#endif /* _SUNXI_DISPLAY_H */
 diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c
-index ed8cd9b..3a81e9d 100644
 --- a/arch/arm/mach-sunxi/clock_sun6i.c
 +++ b/arch/arm/mach-sunxi/clock_sun6i.c
 @@ -141,6 +141,17 @@ void clock_set_pll3(unsigned int clk)
@@ -525,7 +522,6 @@ index ed8cd9b..3a81e9d 100644
  }
 +#endif
 diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
-index c0ffeb3..4fed7e3 100644
 --- a/board/sunxi/Kconfig
 +++ b/board/sunxi/Kconfig
 @@ -458,7 +458,7 @@ config AXP_GPIO
@@ -547,7 +543,6 @@ index c0ffeb3..4fed7e3 100644
  	---help---
  	Say Y here to add support for outputting video over HDMI.
 diff --git a/configs/orangepi_2_defconfig b/configs/orangepi_2_defconfig
-index 4727aca..dea819d 100644
 --- a/configs/orangepi_2_defconfig
 +++ b/configs/orangepi_2_defconfig
 @@ -16,3 +16,4 @@ CONFIG_SPL=y
@@ -556,7 +551,6 @@ index 4727aca..dea819d 100644
  CONFIG_USB_EHCI_HCD=y
 +CONFIG_VIDEO=y
 diff --git a/configs/orangepi_lite_defconfig b/configs/orangepi_lite_defconfig
-index 8545835..8801825 100644
 --- a/configs/orangepi_lite_defconfig
 +++ b/configs/orangepi_lite_defconfig
 @@ -12,3 +12,4 @@ CONFIG_SPL=y
@@ -565,7 +559,6 @@ index 8545835..8801825 100644
  CONFIG_USB_EHCI_HCD=y
 +CONFIG_VIDEO=y
 diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig
-index 01b4ece..fc72a96 100644
 --- a/configs/orangepi_one_defconfig
 +++ b/configs/orangepi_one_defconfig
 @@ -13,3 +13,4 @@ CONFIG_SPL=y
@@ -574,7 +567,6 @@ index 01b4ece..fc72a96 100644
  CONFIG_USB_EHCI_HCD=y
 +CONFIG_VIDEO=y
 diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig
-index 910d68e..e0b579d 100644
 --- a/configs/orangepi_pc_defconfig
 +++ b/configs/orangepi_pc_defconfig
 @@ -15,3 +15,4 @@ CONFIG_SPL=y
@@ -583,7 +575,6 @@ index 910d68e..e0b579d 100644
  CONFIG_USB_EHCI_HCD=y
 +CONFIG_VIDEO=y
 diff --git a/configs/orangepi_pc_plus_defconfig b/configs/orangepi_pc_plus_defconfig
-index f43682b..9b8d407 100644
 --- a/configs/orangepi_pc_plus_defconfig
 +++ b/configs/orangepi_pc_plus_defconfig
 @@ -16,3 +16,4 @@ CONFIG_SPL=y
@@ -592,7 +583,6 @@ index f43682b..9b8d407 100644
  CONFIG_USB_EHCI_HCD=y
 +CONFIG_VIDEO=y
 diff --git a/configs/orangepi_plus2e_defconfig b/configs/orangepi_plus2e_defconfig
-index df05d37..0eb9466 100644
 --- a/configs/orangepi_plus2e_defconfig
 +++ b/configs/orangepi_plus2e_defconfig
 @@ -17,3 +17,4 @@ CONFIG_SPL=y
@@ -601,7 +591,6 @@ index df05d37..0eb9466 100644
  CONFIG_USB_EHCI_HCD=y
 +CONFIG_VIDEO=y
 diff --git a/configs/orangepi_plus_defconfig b/configs/orangepi_plus_defconfig
-index bf88fef..c773ef2 100644
 --- a/configs/orangepi_plus_defconfig
 +++ b/configs/orangepi_plus_defconfig
 @@ -18,3 +18,4 @@ CONFIG_SPL=y
@@ -610,7 +599,6 @@ index bf88fef..c773ef2 100644
  CONFIG_USB_EHCI_HCD=y
 +CONFIG_VIDEO=y
 diff --git a/drivers/video/Makefile b/drivers/video/Makefile
-index db34904..3097b82 100644
 --- a/drivers/video/Makefile
 +++ b/drivers/video/Makefile
 @@ -52,6 +52,7 @@ obj-$(CONFIG_VIDEO_OMAP3) += omap3_dss.o
@@ -623,7 +611,6 @@ index db34904..3097b82 100644
  obj-$(CONFIG_VIDEO_VESA) += vesa.o
 diff --git a/drivers/video/sunxi_display2.c b/drivers/video/sunxi_display2.c
 new file mode 100644
-index 0000000..bbe8e2b
 --- /dev/null
 +++ b/drivers/video/sunxi_display2.c
 @@ -0,0 +1,982 @@
@@ -655,6 +642,7 @@ index 0000000..bbe8e2b
 +#include <asm/io.h>
 +#include <errno.h>
 +#include <fdt_support.h>
++#include <malloc.h>
 +#include <video_fb.h>
 +#include "videomodes.h"
 +
@@ -1522,8 +1510,7 @@ index 0000000..bbe8e2b
 +	       sunxi_get_mon_desc(sunxi_display.monitor),
 +	       overscan_x, overscan_y);
 +
-+	gd->fb_base = gd->bd->bi_dram[0].start +
-+		      gd->bd->bi_dram[0].size - sunxi_display.fb_size;
++	gd->fb_base = (unsigned long)memalign(0x1000, sunxi_display.fb_size);
 +	sunxi_engines_init();
 +
 +	fb_dma_addr = gd->fb_base;
@@ -1625,7 +1612,6 @@ index 011d70f..c4eb3ba 100644
   * Include common sunxi configuration where most the settings are
   */
 diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
-index e0464df..211a37b 100644
 --- a/include/configs/sunxi-common.h
 +++ b/include/configs/sunxi-common.h
 @@ -277,16 +277,23 @@ extern int soft_i2c_gpio_scl;
@@ -1658,7 +1644,6 @@ index e0464df..211a37b 100644
  #define CONFIG_VIDEO_LOGO
  #define CONFIG_VIDEO_STD_TIMINGS
 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
-index 11b5a22..abb6d55 100644
 --- a/scripts/config_whitelist.txt
 +++ b/scripts/config_whitelist.txt
 @@ -4357,6 +4357,7 @@ CONFIG_ST_SMI