Sun Aug 27 23:12:52 2023 UTC ()
u-boot-nanopi-r2s: add new package

This has been tested by myself and found to work seemingly stably,
including the RTL8153 USB-based Ethernet port (which was reported to
have issues on port-arm@ back in 2022).

This package is not based on the one in wip, as it was very out of date
and was reported to support less of the hardware correctly. Instead,
the more current framework for Rockchip boards in pkgsrc is used.


(gutteridge)
diff -r1.1067 -r1.1068 pkgsrc/sysutils/Makefile
diff -r1.37 -r1.38 pkgsrc/sysutils/u-boot/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/u-boot/distinfo-2022.01
diff -r1.17 -r1.18 pkgsrc/sysutils/u-boot/u-boot-rockchip.mk
diff -r0 -r1.1 pkgsrc/sysutils/u-boot-nanopi-r2s/DESCR
diff -r0 -r1.1 pkgsrc/sysutils/u-boot-nanopi-r2s/Makefile
diff -r0 -r1.1 pkgsrc/sysutils/u-boot-nanopi-r2s/PLIST
diff -r0 -r1.1 pkgsrc/sysutils/u-boot-nanopi-r2s/files/installboot.plist
diff -r0 -r1.1 pkgsrc/sysutils/u-boot/patches-2022.01/patch-configs_nanopi-r2s-rk3328_defconfig

cvs diff -r1.1067 -r1.1068 pkgsrc/sysutils/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/Makefile 2023/08/20 04:05:59 1.1067
+++ pkgsrc/sysutils/Makefile 2023/08/27 23:12:52 1.1068
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1067 2023/08/20 04:05:59 markd Exp $ 1# $NetBSD: Makefile,v 1.1068 2023/08/27 23:12:52 gutteridge Exp $
2# 2#
3 3
4COMMENT= System utilities 4COMMENT= System utilities
5 5
6SUBDIR+= 855resolution 6SUBDIR+= 855resolution
7SUBDIR+= 915resolution 7SUBDIR+= 915resolution
8SUBDIR+= 9base 8SUBDIR+= 9base
9SUBDIR+= R-biglm 9SUBDIR+= R-biglm
10SUBDIR+= R-ff 10SUBDIR+= R-ff
11SUBDIR+= R-later 11SUBDIR+= R-later
12SUBDIR+= R-processx 12SUBDIR+= R-processx
13SUBDIR+= R-progress 13SUBDIR+= R-progress
14SUBDIR+= R-ps 14SUBDIR+= R-ps
@@ -781,26 +781,27 @@ SUBDIR+= u-boot-jetson-tx1 @@ -781,26 +781,27 @@ SUBDIR+= u-boot-jetson-tx1
781SUBDIR+= u-boot-jetson-tx2 781SUBDIR+= u-boot-jetson-tx2
782SUBDIR+= u-boot-lamobo-r1 782SUBDIR+= u-boot-lamobo-r1
783SUBDIR+= u-boot-libretech-all-h3-cc-h2-plus 783SUBDIR+= u-boot-libretech-all-h3-cc-h2-plus
784SUBDIR+= u-boot-libretech-all-h3-cc-h3 784SUBDIR+= u-boot-libretech-all-h3-cc-h3
785SUBDIR+= u-boot-libretech-all-h3-cc-h5 785SUBDIR+= u-boot-libretech-all-h3-cc-h5
786SUBDIR+= u-boot-libretech-cc 786SUBDIR+= u-boot-libretech-cc
787SUBDIR+= u-boot-licheepi-zero 787SUBDIR+= u-boot-licheepi-zero
788SUBDIR+= u-boot-nanopi-duo2 788SUBDIR+= u-boot-nanopi-duo2
789SUBDIR+= u-boot-nanopi-m1 789SUBDIR+= u-boot-nanopi-m1
790SUBDIR+= u-boot-nanopi-neo 790SUBDIR+= u-boot-nanopi-neo
791SUBDIR+= u-boot-nanopi-neo-plus2 791SUBDIR+= u-boot-nanopi-neo-plus2
792SUBDIR+= u-boot-nanopi-neo2 792SUBDIR+= u-boot-nanopi-neo2
793SUBDIR+= u-boot-nanopi-r1 793SUBDIR+= u-boot-nanopi-r1
 794SUBDIR+= u-boot-nanopi-r2s
