From 2b3bd34a82c6238a9612cf45b8b8730ca0c3c2be Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Mon, 1 Nov 2021 12:35:37 +0100 Subject: mk: Generalize kernel loadaddr Introduce ADK_TARGET_KERNEL_LOADADDR symbol holding the right kernel loadaddr depending on chosen target system instead of hard-coding the value into kernel-vars.mk. Signed-off-by: Phil Sutter --- mk/kernel-vars.mk | 4 ++-- target/config/Config.in.kernelfmt | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk index dc176d291..9befe59d3 100644 --- a/mk/kernel-vars.mk +++ b/mk/kernel-vars.mk @@ -29,8 +29,8 @@ else KERNEL_MAKE_OPTS+= HOSTCFLAGS='${HOST_CFLAGS}' endif -ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO)$(ADK_TARGET_SYSTEM_ORANGE_PI0),y) -KERNEL_MAKE_OPTS+= LOADADDR=0x40008000 +ifneq ($(ADK_TARGET_KERNEL_LOADADDR),) +KERNEL_MAKE_OPTS+= LOADADDR=$(ADK_TARGET_KERNEL_LOADADDR) endif KERNEL_MAKE_ENV:= PATH="${TOOLCHAIN_DIR}/usr/bin:${STAGING_HOST_DIR}/usr/bin:$$PATH" diff --git a/target/config/Config.in.kernelfmt b/target/config/Config.in.kernelfmt index f1d503e23..bf35f6ba4 100644 --- a/target/config/Config.in.kernelfmt +++ b/target/config/Config.in.kernelfmt @@ -63,3 +63,8 @@ config ADK_TARGET_KERNEL config ADK_TARGET_KERNEL_WITH_COMPRESSION bool + +config ADK_TARGET_KERNEL_LOADADDR + hex + default 0x40008000 if ADK_TARGET_SYSTEM_BANANA_PRO + default 0x40008000 if ADK_TARGET_SYSTEM_ORANGE_PI0 -- cgit v1.2.3