CVS commit: pkgsrc/sysutils/u-boot

["Jared D. McNeill" <jmcneill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jmcneill
Date:           Mon Dec 18 23:27:14 UTC 2017

Modified Files:
        pkgsrc/sysutils/u-boot: distinfo
Added Files:
        pkgsrc/sysutils/u-boot/patches:
            patch-drivers_video_sunxi_sunxi__display.c

Log Message:
Align sunxi FB start to 8KB to match NetBSD arm PAGE_SIZE


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/u-boot/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/u-boot/patches/patch-drivers_video_sunxi_sunxi__display.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/u-boot/distinfo
diff -u pkgsrc/sysutils/u-boot/distinfo:1.8 pkgsrc/sysutils/u-boot/distinfo:1.9
--- pkgsrc/sysutils/u-boot/distinfo:1.8 Wed Nov 15 22:08:27 2017
+++ pkgsrc/sysutils/u-boot/distinfo     Mon Dec 18 23:27:14 2017
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.8 2017/11/15 22:08:27 jmcneill Exp $
+$NetBSD: distinfo,v 1.9 2017/12/18 23:27:14 jmcneill Exp $
 
 SHA1 (u-boot-2017.11.tar.bz2) = 6a3932b39a0f165aba210663ea2500bcfb9c8794
 RMD160 (u-boot-2017.11.tar.bz2) = 38e1331640b81e74ea78ebf41f94bcdbd675dcb2
 SHA512 (u-boot-2017.11.tar.bz2) = 485b9ab7cea0a250d964822bdb99a8426852b4e815b506329dedc4f5a69757c8b1a812998561161d44d98f6fabb9c8937e8250de1244d258fc9f13624b38d643
 Size (u-boot-2017.11.tar.bz2) = 11982382 bytes
 SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 63cbbf2e3cebd46793fc03cc8e62297f6dc01aa9
+SHA1 (patch-drivers_video_sunxi_sunxi__display.c) = 0a441ed39e95b11fa621b1e8e8568e7e4f1fd33a
 SHA1 (patch-include_configs_tegra-common.h) = 01b68620414f85edd029e54f7f8dc158888c4072
 SHA1 (patch-lib_bch.c) = b1f1c7418f1004c151b9e5e06ab7047a1736ae47
 SHA1 (patch-tools_Makefile) = adc5082d369363113135d5c892822b57ee80ff19

Added files:

Index: pkgsrc/sysutils/u-boot/patches/patch-drivers_video_sunxi_sunxi__display.c
diff -u /dev/null pkgsrc/sysutils/u-boot/patches/patch-drivers_video_sunxi_sunxi__display.c:1.1
--- /dev/null   Mon Dec 18 23:27:14 2017
+++ pkgsrc/sysutils/u-boot/patches/patch-drivers_video_sunxi_sunxi__display.c   Mon Dec 18 23:27:14 2017
@@ -0,0 +1,26 @@
+$NetBSD: patch-drivers_video_sunxi_sunxi__display.c,v 1.1 2017/12/18 23:27:14 jmcneill Exp $
+
+Align FB address to 8KB for NetBSD/arm.
+
+--- drivers/video/sunxi/sunxi_display.c.orig   2017-11-14 01:08:06.000000000 +0000
++++ drivers/video/sunxi/sunxi_display.c
+@@ -1186,7 +1186,7 @@ void *video_hw_init(void)
+       /* We want to keep the fb_base for simplefb page aligned, where as
+        * the sunxi dma engines will happily accept an unaligned address. */
+       if (overscan_offset)
+-              sunxi_display.fb_size += 0x1000;
++              sunxi_display.fb_size += 0x2000;
+ 
+       if (sunxi_display.fb_size > CONFIG_SUNXI_MAX_FB_SIZE) {
+               printf("Error need %dkB for fb, but only %dkB is reserved\n",
+@@ -1208,8 +1208,8 @@ void *video_hw_init(void)
+       fb_dma_addr = gd->fb_base - CONFIG_SYS_SDRAM_BASE;
+       sunxi_display.fb_addr = gd->fb_base;
+       if (overscan_offset) {
+-              fb_dma_addr += 0x1000 - (overscan_offset & 0xfff);
+-              sunxi_display.fb_addr += (overscan_offset + 0xfff) & ~0xfff;
++              fb_dma_addr += 0x2000 - (overscan_offset & 0x1fff);
++              sunxi_display.fb_addr += (overscan_offset + 0x1fff) & ~0x1fff;
+               memset((void *)gd->fb_base, 0, sunxi_display.fb_size);
+               flush_cache(gd->fb_base, sunxi_display.fb_size);
+       }