Don't require every arch Makefile to specify LDSCRIPT.

It's always ${ARCHDIR}/kern.ldscript.

diff --git a/platform/hw/Makefile b/platform/hw/Makefile
index bc94039586b95f2eba6e63ead501ead5bb25df6d..d51d015a7d967bd7fad2677a6c44b3a27b9addc6 100644 (file)
--- a/platform/hw/Makefile
+++ b/platform/hw/Makefile
@@ -58,7 +58,7 @@ include arch/${ARCHDIR}/Makefile.inc
 
 APP_TOOLS_PLATFORM= hw
 APP_TOOLS_OBJS_BAKE=   ${MAINOBJ}
-APP_TOOLS_LDSCRIPT_BAKE:= $(abspath ${LDSCRIPT})
+APP_TOOLS_LDSCRIPT_BAKE:= $(abspath arch/${ARCHDIR}/kern.ldscript)
 APP_TOOLS_DIR:= $(abspath ../../app-tools)
 
 include ${APP_TOOLS_DIR}/Makefile.app-tools

diff --git a/platform/hw/arch/amd64/Makefile.inc b/platform/hw/arch/amd64/Makefile.inc
index 8a00b5630323a3c210991f3dd25f84d344223bda..0219456b9887e3429a962b115bd8b6bfe7686c11 100644 (file)
--- a/platform/hw/arch/amd64/Makefile.inc
+++ b/platform/hw/arch/amd64/Makefile.inc
@@ -8,8 +8,6 @@ OBJS_BMK+=      arch/x86/x86_subr.o
 OBJS_BMK+=     arch/x86/clock.o
 OBJS_BMK+=      arch/x86/hypervisor.o
 
-LDSCRIPT=      arch/amd64/kern.ldscript
-
 CFLAGS+=       -mno-sse -mno-mmx
 
 # squash all interrupts to a single level to

diff --git a/platform/hw/arch/arm/integrator/Makefile.inc b/platform/hw/arch/arm/integrator/Makefile.inc
index 187efd887a64ce759e6ca110af87e8fe97e0dcbd..98ea338a516b21f38fd83babaf26c868086e3f35 100644 (file)
--- a/platform/hw/arch/arm/integrator/Makefile.inc
+++ b/platform/hw/arch/arm/integrator/Makefile.inc
@@ -1,7 +1,6 @@
 OBJS_BMK+=     arch/arm/integrator/locore.o
 OBJS_BMK+=     arch/arm/integrator/machdep.o
 OBJS_BMK+=     arch/arm/integrator/serialcons.o
-LDSCRIPT=      arch/arm/integrator/kern.ldscript
 
 CPPFLAGS+=     -Iarch/arm
 

diff --git a/platform/hw/arch/i386/Makefile.inc b/platform/hw/arch/i386/Makefile.inc
index 1abdee1056cedc99130cdac89fc808be9b1d7689..2ef586daffe7c513e594f71cd3b64729d804ff65 100644 (file)
--- a/platform/hw/arch/i386/Makefile.inc
+++ b/platform/hw/arch/i386/Makefile.inc
@@ -7,8 +7,6 @@ OBJS_BMK+=      arch/x86/x86_subr.o
 OBJS_BMK+=     arch/x86/clock.o
 OBJS_BMK+=      arch/x86/hypervisor.o
 
-LDSCRIPT=      arch/i386/kern.ldscript
-
 CFLAGS+=       -mno-sse -mno-mmx -march=i686
 
 arch/i386/locore.o: arch/i386/locore.S