9os

commit 80d364faba4f8c8ff8b5aa98228425e95b37de0a
parent add45a1c7a65c351cf0d0df46036530f17fc66bb
Author: Roberto Vargas <roberto.vargas@arm.com>
Date:   Thu, 15 Nov 2018 14:26:23 +0000

[script] Move definition of LIBS and LIBDEP to rules.mk

These dependencies are going to be the same for every
arch. Having them centralized in scripts/rules.mk
make easier to maintain them actualized. If some
platform needs redefinition of LIBS it can be done
Makefile platform.

Change-Id: I8a288651ab89d1c8ff3b6628b5a9a49e461b07b5

Diffstat:
M
arch/amd64/Makefile
 | 
6
------
M
arch/arm64/Makefile
 | 
6
------
M
scripts/rules.mk
 | 
6
++++++

3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/arch/amd64/Makefile b/arch/amd64/Makefile
@@ -6,12 +6,6 @@ ROMOBJS = crt-$(SYS).o arch.o rom.o $(DLANG) $(SRCDIR)/romfw/builtin.o
 RAMOBJS = crt-$(SYS).o arch.o ram.o $(DLANG) $(SRCDIR)/ramfw/builtin.o
 
 TARGET = $(BINDIR)/romfw.elf $(BINDIR)/ramfw.elf
-LIBS   = -lhdl -lrmu -lk -lc
-
-LIBDEP = $(LIBDIR)/libhdl.a \
-         $(LIBDIR)/librmu.a \
-         $(LIBDIR)/libk.a \
-         $(LIBDIR)/libc.a \
 
 all: $(TARGET)
 
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
@@ -21,12 +21,6 @@ RAMOBJS = ram-crt-$(SYS).o \
           $(SRCDIR)/ramfw/builtin.o \
 
 TARGET = $(BINDIR)/romfw.bin $(BINDIR)/ramfw.bin
-LIBS   = -lhdl -lrmu -lk -lc
-
-LIBDEP = $(LIBDIR)/libhdl.a \
-         $(LIBDIR)/librmu.a \
-         $(LIBDIR)/libk.a \
-         $(LIBDIR)/libc.a \
 
 all: $(TARGET)
 
diff --git a/scripts/rules.mk b/scripts/rules.mk
@@ -10,6 +10,12 @@ SRCDIR   = $(PROJECTDIR)/src
 SCRIPTDIR= $(PROJECTDIR)/scripts
 CONFDIR  = $(PROJECTDIR)/config
 INCLUDES = -I$(INCDIR) -I$(INCDIR)/bits/$(ARCH)/ -I$(INCDIR)/bits/$(SYS)
+LIBS   = -lhdl -lrmu -lk -lc
+
+LIBDEP = $(LIBDIR)/libhdl.a \
+         $(LIBDIR)/librmu.a \
+         $(LIBDIR)/libk.a \
+         $(LIBDIR)/libc.a \
 
 RCODE_CFLAGS = $(MORECFLAGS) \
                $(INCLUDES) \