CVS commit: pkgsrc/sysutils/u-boot-bananapi-r2

["Jason R Thorpe" <thorpej%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thorpej
Date:           Sat Jun 20 17:19:37 UTC 2020

Modified Files:
        pkgsrc/sysutils/u-boot-bananapi-r2: Makefile distinfo
Added Files:
        pkgsrc/sysutils/u-boot-bananapi-r2/patches:
            patch-include_configs_mt7623.h

Log Message:
Set the bootm_size, kernel_addr_r, fdt_addr_r, scriptaddr, pxefile_addr_r,
ramdisk_addr_r, and fdtfile environment varibles.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/u-boot-bananapi-r2/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/u-boot-bananapi-r2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/u-boot-bananapi-r2/patches/patch-include_configs_mt7623.h

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-bananapi-r2/Makefile
diff -u pkgsrc/sysutils/u-boot-bananapi-r2/Makefile:1.6 pkgsrc/sysutils/u-boot-bananapi-r2/Makefile:1.7
--- pkgsrc/sysutils/u-boot-bananapi-r2/Makefile:1.6     Mon Nov  4 21:28:54 2019
+++ pkgsrc/sysutils/u-boot-bananapi-r2/Makefile Sat Jun 20 17:19:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/11/04 21:28:54 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2020/06/20 17:19:37 thorpej Exp $
 
 UBOOT_TARGET=          bananapi-r2
 UBOOT_CONFIG=          mt7623n_bpir2_defconfig
@@ -6,7 +6,7 @@ UBOOT_BIN=              bpi-r2-sdmmc.img u-boot.bin
 
 UBOOT_INSTALLBOOT_PLIST=       installboot.plist
 
-PKGREVISION=           3
+PKGREVISION=           4
 
 UBOOT_VERSION=         2019.04-rc4
 

Index: pkgsrc/sysutils/u-boot-bananapi-r2/distinfo
diff -u pkgsrc/sysutils/u-boot-bananapi-r2/distinfo:1.2 pkgsrc/sysutils/u-boot-bananapi-r2/distinfo:1.3
--- pkgsrc/sysutils/u-boot-bananapi-r2/distinfo:1.2     Sun Mar 24 20:50:10 2019
+++ pkgsrc/sysutils/u-boot-bananapi-r2/distinfo Sat Jun 20 17:19:37 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2019/03/24 20:50:10 thorpej Exp $
+$NetBSD: distinfo,v 1.3 2020/06/20 17:19:37 thorpej Exp $
 
 SHA1 (BPI-R2-HEAD1-512b.img) = ef5ae9707d39654b8d931a0bd8c0825318591e69
 RMD160 (BPI-R2-HEAD1-512b.img) = 098f7c260353034a3d286d2113698c16605cd4b4
@@ -17,4 +17,5 @@ RMD160 (u-boot-2019.04-rc4.tar.bz2) = 67
 SHA512 (u-boot-2019.04-rc4.tar.bz2) = 33a57e4acb51dbe04123055b159a5b3a933ea8340aa81a4148572ee5fc12288413a6c6c0b80b6fe099ac79ea6359be2d9034ead1edfcc0403895f3f8eb56746e
 Size (u-boot-2019.04-rc4.tar.bz2) = 13616834 bytes
 SHA1 (patch-Makefile) = b64ed7e0eac7299e9c621e32b4afb976c8dfda5a
+SHA1 (patch-include_configs_mt7623.h) = 3f4985844a753dac03834a14366fd76234ab6574
 SHA1 (patch-lib_bch.c) = 151e5f311742a7da919359950ccac2521bcfaaff

Added files:

Index: pkgsrc/sysutils/u-boot-bananapi-r2/patches/patch-include_configs_mt7623.h
diff -u /dev/null pkgsrc/sysutils/u-boot-bananapi-r2/patches/patch-include_configs_mt7623.h:1.1
--- /dev/null   Sat Jun 20 17:19:37 2020
+++ pkgsrc/sysutils/u-boot-bananapi-r2/patches/patch-include_configs_mt7623.h   Sat Jun 20 17:19:37 2020
@@ -0,0 +1,48 @@
+$NetBSD: patch-include_configs_mt7623.h,v 1.1 2020/06/20 17:19:37 thorpej Exp $
+
+Set the bootm_size, kernel_addr_r, fdt_addr_r, scriptaddr, pxefile_addr_r,
+ramdisk_addr_r, and fdtfile environment varibles.
+
+--- include/configs/mt7623.h.orig      2019-05-20 21:48:27.989085653 -0700
++++ include/configs/mt7623.h   2019-05-20 21:59:17.210366023 -0700
+@@ -45,14 +45,39 @@
+ #define CONFIG_SUPPORT_EMMC_BOOT
+ 
+ /* DRAM */
++#define SDRAM_OFFSET(x) 0x8##x
+ #define CONFIG_SYS_SDRAM_BASE         0x80000000
+ 
+ /* This is needed for kernel booting */
+ #define FDT_HIGH                      "fdt_high=0xac000000\0"
+ 
++/*      
++ * 128M RAM (256M minimum minus 64MB heap + 64MB for u-boot, stack, fb, etc.
++ * 32M uncompressed kernel, 16M compressed kernel, 1M fdt,
++ * 1M script, 1M pxe and the ramdisk at the end.
++ */
++#define BOOTM_SIZE     __stringify(0xa000000)
++#define KERNEL_ADDR_R  __stringify(SDRAM_OFFSET(4000000))
++#define FDT_ADDR_R     __stringify(SDRAM_OFFSET(5000000))
++#define SCRIPT_ADDR_R  __stringify(SDRAM_OFFSET(5100000))
++#define PXEFILE_ADDR_R __stringify(SDRAM_OFFSET(5200000))
++#define RAMDISK_ADDR_R __stringify(SDRAM_OFFSET(5300000))
++
++#define MEM_LAYOUT_ENV_SETTINGS \
++      "bootm_size=" BOOTM_SIZE "\0" \
++      "kernel_addr_r=" KERNEL_ADDR_R "\0" \
++      "fdt_addr_r=" FDT_ADDR_R "\0" \
++      "scriptaddr=" SCRIPT_ADDR_R "\0" \
++      "pxefile_addr_r=" PXEFILE_ADDR_R "\0" \
++      "ramdisk_addr_r=" RAMDISK_ADDR_R "\0"
++
++#define FDTFILE CONFIG_DEFAULT_DEVICE_TREE ".dtb"
++
+ /* Extra environment variables */
+ #define CONFIG_EXTRA_ENV_SETTINGS     \
+-      FDT_HIGH
++      FDT_HIGH \
++      MEM_LAYOUT_ENV_SETTINGS \
++      "fdtfile=" FDTFILE "\0"
+ 
+ /* Ethernet */
+ #define CONFIG_IPADDR                 192.168.1.1