Patchwork [U-Boot] tegra: move common features to a common makefile

login
register
mail settings
Submitter Marc Dietrich
Date Oct. 3, 2012, 2:26 p.m.
Message ID <9771602d1f0d5268f959e2ff8466208044d925aa.1349274264.git.marvin24@gmx.de>
Download mbox | patch
Permalink /patch/188784/
State Accepted
Delegated to: Tom Warren
Headers show

Comments

Marc Dietrich - Oct. 3, 2012, 2:26 p.m.
For Non-Nvidia boards to include newly added features (like emc clock
scaling) it would be necessary to add each feature to their own board
Makefile. This is because currently the top Makefile automaticly includes
these features only for Nvidia boards.

This patch adds a simple Makefile include so all new features become
available for non-Nvidia board vendors.

Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Tom Warren <twarren@nvidia.com>
Cc: Thierry Reding <thierry.reding@avionic-design.de>
Cc: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Marc Dietrich <marvin24@gmx.de>

---

Passed: MAKEALL -s tegra20, booted on paz00
---
 board/avionic-design/medcom-wide/Makefile |    6 ++++--
 board/avionic-design/plutux/Makefile      |    6 ++++--
 board/avionic-design/tec/Makefile         |    6 ++++--
 board/compal/paz00/Makefile               |    6 ++++--
 board/compulab/trimslice/Makefile         |    6 ++++--
 board/nvidia/common/Makefile              |    4 +---
 board/nvidia/common/common.mk             |    4 ++++
 7 files changed, 25 insertions(+), 13 deletions(-)
 create mode 100644 board/nvidia/common/common.mk
Stephen Warren - Oct. 3, 2012, 3:33 p.m.
On 10/03/2012 08:26 AM, Marc Dietrich wrote:
> For Non-Nvidia boards to include newly added features (like emc clock
> scaling) it would be necessary to add each feature to their own board
> Makefile. This is because currently the top Makefile automaticly includes
> these features only for Nvidia boards.
> 
> This patch adds a simple Makefile include so all new features become
> available for non-Nvidia board vendors.

Acked-by: Stephen Warren <swarren@nvidia.com>
Thierry Reding - Oct. 4, 2012, 5:59 a.m.
On Wed, Oct 03, 2012 at 04:26:28PM +0200, Marc Dietrich wrote:
> For Non-Nvidia boards to include newly added features (like emc clock
> scaling) it would be necessary to add each feature to their own board
> Makefile. This is because currently the top Makefile automaticly includes
> these features only for Nvidia boards.
> 
> This patch adds a simple Makefile include so all new features become
> available for non-Nvidia board vendors.
> 
> Cc: Stephen Warren <swarren@wwwdotorg.org>
> Cc: Tom Warren <twarren@nvidia.com>
> Cc: Thierry Reding <thierry.reding@avionic-design.de>
> Cc: Lucas Stach <dev@lynxeye.de>
> Signed-off-by: Marc Dietrich <marvin24@gmx.de>
> 
> ---
> 
> Passed: MAKEALL -s tegra20, booted on paz00
> ---
>  board/avionic-design/medcom-wide/Makefile |    6 ++++--
>  board/avionic-design/plutux/Makefile      |    6 ++++--
>  board/avionic-design/tec/Makefile         |    6 ++++--
>  board/compal/paz00/Makefile               |    6 ++++--
>  board/compulab/trimslice/Makefile         |    6 ++++--
>  board/nvidia/common/Makefile              |    4 +---
>  board/nvidia/common/common.mk             |    4 ++++
>  7 files changed, 25 insertions(+), 13 deletions(-)
>  create mode 100644 board/nvidia/common/common.mk

Acked-by: Thierry Reding <thierry.reding@avionic-design.de>

Patch

diff --git a/board/avionic-design/medcom-wide/Makefile b/board/avionic-design/medcom-wide/Makefile
index 864bc0e..e8c1e8b 100644
--- a/board/avionic-design/medcom-wide/Makefile
+++ b/board/avionic-design/medcom-wide/Makefile
@@ -29,9 +29,11 @@  $(shell mkdir -p $(obj)../common $(obj)../../nvidia/common)
 
 LIB	= $(obj)lib$(BOARD).o
 
