package/uBootNanoPiR2s: patch to expand kernel image space

To workaround size increased kernel causing `FDT image overlaps OS image` error
EHfive · Feb 1, 2024 · 181c39f · 181c39f
1 parent 9076459
commit 181c39f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/packages/uboot-nanopi-r2s/default.nix b/packages/uboot-nanopi-r2s/default.nix
@@ -7,6 +7,9 @@ let
 in
 buildUBoot {
   defconfig = "nanopi-r2s-rk3328_defconfig";
+  extraPatches = [
+    ./expand-kernel-image-addr-space.patch
+  ];
   extraMeta.platforms = [ "aarch64-linux" ];
   BL31 = "${armTrustedFirmwareRK3328}/bl31.elf";
   enableParallelBuilding = true;

diff --git a/packages/uboot-nanopi-r2s/expand-kernel-image-addr-space.patch b/packages/uboot-nanopi-r2s/expand-kernel-image-addr-space.patch
@@ -0,0 +1,15 @@
+diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h
+index e920ec7e5d..40c11ae10b 100644
+--- a/include/configs/rk3328_common.h
++++ b/include/configs/rk3328_common.h
+@@ -18,8 +18,8 @@
+ 	"pxefile_addr_r=0x00600000\0" \
+ 	"fdt_addr_r=0x01f00000\0" \
+ 	"kernel_addr_r=0x02080000\0" \
+-	"ramdisk_addr_r=0x06000000\0" \
+-	"kernel_comp_addr_r=0x08000000\0" \
++	"ramdisk_addr_r=0x08000000\0" \
++	"kernel_comp_addr_r=0x10000000\0" \
+ 	"kernel_comp_size=0x2000000\0"
+
+ #define CFG_EXTRA_ENV_SETTINGS \