[openwrt/openwrt] ramips: move KERNEL_LOADADDR into Device/Default

LEDE Commits lede-commits at lists.infradead.org
Tue Feb 8 06:24:38 PST 2022


mans0n pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/09f383465e0780cf285a02704eb30f1c3d88aa4b

commit 09f383465e0780cf285a02704eb30f1c3d88aa4b
Author: Sungbo Eo <mans0n at gorani.run>
AuthorDate: Thu Feb 3 00:10:04 2022 +0900

    ramips: move KERNEL_LOADADDR into Device/Default
    
    Commit f4a79148f8cb ("ramips: add support for ipTIME AX2004M") was
    reverted due to KERNEL_LOADADDR leakage, and it seems the problem can be
    mitigated by moving the variable definition into Device/Default. By this,
    KERNEL_LOADADDR redefined in a device recipe will not be leaked into the
    subsequent device recipes anymore and thus will remain as a per-device
    variable.
    
    Ref: cd6a6e3030ff ("Revert "ramips: add support for ipTIME AX2004M"")
    Signed-off-by: Sungbo Eo <mans0n at gorani.run>
---
 target/linux/ramips/image/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile
index 241b620941..f481e6e447 100644
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -22,7 +22,6 @@ ldrplatform-$(CONFIG_TARGET_ramips_mt7621) := mt7621
 ldrflashstart-y := 0x1c000000
 ldrflashstart-$(CONFIG_TARGET_ramips_mt7621) := 0x1fc00000
 
-KERNEL_LOADADDR := $(loadaddr-y)
 LOADER_PLATFORM := $(ldrplatform-y)
 LOADER_FLASH_START := $(ldrflashstart-y)
 
@@ -176,6 +175,7 @@ endef
 define Device/Default
   PROFILES = Default
   KERNEL := $(KERNEL_DTB) | uImage lzma
+  KERNEL_LOADADDR := $(loadaddr-y)
   SOC := $(DEFAULT_SOC)
   DEVICE_DTS_DIR := ../dts
   DEVICE_DTS = $$(SOC)_$(1)



More information about the lede-commits mailing list