includes build fixes.
Signed-off-by: Kim Phillips kim.phillips@freescale.com --- looks like git didn't quite detect all the renames here (thus the copies and deletes).
Anyway, this should be it for mpc83xx for this window.
Makefile | 10 ++-- board/{ => freescale}/mpc8313erdb/Makefile | 0 board/{ => freescale}/mpc8313erdb/config.mk | 0 board/{ => freescale}/mpc8313erdb/mpc8313erdb.c | 0 board/{ => freescale}/mpc8313erdb/sdram.c | 0 .../mpc832xemds}/Makefile | 2 +- board/{ => freescale}/mpc832xemds/config.mk | 0 board/{ => freescale}/mpc832xemds/mpc832xemds.c | 2 +- board/{ => freescale}/mpc832xemds/pci.c | 0 board/{ => freescale}/mpc8349emds/Makefile | 0 board/{ => freescale}/mpc8349emds/config.mk | 0 board/{ => freescale}/mpc8349emds/mpc8349emds.c | 0 board/{ => freescale}/mpc8349emds/pci.c | 0 board/{ => freescale}/mpc8349itx/Makefile | 0 board/{ => freescale}/mpc8349itx/config.mk | 0 board/{ => freescale}/mpc8349itx/mpc8349itx.c | 0 board/{ => freescale}/mpc8349itx/pci.c | 0 .../mpc8360emds}/Makefile | 2 +- board/{ => freescale}/mpc8360emds/config.mk | 0 board/{ => freescale}/mpc8360emds/mpc8360emds.c | 2 +- board/{ => freescale}/mpc8360emds/pci.c | 0 board/mpc832xemds/Makefile | 50 -------------------- board/mpc8360emds/Makefile | 50 -------------------- 23 files changed, 9 insertions(+), 109 deletions(-) rename board/{ => freescale}/mpc8313erdb/Makefile (100%) rename board/{ => freescale}/mpc8313erdb/config.mk (100%) rename board/{ => freescale}/mpc8313erdb/mpc8313erdb.c (100%) rename board/{ => freescale}/mpc8313erdb/sdram.c (100%) copy board/{mpc8349emds => freescale/mpc832xemds}/Makefile (97%) rename board/{ => freescale}/mpc832xemds/config.mk (100%) rename board/{ => freescale}/mpc832xemds/mpc832xemds.c (99%) rename board/{ => freescale}/mpc832xemds/pci.c (100%) copy board/{ => freescale}/mpc8349emds/Makefile (100%) rename board/{ => freescale}/mpc8349emds/config.mk (100%) rename board/{ => freescale}/mpc8349emds/mpc8349emds.c (100%) rename board/{ => freescale}/mpc8349emds/pci.c (100%) rename board/{ => freescale}/mpc8349itx/Makefile (100%) rename board/{ => freescale}/mpc8349itx/config.mk (100%) rename board/{ => freescale}/mpc8349itx/mpc8349itx.c (100%) rename board/{ => freescale}/mpc8349itx/pci.c (100%) rename board/{mpc8349emds => freescale/mpc8360emds}/Makefile (97%) rename board/{ => freescale}/mpc8360emds/config.mk (100%) rename board/{ => freescale}/mpc8360emds/mpc8360emds.c (99%) rename board/{ => freescale}/mpc8360emds/pci.c (100%) delete mode 100644 board/mpc832xemds/Makefile delete mode 100644 board/mpc8360emds/Makefile
diff --git a/Makefile b/Makefile index 65efd3f..62531a5 100644 --- a/Makefile +++ b/Makefile @@ -1688,7 +1688,7 @@ MPC8313ERDB_66_config: unconfig echo -n "...66M..." ; \ echo "#define CFG_66MHZ" >>$(obj)include/config.h ; \ fi ; - @$(MKCONFIG) -a MPC8313ERDB ppc mpc83xx mpc8313erdb + @$(MKCONFIG) -a MPC8313ERDB ppc mpc83xx mpc8313erdb freescale
MPC8323ERDB_config: unconfig @$(MKCONFIG) -a MPC8323ERDB ppc mpc83xx mpc8323erdb freescale @@ -1716,10 +1716,10 @@ MPC832XEMDS_SLAVE_config: unconfig echo -n "...66M..." ; \ echo "#define PCI_66M" >>$(obj)include/config.h ; \ fi ; - @$(MKCONFIG) -a MPC832XEMDS ppc mpc83xx mpc832xemds + @$(MKCONFIG) -a MPC832XEMDS ppc mpc83xx mpc832xemds freescale
MPC8349EMDS_config: unconfig - @$(MKCONFIG) $(@:_config=) ppc mpc83xx mpc8349emds + @$(MKCONFIG) $(@:_config=) ppc mpc83xx mpc8349emds freescale
MPC8349ITX_config \ MPC8349ITX_LOWBOOT_config \ @@ -1733,7 +1733,7 @@ MPC8349ITXGP_config: unconfig @if [ "$(findstring LOWBOOT,$@)" ] ; then \ echo "TEXT_BASE = 0xFE000000" >$(obj)board/mpc8349itx/config.tmp ; \ fi - @$(MKCONFIG) -a -n $(@:_config=) MPC8349ITX ppc mpc83xx mpc8349itx + @$(MKCONFIG) -a -n $(@:_config=) MPC8349ITX ppc mpc83xx mpc8349itx freescale
MPC8360EMDS_config \ MPC8360EMDS_HOST_33_config \ @@ -1758,7 +1758,7 @@ MPC8360EMDS_SLAVE_config: unconfig echo -n "...66M..." ; \ echo "#define PCI_66M" >>$(obj)include/config.h ; \ fi ; - @$(MKCONFIG) -a MPC8360EMDS ppc mpc83xx mpc8360emds + @$(MKCONFIG) -a MPC8360EMDS ppc mpc83xx mpc8360emds freescale
sbc8349_config: unconfig @$(MKCONFIG) $(@:_config=) ppc mpc83xx sbc8349 diff --git a/board/mpc8313erdb/Makefile b/board/freescale/mpc8313erdb/Makefile similarity index 100% rename from board/mpc8313erdb/Makefile rename to board/freescale/mpc8313erdb/Makefile diff --git a/board/mpc8313erdb/config.mk b/board/freescale/mpc8313erdb/config.mk similarity index 100% rename from board/mpc8313erdb/config.mk rename to board/freescale/mpc8313erdb/config.mk diff --git a/board/mpc8313erdb/mpc8313erdb.c b/board/freescale/mpc8313erdb/mpc8313erdb.c similarity index 100% rename from board/mpc8313erdb/mpc8313erdb.c rename to board/freescale/mpc8313erdb/mpc8313erdb.c diff --git a/board/mpc8313erdb/sdram.c b/board/freescale/mpc8313erdb/sdram.c similarity index 100% rename from board/mpc8313erdb/sdram.c rename to board/freescale/mpc8313erdb/sdram.c diff --git a/board/mpc8349emds/Makefile b/board/freescale/mpc832xemds/Makefile similarity index 97% copy from board/mpc8349emds/Makefile copy to board/freescale/mpc832xemds/Makefile index 5ec7a87..ea52484 100644 --- a/board/mpc8349emds/Makefile +++ b/board/freescale/mpc832xemds/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a
-COBJS := $(BOARD).o pci.o +COBJS := $(BOARD).o pci.o ../common/pq-mds-pib.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/board/mpc832xemds/config.mk b/board/freescale/mpc832xemds/config.mk similarity index 100% rename from board/mpc832xemds/config.mk rename to board/freescale/mpc832xemds/config.mk diff --git a/board/mpc832xemds/mpc832xemds.c b/board/freescale/mpc832xemds/mpc832xemds.c similarity index 99% rename from board/mpc832xemds/mpc832xemds.c rename to board/freescale/mpc832xemds/mpc832xemds.c index 7a45ded..6ba25d4 100644 --- a/board/mpc832xemds/mpc832xemds.c +++ b/board/freescale/mpc832xemds/mpc832xemds.c @@ -33,7 +33,7 @@ #include <libfdt.h> #endif #if defined(CONFIG_PQ_MDS_PIB) -#include "../freescale/common/pq-mds-pib.h" +#include "../common/pq-mds-pib.h" #endif
const qe_iop_conf_t qe_iop_conf_tab[] = { diff --git a/board/mpc832xemds/pci.c b/board/freescale/mpc832xemds/pci.c similarity index 100% rename from board/mpc832xemds/pci.c rename to board/freescale/mpc832xemds/pci.c diff --git a/board/mpc8349emds/Makefile b/board/freescale/mpc8349emds/Makefile similarity index 100% copy from board/mpc8349emds/Makefile copy to board/freescale/mpc8349emds/Makefile diff --git a/board/mpc8349emds/config.mk b/board/freescale/mpc8349emds/config.mk similarity index 100% rename from board/mpc8349emds/config.mk rename to board/freescale/mpc8349emds/config.mk diff --git a/board/mpc8349emds/mpc8349emds.c b/board/freescale/mpc8349emds/mpc8349emds.c similarity index 100% rename from board/mpc8349emds/mpc8349emds.c rename to board/freescale/mpc8349emds/mpc8349emds.c diff --git a/board/mpc8349emds/pci.c b/board/freescale/mpc8349emds/pci.c similarity index 100% rename from board/mpc8349emds/pci.c rename to board/freescale/mpc8349emds/pci.c diff --git a/board/mpc8349itx/Makefile b/board/freescale/mpc8349itx/Makefile similarity index 100% rename from board/mpc8349itx/Makefile rename to board/freescale/mpc8349itx/Makefile diff --git a/board/mpc8349itx/config.mk b/board/freescale/mpc8349itx/config.mk similarity index 100% rename from board/mpc8349itx/config.mk rename to board/freescale/mpc8349itx/config.mk diff --git a/board/mpc8349itx/mpc8349itx.c b/board/freescale/mpc8349itx/mpc8349itx.c similarity index 100% rename from board/mpc8349itx/mpc8349itx.c rename to board/freescale/mpc8349itx/mpc8349itx.c diff --git a/board/mpc8349itx/pci.c b/board/freescale/mpc8349itx/pci.c similarity index 100% rename from board/mpc8349itx/pci.c rename to board/freescale/mpc8349itx/pci.c diff --git a/board/mpc8349emds/Makefile b/board/freescale/mpc8360emds/Makefile similarity index 97% rename from board/mpc8349emds/Makefile rename to board/freescale/mpc8360emds/Makefile index 5ec7a87..ea52484 100644 --- a/board/mpc8349emds/Makefile +++ b/board/freescale/mpc8360emds/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a
-COBJS := $(BOARD).o pci.o +COBJS := $(BOARD).o pci.o ../common/pq-mds-pib.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/board/mpc8360emds/config.mk b/board/freescale/mpc8360emds/config.mk similarity index 100% rename from board/mpc8360emds/config.mk rename to board/freescale/mpc8360emds/config.mk diff --git a/board/mpc8360emds/mpc8360emds.c b/board/freescale/mpc8360emds/mpc8360emds.c similarity index 99% rename from board/mpc8360emds/mpc8360emds.c rename to board/freescale/mpc8360emds/mpc8360emds.c index 0751c6f..e050cd4 100644 --- a/board/mpc8360emds/mpc8360emds.c +++ b/board/freescale/mpc8360emds/mpc8360emds.c @@ -31,7 +31,7 @@ #include <libfdt.h> #endif #if defined(CONFIG_PQ_MDS_PIB) -#include "../freescale/common/pq-mds-pib.h" +#include "../common/pq-mds-pib.h" #endif
const qe_iop_conf_t qe_iop_conf_tab[] = { diff --git a/board/mpc8360emds/pci.c b/board/freescale/mpc8360emds/pci.c similarity index 100% rename from board/mpc8360emds/pci.c rename to board/freescale/mpc8360emds/pci.c diff --git a/board/mpc832xemds/Makefile b/board/mpc832xemds/Makefile deleted file mode 100644 index 4da74b8..0000000 --- a/board/mpc832xemds/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# -# (C) Copyright 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 = $(obj)lib$(BOARD).a - -COBJS := $(BOARD).o pci.o ../freescale/common/pq-mds-pib.o - -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) -SOBJS := $(addprefix $(obj),$(SOBJS)) - -$(LIB): $(obj).depend $(OBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) - -clean: - rm -f $(SOBJS) $(OBJS) - -distclean: clean - rm -f $(LIB) core *.bak .depend - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### diff --git a/board/mpc8360emds/Makefile b/board/mpc8360emds/Makefile deleted file mode 100644 index 4da74b8..0000000 --- a/board/mpc8360emds/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# -# (C) Copyright 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 = $(obj)lib$(BOARD).a - -COBJS := $(BOARD).o pci.o ../freescale/common/pq-mds-pib.o - -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) -SOBJS := $(addprefix $(obj),$(SOBJS)) - -$(LIB): $(obj).depend $(OBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) - -clean: - rm -f $(SOBJS) $(OBJS) - -distclean: clean - rm -f $(LIB) core *.bak .depend - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -#########################################################################