794SUBDIR+= u-boot-odroid-c2 795SUBDIR+= u-boot-odroid-c2
795SUBDIR+= u-boot-odroid-xu3 796SUBDIR+= u-boot-odroid-xu3
796SUBDIR+= u-boot-orangepi-2 797SUBDIR+= u-boot-orangepi-2
797SUBDIR+= u-boot-orangepi-lite 798SUBDIR+= u-boot-orangepi-lite
798SUBDIR+= u-boot-orangepi-lite2 799SUBDIR+= u-boot-orangepi-lite2
799SUBDIR+= u-boot-orangepi-one 800SUBDIR+= u-boot-orangepi-one
800SUBDIR+= u-boot-orangepi-pc 801SUBDIR+= u-boot-orangepi-pc
801SUBDIR+= u-boot-orangepi-plus2e 802SUBDIR+= u-boot-orangepi-plus2e
802SUBDIR+= u-boot-orangepi-zero 803SUBDIR+= u-boot-orangepi-zero
803SUBDIR+= u-boot-orangepi-zero-plus 804SUBDIR+= u-boot-orangepi-zero-plus
804SUBDIR+= u-boot-pandaboard 805SUBDIR+= u-boot-pandaboard
805SUBDIR+= u-boot-pico-pi-imx7d 806SUBDIR+= u-boot-pico-pi-imx7d
806SUBDIR+= u-boot-pine-h64 807SUBDIR+= u-boot-pine-h64

