From 6a8b831593895ff9c8a687de7f7d0d24cdef8b3f Mon Sep 17 00:00:00 2001 From: Pawel Dembicki Date: Mon, 19 Feb 2024 13:39:10 +0100 Subject: [PATCH] mpc85xx: p1010: change wrapper address of simple image devices Kernel and initramfs size grows. Now uncompressed initramfs image and regular kernel image overlaps configured area: Initramfs: WRAP arch/powerpc/boot/simpleImage.br200-wp INFO: Uncompressed kernel (size 0x1428688) overlaps the address of the wrapper(0x1000000) INFO: Fixing the link_address of wrapper to (0x1500000) WRAP arch/powerpc/boot/simpleImage.tl-wdr4900-v1 INFO: Uncompressed kernel (size 0x1428688) overlaps the address of the wrapper(0x1000000) INFO: Fixing the link_address of wrapper to (0x1500000) WRAP arch/powerpc/boot/simpleImage.ws-ap3715i INFO: Uncompressed kernel (size 0x1428688) overlaps the address of the wrapper(0x1000000) INFO: Fixing the link_address of wrapper to (0x1500000) Regular image: WRAP arch/powerpc/boot/simpleImage.br200-wp INFO: Uncompressed kernel (size 0x10e0688) overlaps the address of the wrapper(0x1000000) INFO: Fixing the link_address of wrapper to (0x1100000) WRAP arch/powerpc/boot/simpleImage.tl-wdr4900-v1 INFO: Uncompressed kernel (size 0x10e0688) overlaps the address of the wrapper(0x1000000) INFO: Fixing the link_address of wrapper to (0x1100000) WRAP arch/powerpc/boot/simpleImage.ws-ap3715i INFO: Uncompressed kernel (size 0x10e0688) overlaps the address of the wrapper(0x1000000) INFO: Fixing the link_address of wrapper to (0x1100000) Let's change wrapper address to safe value. Tested on: TL-WDR4900, BR200-WP Signed-off-by: Pawel Dembicki --- target/linux/mpc85xx/image/p1010.mk | 12 ++++++------ .../100-powerpc-85xx-tl-wdr4900-v1-support.patch | 2 +- .../107-powerpc-85xx-add-ws-ap3825i-support.patch | 2 +- .../100-powerpc-85xx-tl-wdr4900-v1-support.patch | 2 +- .../107-powerpc-85xx-add-ws-ap3825i-support.patch | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/target/linux/mpc85xx/image/p1010.mk b/target/linux/mpc85xx/image/p1010.mk index c0de19f6c6..a4f2d13dd4 100644 --- a/target/linux/mpc85xx/image/p1010.mk +++ b/target/linux/mpc85xx/image/p1010.mk @@ -21,8 +21,8 @@ define Device/aerohive_br200-wp KERNEL_NAME := simpleImage.br200-wp KERNEL := kernel-bin | uImage none KERNEL_INITRAMFS := kernel-bin | uImage none - KERNEL_ENTRY := 0x1000000 - KERNEL_LOADADDR := 0x1000000 + KERNEL_ENTRY := 0x1500000 + KERNEL_LOADADDR := 0x1500000 KERNEL_SIZE := 8m IMAGES := fdt.bin sysupgrade.bin IMAGE/fdt.bin := append-dtb @@ -39,8 +39,8 @@ define Device/enterasys_ws-ap3715i DEVICE_MODEL := WS-AP3715i BLOCKSIZE := 64k KERNEL_NAME := simpleImage.ws-ap3715i - KERNEL_ENTRY := 0x1000000 - KERNEL_LOADADDR := 0x1000000 + KERNEL_ENTRY := 0x1500000 + KERNEL_LOADADDR := 0x1500000 KERNEL = kernel-bin | lzma | uImage lzma IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata @@ -60,8 +60,8 @@ define Device/tplink_tl-wdr4900-v1 KERNEL_NAME := simpleImage.tl-wdr4900-v1 KERNEL_INITRAMFS := KERNEL := kernel-bin | uImage none -M 0x4f4b4c49 | spi-loader-okli $(1) - KERNEL_ENTRY := 0x1000000 - KERNEL_LOADADDR := 0x1000000 + KERNEL_ENTRY := 0x1500000 + KERNEL_LOADADDR := 0x1500000 SUPPORTED_DEVICES += tl-wdr4900-v1 COMPILE := loader-$(1) COMPILE/loader-$(1) := spi-loader-okli-compile diff --git a/target/linux/mpc85xx/patches-5.15/100-powerpc-85xx-tl-wdr4900-v1-support.patch b/target/linux/mpc85xx/patches-5.15/100-powerpc-85xx-tl-wdr4900-v1-support.patch index 0ecbec3ca4..fa27e9665d 100644 --- a/target/linux/mpc85xx/patches-5.15/100-powerpc-85xx-tl-wdr4900-v1-support.patch +++ b/target/linux/mpc85xx/patches-5.15/100-powerpc-85xx-tl-wdr4900-v1-support.patch @@ -44,7 +44,7 @@ Signed-off-by: Pawel Dembicki ;; +simpleboot-tl-wdr4900-v1) + platformo="$object/fixed-head.o $object/simpleboot.o" -+ link_address='0x1000000' ++ link_address='0x1500000' + binary=y + ;; simpleboot-*) diff --git a/target/linux/mpc85xx/patches-5.15/107-powerpc-85xx-add-ws-ap3825i-support.patch b/target/linux/mpc85xx/patches-5.15/107-powerpc-85xx-add-ws-ap3825i-support.patch index bd731a2344..51da0f4527 100644 --- a/target/linux/mpc85xx/patches-5.15/107-powerpc-85xx-add-ws-ap3825i-support.patch +++ b/target/linux/mpc85xx/patches-5.15/107-powerpc-85xx-add-ws-ap3825i-support.patch @@ -62,4 +62,4 @@ WS-AP3825i AP. +simpleboot-ws-ap3825i|\ simpleboot-tl-wdr4900-v1) platformo="$object/fixed-head.o $object/simpleboot.o" - link_address='0x1000000' + link_address='0x1500000' diff --git a/target/linux/mpc85xx/patches-6.1/100-powerpc-85xx-tl-wdr4900-v1-support.patch b/target/linux/mpc85xx/patches-6.1/100-powerpc-85xx-tl-wdr4900-v1-support.patch index 7b9016d2fe..a7253a9794 100644 --- a/target/linux/mpc85xx/patches-6.1/100-powerpc-85xx-tl-wdr4900-v1-support.patch +++ b/target/linux/mpc85xx/patches-6.1/100-powerpc-85xx-tl-wdr4900-v1-support.patch @@ -44,7 +44,7 @@ Signed-off-by: Pawel Dembicki ;; +simpleboot-tl-wdr4900-v1) + platformo="$object/fixed-head.o $object/simpleboot.o" -+ link_address='0x1000000' ++ link_address='0x1500000' + binary=y + ;; simpleboot-*) diff --git a/target/linux/mpc85xx/patches-6.1/107-powerpc-85xx-add-ws-ap3825i-support.patch b/target/linux/mpc85xx/patches-6.1/107-powerpc-85xx-add-ws-ap3825i-support.patch index 0fa1b4172b..fb697e1d1f 100644 --- a/target/linux/mpc85xx/patches-6.1/107-powerpc-85xx-add-ws-ap3825i-support.patch +++ b/target/linux/mpc85xx/patches-6.1/107-powerpc-85xx-add-ws-ap3825i-support.patch @@ -62,4 +62,4 @@ WS-AP3825i AP. +simpleboot-ws-ap3825i|\ simpleboot-tl-wdr4900-v1) platformo="$object/fixed-head.o $object/simpleboot.o" - link_address='0x1000000' + link_address='0x1500000' -- 2.30.2