diff options
| author | Sander Vanheule <sander@svanheule.net> | 2023-01-25 22:18:42 +0100 |
|---|---|---|
| committer | Sander Vanheule <sander@svanheule.net> | 2023-01-25 22:39:35 +0100 |
| commit | 8f47b87b0cc8178f73d280c98e571fe9f0ddfee8 (patch) | |
| tree | 8213d6496b03bffc8fa0700b27f219ac00ee7291 | |
| parent | 7396263680b951211f33f2aa266b11bdd0047adc (diff) | |
| download | upstream-8f47b87b0cc8178f73d280c98e571fe9f0ddfee8.tar.gz upstream-8f47b87b0cc8178f73d280c98e571fe9f0ddfee8.tar.bz2 upstream-8f47b87b0cc8178f73d280c98e571fe9f0ddfee8.zip | |
realtek: rtl931x: drop LINKER_LOAD_ADDRESS bypass
RTL931x kernel builds were patched to bypass the LINKER_LOAD_ADDRESS
parameter, and hardcode it to 0x80220000. This doesn't make much sense,
since value of LINKER_LOAD_ADDRESS, load-ld, only appears to be a copy
of load-y, adjusted to the linker's taste.
Dropping the hacks for bypassing LINKER_LOAD_ADDRESS results in a kernel
that actually starts booting on an RTL9313 (Netgear MS510TXM), but
currently still hangs when the kernel switches timers.
Signed-off-by: Sander Vanheule <sander@svanheule.net>
| -rw-r--r-- | target/linux/realtek/patches-5.10/312-rt9313-support.patch | 59 | ||||
| -rw-r--r-- | target/linux/realtek/patches-5.15/312-rt9313-support.patch | 59 |
2 files changed, 0 insertions, 118 deletions
diff --git a/target/linux/realtek/patches-5.10/312-rt9313-support.patch b/target/linux/realtek/patches-5.10/312-rt9313-support.patch deleted file mode 100644 index 7626cc9c25..0000000000 --- a/target/linux/realtek/patches-5.10/312-rt9313-support.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 0b8dfe085180b58b81d2657c76b080168e3bc8df Mon Sep 17 00:00:00 2001 -From: Birger Koblitz <git@birger-koblitz.de> -Date: Wed, 19 Jan 2022 18:14:02 +0100 -Subject: [PATCH] realtek: Add RTL931X sub-target - -We add the RTL931X sub-target with kernel configuration for -a dual core MIPS InterAptive CPU. - -Submitted-by: Sebastian Gottschall <s.gottschall@dd-wrt.com> -Submitted-by: Birger Koblitz <git@birger-koblitz.de> ---- - arch/mips/Makefile | 10 +++++++++++++-- - arch/mips/kernel/head.S | 4 ++++ - aarch/mips/kernel/vmlinux.lds.S | 4 ++++ - 3 files changed, 18 insertions(+), 2 deletions(-) - ---- a/arch/mips/Makefile -+++ b/arch/mips/Makefile -@@ -307,14 +307,24 @@ endif - - KBUILD_AFLAGS += $(cflags-y) - KBUILD_CFLAGS += $(cflags-y) -+ifdef CONFIG_931X -+KBUILD_CPPFLAGS += -DVMLINUX_LOAD_ADDRESS=$(load-y) -+bootvars-y = VMLINUX_LOAD_ADDRESS=$(load-y) \ -+ VMLINUX_ENTRY_ADDRESS=$(entry-y) \ -+ PLATFORM="$(platform-y)" \ -+ ITS_INPUTS="$(its-y)" -+else - KBUILD_CPPFLAGS += -DVMLINUX_LOAD_ADDRESS=$(load-y) -DLINKER_LOAD_ADDRESS=$(load-ld) --KBUILD_CPPFLAGS += -DDATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0) -- - bootvars-y = VMLINUX_LOAD_ADDRESS=$(load-y) \ - LINKER_LOAD_ADDRESS=$(load-ld) \ - VMLINUX_ENTRY_ADDRESS=$(entry-y) \ - PLATFORM="$(platform-y)" \ - ITS_INPUTS="$(its-y)" -+endif -+KBUILD_CPPFLAGS += -DDATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0) -+ -+ -+ - ifdef CONFIG_32BIT - bootvars-y += ADDR_BITS=32 - endif ---- a/arch/mips/kernel/vmlinux.lds.S -+++ b/arch/mips/kernel/vmlinux.lds.S -@@ -55,7 +55,11 @@ SECTIONS - /* . = 0xa800000000300000; */ - . = 0xffffffff80300000; - #endif -+#ifdef CONFIG_RTL931X -+ . = 0x80220000; -+#else - . = LINKER_LOAD_ADDRESS; -+#endif - /* read-only */ - _text = .; /* Text and read-only data */ - .text : { diff --git a/target/linux/realtek/patches-5.15/312-rt9313-support.patch b/target/linux/realtek/patches-5.15/312-rt9313-support.patch deleted file mode 100644 index e8edc996f3..0000000000 --- a/target/linux/realtek/patches-5.15/312-rt9313-support.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 0b8dfe085180b58b81d2657c76b080168e3bc8df Mon Sep 17 00:00:00 2001 -From: Birger Koblitz <git@birger-koblitz.de> -Date: Wed, 19 Jan 2022 18:14:02 +0100 -Subject: [PATCH] realtek: Add RTL931X sub-target - -We add the RTL931X sub-target with kernel configuration for -a dual core MIPS InterAptive CPU. - -Submitted-by: Sebastian Gottschall <s.gottschall@dd-wrt.com> -Submitted-by: Birger Koblitz <git@birger-koblitz.de> ---- - arch/mips/Makefile | 10 +++++++++++++-- - arch/mips/kernel/head.S | 4 ++++ - aarch/mips/kernel/vmlinux.lds.S | 4 ++++ - 3 files changed, 18 insertions(+), 2 deletions(-) - ---- a/arch/mips/Makefile -+++ b/arch/mips/Makefile -@@ -310,14 +310,24 @@ endif - - KBUILD_AFLAGS += $(cflags-y) - KBUILD_CFLAGS += $(cflags-y) -+ifdef CONFIG_931X -+KBUILD_CPPFLAGS += -DVMLINUX_LOAD_ADDRESS=$(load-y) -+bootvars-y = VMLINUX_LOAD_ADDRESS=$(load-y) \ -+ VMLINUX_ENTRY_ADDRESS=$(entry-y) \ -+ PLATFORM="$(platform-y)" \ -+ ITS_INPUTS="$(its-y)" -+else - KBUILD_CPPFLAGS += -DVMLINUX_LOAD_ADDRESS=$(load-y) -DLINKER_LOAD_ADDRESS=$(load-ld) --KBUILD_CPPFLAGS += -DDATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0) -- - bootvars-y = VMLINUX_LOAD_ADDRESS=$(load-y) \ - LINKER_LOAD_ADDRESS=$(load-ld) \ - VMLINUX_ENTRY_ADDRESS=$(entry-y) \ - PLATFORM="$(platform-y)" \ - ITS_INPUTS="$(its-y)" -+endif -+KBUILD_CPPFLAGS += -DDATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0) -+ -+ -+ - ifdef CONFIG_32BIT - bootvars-y += ADDR_BITS=32 - endif ---- a/arch/mips/kernel/vmlinux.lds.S -+++ b/arch/mips/kernel/vmlinux.lds.S -@@ -55,7 +55,11 @@ SECTIONS - /* . = 0xa800000000300000; */ - . = 0xffffffff80300000; - #endif -+#ifdef CONFIG_RTL931X -+ . = 0x80220000; -+#else - . = LINKER_LOAD_ADDRESS; -+#endif - /* read-only */ - _text = .; /* Text and read-only data */ - .text : { |