cvs diff -r1.37 -r1.38 pkgsrc/sysutils/u-boot/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot/Makefile 2023/08/14 05:25:19 1.37
+++ pkgsrc/sysutils/u-boot/Makefile 2023/08/27 23:12:52 1.38
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.37 2023/08/14 05:25:19 wiz Exp $ 1# $NetBSD: Makefile,v 1.38 2023/08/27 23:12:52 gutteridge Exp $
2# 2#
3 3
4.include "../../sysutils/u-boot/u-boot-version.mk" 4.include "../../sysutils/u-boot/u-boot-version.mk"
5 5
6DISTNAME= u-boot-${UBOOT_VERSION} 6DISTNAME= u-boot-${UBOOT_VERSION}
7PKGREVISION= 12 7PKGREVISION= 13
8CATEGORIES= sysutils meta-pkgs 8CATEGORIES= sysutils meta-pkgs
9MASTER_SITES= # empty 9MASTER_SITES= # empty
10 10
11MAINTAINER= jmcneill@NetBSD.org 11MAINTAINER= jmcneill@NetBSD.org
12HOMEPAGE= https://www.denx.de/wiki/U-Boot 12HOMEPAGE= https://www.denx.de/wiki/U-Boot
13COMMENT= Das U-Boot, the Universal Boot Loader (meta-package) 13COMMENT= Das U-Boot, the Universal Boot Loader (meta-package)
14 14
15META_PACKAGE= yes 15META_PACKAGE= yes
16 16
17.include "options.mk" 17.include "options.mk"
18.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
19 19
20DEPENDS+= u-boot-a10-olinuxino-lime-[0-9]*:../../sysutils/u-boot-a10-olinuxino-lime 20DEPENDS+= u-boot-a10-olinuxino-lime-[0-9]*:../../sysutils/u-boot-a10-olinuxino-lime
@@ -44,26 +44,27 @@ DEPENDS+= u-boot-jetson-nano-[0-9]*:../. @@ -44,26 +44,27 @@ DEPENDS+= u-boot-jetson-nano-[0-9]*:../.
44DEPENDS+= u-boot-jetson-tk1-[0-9]*:../../sysutils/u-boot-jetson-tk1 44DEPENDS+= u-boot-jetson-tk1-[0-9]*:../../sysutils/u-boot-jetson-tk1
45DEPENDS+= u-boot-jetson-tx1-[0-9]*:../../sysutils/u-boot-jetson-tx1 45DEPENDS+= u-boot-jetson-tx1-[0-9]*:../../sysutils/u-boot-jetson-tx1
46DEPENDS+= u-boot-jetson-tx2-[0-9]*:../../sysutils/u-boot-jetson-tx2 46DEPENDS+= u-boot-jetson-tx2-[0-9]*:../../sysutils/u-boot-jetson-tx2
47DEPENDS+= u-boot-lamobo-r1-[0-9]*:../../sysutils/u-boot-lamobo-r1 47DEPENDS+= u-boot-lamobo-r1-[0-9]*:../../sysutils/u-boot-lamobo-r1
48.if !empty(PKG_OPTIONS:Mamlogic-meson) 48.if !empty(PKG_OPTIONS:Mamlogic-meson)
49DEPENDS+= u-boot-libretech-cc-[0-9]*:../../sysutils/u-boot-libretech-cc 49DEPENDS+= u-boot-libretech-cc-[0-9]*:../../sysutils/u-boot-libretech-cc
50.endif 50.endif
51DEPENDS+= u-boot-nanopi-duo2-[0-9]*:../../sysutils/u-boot-nanopi-duo2 51DEPENDS+= u-boot-nanopi-duo2-[0-9]*:../../sysutils/u-boot-nanopi-duo2
52DEPENDS+= u-boot-nanopi-m1-[0-9]*:../../sysutils/u-boot-nanopi-m1 52DEPENDS+= u-boot-nanopi-m1-[0-9]*:../../sysutils/u-boot-nanopi-m1
53DEPENDS+= u-boot-nanopi-neo-plus2-[0-9]*:../../sysutils/u-boot-nanopi-neo-plus2 53DEPENDS+= u-boot-nanopi-neo-plus2-[0-9]*:../../sysutils/u-boot-nanopi-neo-plus2
54DEPENDS+= u-boot-nanopi-neo-[0-9]*:../../sysutils/u-boot-nanopi-neo 54DEPENDS+= u-boot-nanopi-neo-[0-9]*:../../sysutils/u-boot-nanopi-neo
55DEPENDS+= u-boot-nanopi-neo2-[0-9]*:../../sysutils/u-boot-nanopi-neo2 55DEPENDS+= u-boot-nanopi-neo2-[0-9]*:../../sysutils/u-boot-nanopi-neo2
56DEPENDS+= u-boot-nanopi-r1-[0-9]*:../../sysutils/u-boot-nanopi-r1 56DEPENDS+= u-boot-nanopi-r1-[0-9]*:../../sysutils/u-boot-nanopi-r1
 57DEPENDS+= u-boot-nanopi-r2s-[0-9]*:../../sysutils/u-boot-nanopi-r2s
