Commit 604a2785 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
  Blackfin arch: Fix PM building on BF52x: No ROTWE on BF52x, add USBWE
  Blackfin arch: sram: use 'unsigned long' for irqflags
  Blackfin arch: let PCI depend on BROKEN
  Blackfin arch: move include/asm-blackfin header files to arch/blackfin
  Blackfin arch: fix bug - MPU crashes under stress
  Blackfin arch: Fix bug - when to rmmod the L1_module, it stucks and then reboot the board.
  Blackfin arch: dont actually need to muck with EMAC_SYSTAT for BF52x for demuxing
  Blackfin arch: Add MTD Partitions for MTD_DATAFLASH, increase max SPI SCLK
parents 66833d5f d310fb4b

arch/blackfin/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -855,6 +855,7 @@ menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)" 


config PCI

	bool "PCI support"

	depends on BROKEN

	help

	  Support for PCI bus.

arch/blackfin/Makefile

+5 −21
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE