From 360275b362e50f480b09c7c8770019ea4287afad Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 30 Aug 2011 17:29:23 -0500 Subject: [PATCH] powerpc/85xx: refactor common P-Series CoreNet files for FSL boards We currently support 4 SoC/Boards from the P-Series of QorIQ SoCs that are based on the 'CoreNet' Architecture: P2041RDB, P3041DS, P4080DS, and P5020DS. There is a significant amount of commonality shared between these boards that we can refactor into common code: * Initial LAW setup * Initial TLB setup * PCI setup We start by moving the shared code between P3041DS, P4080DS, and P5020DS into a common directory to be shared with other P-Series CoreNet boards. Signed-off-by: Kumar Gala --- board/freescale/common/Makefile | 13 ++++++-- board/freescale/common/p_corenet/Makefile | 31 +++++++++++++++++++ .../{corenet_ds => common/p_corenet}/law.c | 0 .../{corenet_ds => common/p_corenet}/pci.c | 0 .../{corenet_ds => common/p_corenet}/tlb.c | 0 board/freescale/corenet_ds/Makefile | 3 -- 6 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 board/freescale/common/p_corenet/Makefile rename board/freescale/{corenet_ds => common/p_corenet}/law.c (100%) rename board/freescale/{corenet_ds => common/p_corenet}/pci.c (100%) rename board/freescale/{corenet_ds => common/p_corenet}/tlb.c (100%) diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile index 9bdf45b728..79f9de262f 100644 --- a/board/freescale/common/Makefile +++ b/board/freescale/common/Makefile @@ -53,12 +53,21 @@ COBJS-$(CONFIG_P3041DS) += ics307_clk.o COBJS-$(CONFIG_P4080DS) += ics307_clk.o COBJS-$(CONFIG_P5020DS) += ics307_clk.o +# deal with common files for P-series corenet based devices +SUBLIB-$(CONFIG_P3041DS) += p_corenet/libp_corenet.o +SUBLIB-$(CONFIG_P4080DS) += p_corenet/libp_corenet.o +SUBLIB-$(CONFIG_P5020DS) += p_corenet/libp_corenet.o + SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y)) SOBJS := $(addprefix $(obj),$(SOBJS)) +SUBLIB := $(addprefix $(obj),$(SUBLIB-y)) + +$(LIB): $(obj).depend $(OBJS) $(SUBLIB) + $(call cmd_link_o_target, $(OBJS) $(SUBLIB)) -$(LIB): $(obj).depend $(OBJS) - $(call cmd_link_o_target, $(OBJS)) +$(SUBLIB): $(obj).depend + $(MAKE) -C $(dir $(subst $(obj),,$@)) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/freescale/common/p_corenet/Makefile b/board/freescale/common/p_corenet/Makefile new file mode 100644 index 0000000000..a76f590c3c --- /dev/null +++ b/board/freescale/common/p_corenet/Makefile @@ -0,0 +1,31 @@ +# +# (C) Copyright 2002-2006 +# Wolfgang Denk, DENX Software Engineering, wd@denx.de. +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# +include $(TOPDIR)/config.mk + +LIB = libp_corenet.o + +COBJS-y += law.o +COBJS-$(CONFIG_PCI) += pci.o +COBJS-y += tlb.o + +include $(TOPDIR)/post/rules.mk diff --git a/board/freescale/corenet_ds/law.c b/board/freescale/common/p_corenet/law.c similarity index 100% rename from board/freescale/corenet_ds/law.c rename to board/freescale/common/p_corenet/law.c diff --git a/board/freescale/corenet_ds/pci.c b/board/freescale/common/p_corenet/pci.c similarity index 100% rename from board/freescale/corenet_ds/pci.c rename to board/freescale/common/p_corenet/pci.c diff --git a/board/freescale/corenet_ds/tlb.c b/board/freescale/common/p_corenet/tlb.c similarity index 100% rename from board/freescale/corenet_ds/tlb.c rename to board/freescale/common/p_corenet/tlb.c diff --git a/board/freescale/corenet_ds/Makefile b/board/freescale/corenet_ds/Makefile index c377c39f4b..7e33007411 100644 --- a/board/freescale/corenet_ds/Makefile +++ b/board/freescale/corenet_ds/Makefile @@ -34,9 +34,6 @@ COBJS-$(CONFIG_P5020DS) += eth_hydra.o COBJS-$(CONFIG_P3041DS) += p3041ds_ddr.o COBJS-$(CONFIG_P4080DS) += p4080ds_ddr.o COBJS-$(CONFIG_P5020DS) += p5020ds_ddr.o -COBJS-$(CONFIG_PCI) += pci.o -COBJS-y += law.o -COBJS-y += tlb.o SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y)) -- 2.30.2