57.if !empty(PKG_OPTIONS:Mamlogic-meson) 58.if !empty(PKG_OPTIONS:Mamlogic-meson)
58DEPENDS+= u-boot-odroid-c2-[0-9]*:../../sysutils/u-boot-odroid-c2 59DEPENDS+= u-boot-odroid-c2-[0-9]*:../../sysutils/u-boot-odroid-c2
59.endif 60.endif
60DEPENDS+= u-boot-odroid-xu3-[0-9]*:../../sysutils/u-boot-odroid-xu3 61DEPENDS+= u-boot-odroid-xu3-[0-9]*:../../sysutils/u-boot-odroid-xu3
61DEPENDS+= u-boot-orangepi-2-[0-9]*:../../sysutils/u-boot-orangepi-2 62DEPENDS+= u-boot-orangepi-2-[0-9]*:../../sysutils/u-boot-orangepi-2
62DEPENDS+= u-boot-orangepi-lite-[0-9]*:../../sysutils/u-boot-orangepi-lite 63DEPENDS+= u-boot-orangepi-lite-[0-9]*:../../sysutils/u-boot-orangepi-lite
63DEPENDS+= u-boot-orangepi-lite2-[0-9]*:../../sysutils/u-boot-orangepi-lite2 64DEPENDS+= u-boot-orangepi-lite2-[0-9]*:../../sysutils/u-boot-orangepi-lite2
64DEPENDS+= u-boot-orangepi-one-[0-9]*:../../sysutils/u-boot-orangepi-one 65DEPENDS+= u-boot-orangepi-one-[0-9]*:../../sysutils/u-boot-orangepi-one
65DEPENDS+= u-boot-orangepi-plus2e-[0-9]*:../../sysutils/u-boot-orangepi-plus2e 66DEPENDS+= u-boot-orangepi-plus2e-[0-9]*:../../sysutils/u-boot-orangepi-plus2e
66DEPENDS+= u-boot-orangepi-zero-[0-9]*:../../sysutils/u-boot-orangepi-zero 67DEPENDS+= u-boot-orangepi-zero-[0-9]*:../../sysutils/u-boot-orangepi-zero
67DEPENDS+= u-boot-orangepi-zero-plus-[0-9]*:../../sysutils/u-boot-orangepi-zero-plus 68DEPENDS+= u-boot-orangepi-zero-plus-[0-9]*:../../sysutils/u-boot-orangepi-zero-plus
68DEPENDS+= u-boot-pandaboard-[0-9]*:../../sysutils/u-boot-pandaboard 69DEPENDS+= u-boot-pandaboard-[0-9]*:../../sysutils/u-boot-pandaboard
69DEPENDS+= u-boot-pine-h64-[0-9]*:../../sysutils/u-boot-pine-h64 70DEPENDS+= u-boot-pine-h64-[0-9]*:../../sysutils/u-boot-pine-h64

