diff options
| author | Stefan Roese <sr@denx.de> | 2007-08-15 21:11:45 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-08-15 21:11:45 +0200 |
| commit | a44e7a97c8cbbac3cbc32376dcaad0ec1f76f604 (patch) | |
| tree | 5be8f0f835b6ca59ca296ef9b76563175782e1ea /board | |
| parent | b706d63559aeec352bc72dd86d7d5423c15f6a60 (diff) | |
| parent | ed4058afc85dc6341fea38cb240beb76296b0d24 (diff) | |
| download | talos-obmc-uboot-a44e7a97c8cbbac3cbc32376dcaad0ec1f76f604.tar.gz talos-obmc-uboot-a44e7a97c8cbbac3cbc32376dcaad0ec1f76f604.zip | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'board')
| -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 |
6 files changed, 6 insertions, 5 deletions
diff --git a/board/mpc8641hpcn/sys_eeprom.c b/board/freescale/common/sys_eeprom.c index 7bc663bba4..7bc663bba4 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 df56b31e58..93b015d474 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 f778dcbe0c..f778dcbe0c 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 cb21ba6a75..cb21ba6a75 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 1bfbe88b5a..ffd11cb5f1 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 58644648c7..fd163622a8 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) |
