From 181c39f788f0428009f28e4ea79fa4c2ead87291 Mon Sep 17 00:00:00 2001 From: Huang-Huang Bao Date: Thu, 1 Feb 2024 19:30:37 +0800 Subject: [PATCH] package/uBootNanoPiR2s: patch to expand kernel image space To workaround size increased kernel causing `FDT image overlaps OS image` error --- packages/uboot-nanopi-r2s/default.nix | 3 +++ .../expand-kernel-image-addr-space.patch | 15 +++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 packages/uboot-nanopi-r2s/expand-kernel-image-addr-space.patch diff --git a/packages/uboot-nanopi-r2s/default.nix b/packages/uboot-nanopi-r2s/default.nix index 16e3bfc..d4ec12d 100644 --- 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 new file mode 100644 index 0000000..9f441af --- /dev/null +++ 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 \