cvs diff -r1.2 -r1.3 pkgsrc/sysutils/u-boot/distinfo-2022.01 (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot/distinfo-2022.01 2022/02/12 07:44:55 1.2
+++ pkgsrc/sysutils/u-boot/distinfo-2022.01 2023/08/27 23:12:52 1.3
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: distinfo-2022.01,v 1.2 2022/02/12 07:44:55 mrg Exp $ 1$NetBSD: distinfo-2022.01,v 1.3 2023/08/27 23:12:52 gutteridge Exp $
2 2
3BLAKE2s (u-boot-2022.01.tar.bz2) = 54855aa008e78886dd48a25042eebedb1aee301571e578325131ed93d248c329 3BLAKE2s (u-boot-2022.01.tar.bz2) = 54855aa008e78886dd48a25042eebedb1aee301571e578325131ed93d248c329
4SHA512 (u-boot-2022.01.tar.bz2) = d83c62bd8f0f51664d2aca329a3ce1379cfd1dfff439dccd6cfc2cb33cfef89a2b01855c97716f591b5550bfdf99e2f3aef7efa33f2e7834c820648f9eef3825 4SHA512 (u-boot-2022.01.tar.bz2) = d83c62bd8f0f51664d2aca329a3ce1379cfd1dfff439dccd6cfc2cb33cfef89a2b01855c97716f591b5550bfdf99e2f3aef7efa33f2e7834c820648f9eef3825
5Size (u-boot-2022.01.tar.bz2) = 17449627 bytes 5Size (u-boot-2022.01.tar.bz2) = 17449627 bytes
6SHA1 (patch-arch_arm_lib_interrupts__64.c) = 708be481a01b84c6c69d88465adf898b659dbeab 6SHA1 (patch-arch_arm_lib_interrupts__64.c) = 708be481a01b84c6c69d88465adf898b659dbeab
7SHA1 (patch-arch_arm_mach-rockchip_rk3399_rk3399.c) = caa4068c635eaef5997501e154ec5cb11dcbf490 7SHA1 (patch-arch_arm_mach-rockchip_rk3399_rk3399.c) = caa4068c635eaef5997501e154ec5cb11dcbf490
8SHA1 (patch-board_pine64_pinebook-pro-rk3399_pinebook-pro-rk3399.c) = 49954716240e93b33e13288f92b14f527ba15bdf 8SHA1 (patch-board_pine64_pinebook-pro-rk3399_pinebook-pro-rk3399.c) = 49954716240e93b33e13288f92b14f527ba15bdf
 9SHA1 (patch-configs_nanopi-r2s-rk3328_defconfig) = 928b198eaa983d36e46e26baec442b88f25a1359
9SHA1 (patch-configs_pinebook-pro-rk3399_defconfig) = dceca39a9574e3491f835232b398c739d35e5e95 10SHA1 (patch-configs_pinebook-pro-rk3399_defconfig) = dceca39a9574e3491f835232b398c739d35e5e95
10SHA1 (patch-configs_rock64-rk3328_defconfig) = 44c0131d36fbc0bad769104ce07bdab9ae605bbd 11SHA1 (patch-configs_rock64-rk3328_defconfig) = 44c0131d36fbc0bad769104ce07bdab9ae605bbd
11SHA1 (patch-configs_rockpro64-rk3399_defconfig) = d42aba165cb4aca635e514177f43bffacfa8ace5 12SHA1 (patch-configs_rockpro64-rk3399_defconfig) = d42aba165cb4aca635e514177f43bffacfa8ace5
12SHA1 (patch-drivers_pci_pcie__rockchip.c) = 5ead0933261b2cef81cd317df478e47ecc0382d4 13SHA1 (patch-drivers_pci_pcie__rockchip.c) = 5ead0933261b2cef81cd317df478e47ecc0382d4
13SHA1 (patch-drivers_usb_host_usb-uclass.c) = 754504a9dc08f888a4ef09f5ccc3cb56b5ce297a 14SHA1 (patch-drivers_usb_host_usb-uclass.c) = 754504a9dc08f888a4ef09f5ccc3cb56b5ce297a
14SHA1 (patch-include_config_distro_bootcmd.h) = d37da930903d9d80829ac3cd0da98334057b6188 15SHA1 (patch-include_config_distro_bootcmd.h) = d37da930903d9d80829ac3cd0da98334057b6188
15SHA1 (patch-include_configs_rockchip-common.h) = d9aa111ec38f2f8ad64c45d42d3bc5519e27382d 16SHA1 (patch-include_configs_rockchip-common.h) = d9aa111ec38f2f8ad64c45d42d3bc5519e27382d
16SHA1 (patch-include_configs_rockpro64_rk3399.h) = 7efd0b09cbf627dc59d2a23a76dd6506c9efc4c9 17SHA1 (patch-include_configs_rockpro64_rk3399.h) = 7efd0b09cbf627dc59d2a23a76dd6506c9efc4c9

cvs diff -r1.17 -r1.18 pkgsrc/sysutils/u-boot/u-boot-rockchip.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/u-boot/u-boot-rockchip.mk 2023/08/27 21:04:18 1.17
+++ pkgsrc/sysutils/u-boot/u-boot-rockchip.mk 2023/08/27 23:12:52 1.18
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1# $NetBSD: u-boot-rockchip.mk,v 1.17 2023/08/27 21:04:18 gutteridge Exp $ 1# $NetBSD: u-boot-rockchip.mk,v 1.18 2023/08/27 23:12:52 gutteridge Exp $
2# 2#
 3# used by sysutils/u-boot-nanopi-r2s/Makefile
3# used by sysutils/u-boot-rock64/Makefile 4# used by sysutils/u-boot-rock64/Makefile
4# used by sysutils/u-boot-rockpro64/Makefile 5# used by sysutils/u-boot-rockpro64/Makefile
5# used by sysutils/u-boot-pinebook-pro/Makefile 6# used by sysutils/u-boot-pinebook-pro/Makefile
6 7
7# Common makefile fragment for rockchip based u-boot targets. 8# Common makefile fragment for rockchip based u-boot targets.
8# 9#
9# Set these variables: 10# Set these variables:
10# 11#
11# UBOOT_IMAGE_TYPE ("rk3399", "rk3328") 12# UBOOT_IMAGE_TYPE ("rk3399", "rk3328")
12# 13#
13 14
14UBOOT_VERSION?= 2022.01 15UBOOT_VERSION?= 2022.01
15 16

File Added: pkgsrc/sysutils/u-boot-nanopi-r2s/DESCR
U-Boot is a bootloader for embedded boards based on PowerPC, ARM, MIPS and
several other processors, which can be installed in a boot ROM and used to
initialize and test the hardware or to download and run application code.

This package provides U-Boot for the FriendlyElec NanoPi R2S.

File Added: pkgsrc/sysutils/u-boot-nanopi-r2s/Makefile
# $NetBSD: Makefile,v 1.1 2023/08/27 23:12:52 gutteridge Exp $

UBOOT_TARGET=		nanopi-r2s
UBOOT_CONFIG=		nanopi-r2s-rk3328_defconfig
UBOOT_BIN=		idbloader.img rksd_loader.img rkspi_loader.img u-boot.itb
UBOOT_IMAGE_TYPE=	rk3328
UBOOT_MKIMAGE_RKSPI=	1
UBOOT_RK_SPI_OFF=	768

UBOOT_INSTALLBOOT_PLIST=	installboot.plist

.include "../../sysutils/u-boot/u-boot-rockchip.mk"
.include "../../mk/bsd.pkg.mk"

File Added: pkgsrc/sysutils/u-boot-nanopi-r2s/PLIST
@comment $NetBSD: PLIST,v 1.1 2023/08/27 23:12:52 gutteridge Exp $
share/u-boot/nanopi-r2s/idbloader.img
share/u-boot/nanopi-r2s/installboot.plist
share/u-boot/nanopi-r2s/rksd_loader.img
share/u-boot/nanopi-r2s/rkspi_loader.img
share/u-boot/nanopi-r2s/u-boot.itb

File Added: pkgsrc/sysutils/u-boot-nanopi-r2s/files/installboot.plist
<!-- $NetBSD: installboot.plist,v 1.1 2023/08/27 23:12:52 gutteridge Exp $ -->
<!--
  Copyright (c) 2020 The NetBSD Foundation, Inc.
  All rights reserved.
 
  This code is derived from software contributed to The NetBSD Foundation
  by Jason R. Thorpe.
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
  1. Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
  2. Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in the
     documentation and/or other materials provided with the distribution.
 
  THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
-->
<plist>
<dict>
	<key>friendlyarm,nanopi-r2s</key>
	<dict>
		<key>description</key>
		<string>FriendlyElec NanoPi R2S</string>
		<key>u-boot-install</key>
		<array>
			<dict>
				<key>file-name</key>
				<string>rksd_loader.img</string>
				<key>image-offset</key>
				<integer>32768</integer>
			</dict>
		</array>
	</dict>
</dict>
</plist>

File Added: pkgsrc/sysutils/u-boot/patches-2022.01/patch-configs_nanopi-r2s-rk3328_defconfig
$NetBSD: patch-configs_nanopi-r2s-rk3328_defconfig,v 1.1 2023/08/27 23:12:52 gutteridge Exp $

Load u-boot from 256KB.

--- nanopi-r2s-rk3328_defconfig.orig	2022-01-10 13:46:34.000000000 -0500
+++ nanopi-r2s-rk3328_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
 CONFIG_ARCH_ROCKCHIP=y
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_SPL_GPIO=y
 CONFIG_NR_DRAM_BANKS=1