Minor path corrections needed to ensure buildability.
Signed-off-by: Jon Loeliger jdl@freescale.com ---
Wolfgang,
Tested on the 8641 HPCN board; sbc8641d continues to build. :-)
I will place these file moves and the CFG_CMD_* patch into the -mpc86xx repo for you to pull shortly.
Thanks, jdl
Makefile | 2 +- .../{mpc8641hpcn => freescale/common}/sys_eeprom.c | 0 board/{ => freescale}/mpc8641hpcn/Makefile | 7 ++++--- board/{ => freescale}/mpc8641hpcn/config.mk | 0 board/{ => freescale}/mpc8641hpcn/init.S | 0 board/{ => freescale}/mpc8641hpcn/mpc8641hpcn.c | 2 +- board/{ => freescale}/mpc8641hpcn/u-boot.lds | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) rename board/{mpc8641hpcn => freescale/common}/sys_eeprom.c (100%) rename board/{ => freescale}/mpc8641hpcn/Makefile (93%) rename board/{ => freescale}/mpc8641hpcn/config.mk (100%) rename board/{ => freescale}/mpc8641hpcn/init.S (100%) rename board/{ => freescale}/mpc8641hpcn/mpc8641hpcn.c (100%) rename board/{ => freescale}/mpc8641hpcn/u-boot.lds (99%)
diff --git a/Makefile b/Makefile index 9dee948..65efd3f 100644 --- a/Makefile +++ b/Makefile @@ -1900,7 +1900,7 @@ TQM8560_config: unconfig #########################################################################
MPC8641HPCN_config: unconfig - @$(MKCONFIG) $(@:_config=) ppc mpc86xx mpc8641hpcn + @$(MKCONFIG) $(@:_config=) ppc mpc86xx mpc8641hpcn freescale
sbc8641d_config: unconfig @./mkconfig $(@:_config=) ppc mpc86xx sbc8641d diff --git a/board/mpc8641hpcn/sys_eeprom.c b/board/freescale/common/sys_eeprom.c similarity index 100% rename from board/mpc8641hpcn/sys_eeprom.c rename to board/freescale/common/sys_eeprom.c diff --git a/board/mpc8641hpcn/Makefile b/board/freescale/mpc8641hpcn/Makefile similarity index 93% rename from board/mpc8641hpcn/Makefile rename to board/freescale/mpc8641hpcn/Makefile index df56b31..93b015d 100644 --- a/board/mpc8641hpcn/Makefile +++ b/board/freescale/mpc8641hpcn/Makefile @@ -24,13 +24,14 @@ include $(TOPDIR)/config.mk
ifneq ($(OBJTREE),$(SRCTREE)) -$(shell mkdir -p $(obj)../freescale/common) +$(shell mkdir -p $(obj)../common) endif
LIB = $(obj)lib$(BOARD).a
-COBJS := $(BOARD).o sys_eeprom.o \ - ../freescale/common/pixis.o +COBJS := $(BOARD).o \ + ../common/sys_eeprom.o \ + ../common/pixis.o
SOBJS := init.o
diff --git a/board/mpc8641hpcn/config.mk b/board/freescale/mpc8641hpcn/config.mk similarity index 100% rename from board/mpc8641hpcn/config.mk rename to board/freescale/mpc8641hpcn/config.mk diff --git a/board/mpc8641hpcn/init.S b/board/freescale/mpc8641hpcn/init.S similarity index 100% rename from board/mpc8641hpcn/init.S rename to board/freescale/mpc8641hpcn/init.S diff --git a/board/mpc8641hpcn/mpc8641hpcn.c b/board/freescale/mpc8641hpcn/mpc8641hpcn.c similarity index 100% rename from board/mpc8641hpcn/mpc8641hpcn.c rename to board/freescale/mpc8641hpcn/mpc8641hpcn.c index 1bfbe88..ffd11cb 100644 --- a/board/mpc8641hpcn/mpc8641hpcn.c +++ b/board/freescale/mpc8641hpcn/mpc8641hpcn.c @@ -33,7 +33,7 @@ extern void ft_cpu_setup(void *blob, bd_t *bd); #endif
-#include "../freescale/common/pixis.h" +#include "../common/pixis.h"
#if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER) extern void ddr_enable_ecc(unsigned int dram_size); diff --git a/board/mpc8641hpcn/u-boot.lds b/board/freescale/mpc8641hpcn/u-boot.lds similarity index 99% rename from board/mpc8641hpcn/u-boot.lds rename to board/freescale/mpc8641hpcn/u-boot.lds index 5864464..fd16362 100644 --- a/board/mpc8641hpcn/u-boot.lds +++ b/board/freescale/mpc8641hpcn/u-boot.lds @@ -51,7 +51,7 @@ SECTIONS .text : { cpu/mpc86xx/start.o (.text) - board/mpc8641hpcn/init.o (.bootpg) + board/freescale/mpc8641hpcn/init.o (.bootpg) cpu/mpc86xx/traps.o (.text) cpu/mpc86xx/interrupts.o (.text) cpu/mpc86xx/cpu_init.o (.text)