From: Olliver Schinagl <oliver@schinagl.nl>
Date: Wed, 4 Jan 2023 13:53:54 +0000 (+0100)
Subject: realtek: Migrate to upstream generic MIPS addresses
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=44e07852856e65d4348185ed8042fa8a8c05530f;p=openwrt%2Fstaging%2Fblocktrron.git

realtek: Migrate to upstream generic MIPS addresses

Upstream generic MIPS uses 0x80100000 and 0x80100400 for the LOADADDR
and ENTRY addresses. As we do not want to diverge from upstream and
patch upstream when not needed, adjust our addresses as well to be
future proof.

Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
Tested-by: Jan Hoffmann <jan@3e8.eu> # HPE 1920-8G, HPE 1920-48G
---

diff --git a/target/linux/realtek/files-5.10/arch/mips/rtl838x/Platform b/target/linux/realtek/files-5.10/arch/mips/rtl838x/Platform
index 9d45d2ddd5..98f18cac1b 100644
--- a/target/linux/realtek/files-5.10/arch/mips/rtl838x/Platform
+++ b/target/linux/realtek/files-5.10/arch/mips/rtl838x/Platform
@@ -2,4 +2,4 @@
 # Realtek RTL838x SoCs
 #
 cflags-$(CONFIG_RTL83XX)   += -I$(srctree)/arch/mips/include/asm/mach-rtl838x/
-load-$(CONFIG_RTL83XX)     += 0xffffffff80000000
+load-$(CONFIG_RTL83XX)     += 0xffffffff80100000
diff --git a/target/linux/realtek/files-5.15/arch/mips/rtl838x/Platform b/target/linux/realtek/files-5.15/arch/mips/rtl838x/Platform
index 9d45d2ddd5..98f18cac1b 100644
--- a/target/linux/realtek/files-5.15/arch/mips/rtl838x/Platform
+++ b/target/linux/realtek/files-5.15/arch/mips/rtl838x/Platform
@@ -2,4 +2,4 @@
 # Realtek RTL838x SoCs
 #
 cflags-$(CONFIG_RTL83XX)   += -I$(srctree)/arch/mips/include/asm/mach-rtl838x/
-load-$(CONFIG_RTL83XX)     += 0xffffffff80000000
+load-$(CONFIG_RTL83XX)     += 0xffffffff80100000
diff --git a/target/linux/realtek/image/Makefile b/target/linux/realtek/image/Makefile
index 7c5b67191c..82390212e6 100644
--- a/target/linux/realtek/image/Makefile
+++ b/target/linux/realtek/image/Makefile
@@ -3,8 +3,8 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-KERNEL_LOADADDR = 0x80000000
-KERNEL_ENTRY = 0x80000400
+KERNEL_LOADADDR = 0x80100000
+KERNEL_ENTRY = 0x80100400
 
 DEVICE_VARS += \
         CAMEO_BOARD_VERSION \