sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

[PPC] Move include/asm-ppc/arch-* to arch/ppc/*/include/mach 

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2009-10-22 14:21:30 +02:00
parent abd9cd4945
commit e988d5d990
17 changed files with 24 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/ppc/Makefile
View File

@ -21,29 +21,17 @@ ifndef CONFIG_MODULE
CPPFLAGS += -fdata-sections -ffunction-sections
endif
ifeq ($(incdir-y),)
incdir-y := $(machine-y)
endif
INCDIR := arch-$(incdir-y)
machdirs := $(patsubst %,arch/ppc/mach-%/,$(cpu-y))
# Update machine arch and proc symlinks if something which affects
# them changed. We use .arch to indicate when they were updated
# last, otherwise make uses the target directory mtime.
include/asm-ppc/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf
@echo ' SYMLINK include/asm-ppc/arch -> include/asm-ppc/$(INCDIR)'
ifneq ($(KBUILD_SRC),)
$(Q)mkdir -p include/asm-ppc
$(Q)ln -fsn $(srctree)/include/asm-ppc/$(INCDIR) include/asm-ppc/arch
ifeq ($(KBUILD_SRC),)
CPPFLAGS += $(patsubst %,-I%include,$(machdirs))
else
$(Q)ln -fsn $(INCDIR) include/asm-ppc/arch
CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs))
endif
@touch $@
archprepare: maketools
PHONY += maketools
maketools: include/asm-ppc/.arch
ifneq ($(board-y),)
@ -62,5 +50,3 @@ common-y += $(BOARD) $(CPU)
common-y += arch/ppc/lib/
lds-y += $(BOARD)/u-boot.lds
MRPROPER_FILES += include/asm-ppc/arch

2
arch/ppc/lib/time.c
View File

@ -24,7 +24,7 @@
#include <common.h>
#include <clock.h>
#include <init.h>
#include <asm/arch/clocks.h>
#include <mach/clocks.h>
#include <asm/common.h>
/* ------------------------------------------------------------------------- */

4
arch/ppc/mach-mpc5xxx/cpu.c
View File

@ -27,12 +27,12 @@
#include <common.h>
#include <command.h>
#include <asm/arch/mpc5xxx.h>
#include <mach/mpc5xxx.h>
#include <asm/processor.h>
#include <asm/byteorder.h>
#include <init.h>
#include <types.h>
#include <asm/arch/clocks.h>
#include <mach/clocks.h>
#if defined(CONFIG_OF_FLAT_TREE)
#include <ft_build.h>

2
arch/ppc/mach-mpc5xxx/cpu_init.c
View File

@ -22,7 +22,7 @@
*/
#include <common.h>
#include <asm/arch/mpc5xxx.h>
#include <mach/mpc5xxx.h>
#include <types.h>
#include <reloc.h>

0
include/asm-ppc/arch-mpc5200/clocks.h → arch/ppc/mach-mpc5xxx/include/mach/clocks.h
View File

0
include/asm-ppc/arch-mpc5200/fec.h → arch/ppc/mach-mpc5xxx/include/mach/fec.h
View File

2
include/asm-ppc/arch-mpc5200/mpc5xxx.h → arch/ppc/mach-mpc5xxx/include/mach/mpc5xxx.h
View File

@ -1,5 +1,5 @@
/*
* include/asm-ppc/mpc5xxx.h
* arch/ppc/mach-mpc5xxx/include/mach/mpc5xxx.h
*
* Prototypes, etc. for the Motorola MGT5xxx/MPC5xxx
* embedded cpu chips

2
include/asm-ppc/arch-mpc5200/sdma.h → arch/ppc/mach-mpc5xxx/include/mach/sdma.h
View File

@ -12,7 +12,7 @@
#define __MPC5XXX_SDMA_H
#include <common.h>
#include <asm/arch/mpc5xxx.h>
#include <mach/mpc5xxx.h>
/* Task number assignment */
#define FEC_RECV_TASK_NO 0

4
arch/ppc/mach-mpc5xxx/interrupts.c
View File

@ -41,9 +41,9 @@
#include <asm/processor.h>
#include <asm/io.h>
#include <command.h>
#include <asm/arch/sdma.h>
#include <mach/sdma.h>
#include <asm/bitops.h>
#include <asm/arch/clocks.h>
#include <mach/clocks.h>
struct irq_action {
interrupt_handler_t *handler;

2
arch/ppc/mach-mpc5xxx/loadtask.c
View File

@ -7,7 +7,7 @@
*/
#include <common.h>
#include <asm/arch/mpc5xxx.h>
#include <mach/mpc5xxx.h>
#include <types.h>
/* BestComm/SmartComm microcode */

2
arch/ppc/mach-mpc5xxx/reginfo.c
View File

@ -1,6 +1,6 @@
#include <stdio.h>
#include <config.h>
#include <asm/arch/mpc5xxx.h>
#include <mach/mpc5xxx.h>
void reginfo(void)
{

2
arch/ppc/mach-mpc5xxx/speed.c
View File

@ -22,7 +22,7 @@
*/
#include <common.h>
#include <asm/arch/mpc5xxx.h>
#include <mach/mpc5xxx.h>
#include <init.h>
#include <asm/processor.h>
#include <types.h>

2
board/pcm030/config.h
View File

@ -27,7 +27,7 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#include <asm/arch/mpc5xxx.h>
#include <mach/mpc5xxx.h>
/* #define DEBUG */

4
board/pcm030/pcm030.c
View File

@ -31,8 +31,8 @@
#include <driver.h>
#include <cfi_flash.h>
#include <init.h>
#include <asm/arch/mpc5xxx.h>
#include <asm/arch/fec.h>
#include <mach/mpc5xxx.h>
#include <mach/fec.h>
#include <types.h>
#include <partition.h>
#include <mem_malloc.h>

8
drivers/net/fec_mpc5200.c
View File

@ -7,15 +7,15 @@
*/
#include <common.h>
#include <asm/arch/mpc5xxx.h>
#include <mach/mpc5xxx.h>
#include <malloc.h>
#include <net.h>
#include <init.h>
#include <miiphy.h>
#include <driver.h>
#include <asm/arch/sdma.h>
#include <asm/arch/fec.h>
#include <asm/arch/clocks.h>
#include <mach/sdma.h>
#include <mach/fec.h>
#include <mach/clocks.h>
#include <miiphy.h>
#include "fec_mpc5200.h"

4
drivers/serial/serial_mpc5xxx.c
View File

@ -34,13 +34,13 @@
*/
#include <common.h>
#include <asm/arch/mpc5xxx.h>
#include <mach/mpc5xxx.h>
#include <driver.h>
#include <init.h>
#include <console.h>
#include <xfuncs.h>
#include <reloc.h>
#include <asm/arch/clocks.h>
#include <mach/clocks.h>
static int __mpc5xxx_serial_setbaudrate(struct mpc5xxx_psc *psc, int baudrate)
{

1
include/asm-ppc/.gitignore vendored
View File

@ -1 +0,0 @@
arch