-COBJS	:= ../../nvidia/common/board.o
-COBJS	+= ../common/tamonten.o
+COBJS-y	:= ../common/tamonten.o
 
+include ../../nvidia/common/common.mk
+
+COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
 
diff --git a/board/avionic-design/plutux/Makefile b/board/avionic-design/plutux/Makefile
index 864bc0e..e8c1e8b 100644
--- a/board/avionic-design/plutux/Makefile
+++ b/board/avionic-design/plutux/Makefile
@@ -29,9 +29,11 @@  $(shell mkdir -p $(obj)../common $(obj)../../nvidia/common)
 
 LIB	= $(obj)lib$(BOARD).o
 
-COBJS	:= ../../nvidia/common/board.o
-COBJS	+= ../common/tamonten.o
+COBJS-y	:= ../common/tamonten.o
 
+include ../../nvidia/common/common.mk
+
+COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
 
diff --git a/board/avionic-design/tec/Makefile b/board/avionic-design/tec/Makefile
index 864bc0e..e8c1e8b 100644
--- a/board/avionic-design/tec/Makefile
+++ b/board/avionic-design/tec/Makefile
@@ -29,9 +29,11 @@  $(shell mkdir -p $(obj)../common $(obj)../../nvidia/common)
 
 LIB	= $(obj)lib$(BOARD).o
 
-COBJS	:= ../../nvidia/common/board.o
-COBJS	+= ../common/tamonten.o
+COBJS-y	:= ../common/tamonten.o
 
+include ../../nvidia/common/common.mk
+
+COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
 
diff --git a/board/compal/paz00/Makefile b/board/compal/paz00/Makefile
index 7f7287e..fa5c510 100644
--- a/board/compal/paz00/Makefile
+++ b/board/compal/paz00/Makefile
@@ -20,9 +20,11 @@  $(shell mkdir -p $(obj)../../nvidia/common)
 
 LIB	= $(obj)lib$(BOARD).o
 
-COBJS	:= $(BOARD).o
-COBJS	+= ../../nvidia/common/board.o
+COBJS-y	:= $(BOARD).o
 
+include ../../nvidia/common/common.mk
+
+COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
 
diff --git a/board/compulab/trimslice/Makefile b/board/compulab/trimslice/Makefile
index ff07879..cc844d2 100644
--- a/board/compulab/trimslice/Makefile
+++ b/board/compulab/trimslice/Makefile
@@ -28,9 +28,11 @@  $(shell mkdir -p $(obj)../../nvidia/common)
 
 LIB	= $(obj)lib$(BOARD).o
 
-COBJS	:= $(BOARD).o
-COBJS	+= ../../nvidia/common/board.o
+COBJS-y	:= $(BOARD).o
 
+include ../../nvidia/common/common.mk
+
+COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
 
diff --git a/board/nvidia/common/Makefile b/board/nvidia/common/Makefile
index a93d458..f6f419e 100644
--- a/board/nvidia/common/Makefile
+++ b/board/nvidia/common/Makefile
@@ -25,9 +25,7 @@  endif
 
 LIB	= $(obj)lib$(VENDOR).o
 
-COBJS-y += board.o
-COBJS-$(CONFIG_SPI_UART_SWITCH) += uart-spi-switch.o
-COBJS-$(CONFIG_TEGRA_CLOCK_SCALING) += emc.o
+include common.mk
 
 COBJS	:= $(COBJS-y)
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
diff --git a/board/nvidia/common/common.mk b/board/nvidia/common/common.mk
new file mode 100644
index 0000000..bd6202c
--- /dev/null
+++ b/board/nvidia/common/common.mk
@@ -0,0 +1,4 @@ 
+# common options for all tegra boards
+COBJS-y	+= ../../nvidia/common/board.o
+COBJS-$(CONFIG_SPI_UART_SWITCH) += ../../nvidia/common/uart-spi-switch.o
+COBJS-$(CONFIG_TEGRA_CLOCK_SCALING) += ../../nvidia/common/emc.o