Blackfin arch: move include/asm-blackfin header files to arch/blackfin
Signed-off-by: Bryan Wu <cooloney@kernel.org>
This commit is contained in:
Bryan Wu
parent
3d9b7a5ce5
commit
639f657145
|
|
@ -98,36 +98,20 @@ libs-y += arch/$(ARCH)/lib/
|
|||
|
||||
drivers-$(CONFIG_OPROFILE) += arch/$(ARCH)/oprofile/
|
||||
|
||||
machdirs := $(patsubst %,arch/blackfin/mach-%/, $(machine-y))
|
||||
|
||||
KBUILD_CFLAGS += -Iarch/$(ARCH)/include/
|
||||
KBUILD_CFLAGS += -Iarch/$(ARCH)/mach-$(MACHINE)/include
|
||||
|
||||
# Update machine arch symlinks if something which affects
|
||||
# them changed. We use .mach to indicate when they were updated
|
||||
# last, otherwise make uses the target directory mtime.
|
||||
|
||||
show_mach_symlink = :
|
||||
quiet_show_mach_symlink = echo ' SYMLINK include/asm-$(ARCH)/mach-$(MACHINE) -> include/asm-$(ARCH)/mach'
|
||||
silent_show_mach_symlink = :
|
||||
include/asm-blackfin/.mach: $(wildcard include/config/arch/*.h) include/config/auto.conf
|
||||
@$($(quiet)show_mach_symlink)
|
||||
ifneq ($(KBUILD_SRC),)
|
||||
$(Q)mkdir -p include/asm-$(ARCH)
|
||||
$(Q)ln -fsn $(srctree)/include/asm-$(ARCH)/mach-$(MACHINE) include/asm-$(ARCH)/mach
|
||||
else
|
||||
$(Q)ln -fsn mach-$(MACHINE) include/asm-$(ARCH)/mach
|
||||
endif
|
||||
@touch $@
|
||||
KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs))
|
||||
|
||||
CLEAN_FILES += \
|
||||
include/asm-$(ARCH)/asm-offsets.h \
|
||||
arch/$(ARCH)/include/asm/asm-offsets.h \
|
||||
arch/$(ARCH)/kernel/asm-offsets.s \
|
||||
include/asm-$(ARCH)/mach \
|
||||
include/asm-$(ARCH)/.mach
|
||||
|
||||
archprepare: include/asm-blackfin/.mach
|
||||
archclean:
|
||||
$(Q)$(MAKE) $(clean)=$(boot)
|
||||
|
||||
|
||||
INSTALL_PATH ?= /tftpboot
|
||||
boot := arch/$(ARCH)/boot
|
||||
BOOT_TARGETS = vmImage
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
#define HI(con32) (((con32) >> 16) & 0xFFFF)
|
||||
#define hi(con32) (((con32) >> 16) & 0xFFFF)
|
||||
|
||||
#include <asm/mach/anomaly.h>
|
||||
#include <mach/anomaly.h>
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
|
|
@ -86,7 +86,7 @@ static inline void CSYNC(void)
|
|||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
||||
#include <asm/mach/blackfin.h>
|
||||
#include <mach/blackfin.h>
|
||||
#include <asm/bfin-global.h>
|
||||
|
||||
#endif /* _BLACKFIN_H_ */
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
#warning cdef_LPBlackfin.h should only be included for 532 compatible chips.
|
||||
#endif
|
||||
*/
|
||||
#include <asm/mach-common/def_LPBlackfin.h>
|
||||
#include <asm/def_LPBlackfin.h>
|
||||
|
||||
/*Cache & SRAM Memory*/
|
||||
#define bfin_read_SRAM_BASE_ADDRESS() bfin_read32(SRAM_BASE_ADDRESS)
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
#define _CPLB_H
|
||||
|
||||
#include <asm/blackfin.h>
|
||||
#include <asm/mach/anomaly.h>
|
||||
#include <mach/anomaly.h>
|
||||
|
||||
#define SDRAM_IGENERIC (CPLB_L1_CHBL | CPLB_USER_RD | CPLB_VALID | CPLB_PORTPRIO)
|
||||
#define SDRAM_IKERNEL (SDRAM_IGENERIC | CPLB_LOCK)
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
#ifndef _DEF_LPBLACKFIN_H
|
||||
#define _DEF_LPBLACKFIN_H
|
||||
|
||||
#include <asm/mach/anomaly.h>
|
||||
#include <mach/anomaly.h>
|
||||
|
||||
#define MK_BMSK_(x) (1<<x)
|
||||
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
#ifndef __ASM_DELAY_H__
|
||||
#define __ASM_DELAY_H__
|
||||
|
||||
#include <asm/mach/anomaly.h>
|
||||
#include <mach/anomaly.h>
|
||||
|
||||
static inline void __delay(unsigned long loops)
|
||||
{
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
#include <asm/signal.h>
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <asm/mach/dma.h>
|
||||
#include <mach/dma.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <asm/blackfin.h>
|
||||
|
|
@ -224,7 +224,7 @@
|
|||
#endif
|
||||
|
||||
#ifdef BF548_FAMILY
|
||||
#include <asm-blackfin/mach-bf548/gpio.h>
|
||||
#include <mach/gpio.h>
|
||||
#endif
|
||||
|
||||
#ifdef BF561_FAMILY
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
#ifndef _BFIN_IRQ_H_
|
||||
#define _BFIN_IRQ_H_
|
||||
|
||||
#include <asm/mach/irq.h>
|
||||
#include <mach/irq.h>
|
||||
#include <asm/ptrace.h>
|
||||
|
||||
/*******************************************************************************
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
* interrupts apart (just the TX/RX for the various devices)
|
||||
*******************************************************************************/
|
||||
|
||||
/* SYS_IRQS and NR_IRQS are defined in <asm/mach-bf5xx/irq.h>*/
|
||||
/* SYS_IRQS and NR_IRQS are defined in <mach-bf5xx/irq.h>*/
|
||||
|
||||
/*
|
||||
* Machine specific interrupt sources.
|
||||
|
|
@ -7,6 +7,6 @@
|
|||
#ifndef _MEM_MAP_H_
|
||||
#define _MEM_MAP_H_
|
||||
|
||||
#include <asm/mach/mem_map.h>
|
||||
#include <mach/mem_map.h>
|
||||
|
||||
#endif /* _MEM_MAP_H_ */
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
#include <asm-generic/4level-fixup.h>
|
||||
|
||||
#include <asm/page.h>
|
||||
#include <asm/mach-common/def_LPBlackfin.h>
|
||||
#include <asm/def_LPBlackfin.h>
|
||||
|
||||
typedef pte_t *pte_addr_t;
|
||||
/*
|
||||
|
|
@ -21,7 +21,7 @@ int peripheral_request_list(const unsigned short per[], const char *label);
|
|||
void peripheral_free_list(const unsigned short per[]);
|
||||
|
||||
#include <asm/gpio.h>
|
||||
#include <asm/mach/portmux.h>
|
||||
#include <mach/portmux.h>
|
||||
|
||||
#ifndef P_SPORT2_TFS
|
||||
#define P_SPORT2_TFS P_UNDEF
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue