diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-08-15 20:59:31 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-08-15 20:59:31 +0200 |
| commit | ed4058afc85dc6341fea38cb240beb76296b0d24 (patch) | |
| tree | da258aab9d4a944780da0e791fda0180fac7b1d3 | |
| parent | 30b52df9e906bf0e465916c2c6bb5192b438e0b8 (diff) | |
| parent | 4ce917742b1e48faa9bf9a9757545e56fb4cfe44 (diff) | |
| download | u-boot-imx-ed4058afc85dc6341fea38cb240beb76296b0d24.zip u-boot-imx-ed4058afc85dc6341fea38cb240beb76296b0d24.tar.gz u-boot-imx-ed4058afc85dc6341fea38cb240beb76296b0d24.tar.bz2 | |
Merge with /home/wd/git/u-boot/custodian/u-boot-mpc86xx
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | board/freescale/common/sys_eeprom.c (renamed from board/mpc8641hpcn/sys_eeprom.c) | 0 | ||||
| -rw-r--r-- | board/freescale/mpc8641hpcn/Makefile (renamed from board/mpc8641hpcn/Makefile) | 7 | ||||
| -rw-r--r-- | board/freescale/mpc8641hpcn/config.mk (renamed from board/mpc8641hpcn/config.mk) | 0 | ||||
| -rw-r--r-- | board/freescale/mpc8641hpcn/init.S (renamed from board/mpc8641hpcn/init.S) | 0 | ||||
| -rw-r--r-- | board/freescale/mpc8641hpcn/mpc8641hpcn.c (renamed from board/mpc8641hpcn/mpc8641hpcn.c) | 2 | ||||
| -rw-r--r-- | board/freescale/mpc8641hpcn/u-boot.lds (renamed from board/mpc8641hpcn/u-boot.lds) | 2 |
7 files changed, 7 insertions, 6 deletions
@@ -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 index 7bc663b..7bc663b 100644 --- a/board/mpc8641hpcn/sys_eeprom.c +++ b/board/freescale/common/sys_eeprom.c diff --git a/board/mpc8641hpcn/Makefile b/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 index f778dcb..f778dcb 100644 --- a/board/mpc8641hpcn/config.mk +++ b/board/freescale/mpc8641hpcn/config.mk diff --git a/board/mpc8641hpcn/init.S b/board/freescale/mpc8641hpcn/init.S index cb21ba6..cb21ba6 100644 --- a/board/mpc8641hpcn/init.S +++ b/board/freescale/mpc8641hpcn/init.S diff --git a/board/mpc8641hpcn/mpc8641hpcn.c b/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 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) |