Skip to content

Commit

Permalink
ramips: move KERNEL_LOADADDR into Device/Default
Browse files Browse the repository at this point in the history
Commit f4a7914 ("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: cd6a6e3 ("Revert "ramips: add support for ipTIME AX2004M"")
Signed-off-by: Sungbo Eo <mans0n@gorani.run>
  • Loading branch information
mans0n committed Feb 8, 2022
1 parent a0ad07e commit 09f3834
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion target/linux/ramips/image/Makefile
Expand Up @@ -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)

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 09f3834

Please sign in to comment.