diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 14:23:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 14:23:06 -0400 |
| commit | 821f3eff7cdb9d6c7076effabd46c96c322daed1 (patch) | |
| tree | 60f13155196fd6c84424c8aebc133ca4a5f56749 /arch/blackfin | |
| parent | ebc283118ee448dcb6e6cae74a8a43f17a1ccc3f (diff) | |
| parent | f77bf01425b11947eeb3b5b54685212c302741b8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (40 commits)
kbuild: introduce ccflags-y, asflags-y and ldflags-y
kbuild: enable 'make CPPFLAGS=...' to add additional options to CPP
kbuild: enable use of AFLAGS and CFLAGS on commandline
kbuild: enable 'make AFLAGS=...' to add additional options to AS
kbuild: fix AFLAGS use in h8300 and m68knommu
kbuild: check for wrong use of CFLAGS
kbuild: enable 'make CFLAGS=...' to add additional options to CC
kbuild: fix up CFLAGS usage
kbuild: make modpost detect unterminated device id lists
kbuild: call export_report from the Makefile
kbuild: move Kai Germaschewski to CREDITS
kconfig/menuconfig: distinguish between selected-by-another options and comments
kconfig: tristate choices with mixed tristate and boolean values
include/linux/Kbuild: remove duplicate entries
kbuild: kill backward compatibility checks
kbuild: kill EXTRA_ARFLAGS
kbuild: fix documentation in makefiles.txt
kbuild: call make once for all targets when O=.. is used
kbuild: pass -g to assembler under CONFIG_DEBUG_INFO
kbuild: update _shipped files for kconfig syntax cleanup
...
Fix up conflicts in arch/um/sys-{x86_64,i386}/Makefile manually.
Diffstat (limited to 'arch/blackfin')
| -rw-r--r-- | arch/blackfin/Kconfig | 2 | ||||
| -rw-r--r-- | arch/blackfin/Makefile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index b24f4535ffe0..aa9db3073312 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
| @@ -758,7 +758,7 @@ config BFIN_DMA_5XX | |||
| 758 | choice | 758 | choice |
| 759 | prompt "Uncached SDRAM region" | 759 | prompt "Uncached SDRAM region" |
| 760 | default DMA_UNCACHED_1M | 760 | default DMA_UNCACHED_1M |
| 761 | depends BFIN_DMA_5XX | 761 | depends on BFIN_DMA_5XX |
| 762 | config DMA_UNCACHED_2M | 762 | config DMA_UNCACHED_2M |
| 763 | bool "Enable 2M DMA region" | 763 | bool "Enable 2M DMA region" |
| 764 | config DMA_UNCACHED_1M | 764 | config DMA_UNCACHED_1M |
diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile index 20841663270f..368933760d28 100644 --- a/arch/blackfin/Makefile +++ b/arch/blackfin/Makefile | |||
| @@ -53,8 +53,8 @@ rev-$(CONFIG_BF_REV_0_5) := 0.5 | |||
| 53 | rev-$(CONFIG_BF_REV_NONE) := none | 53 | rev-$(CONFIG_BF_REV_NONE) := none |
| 54 | rev-$(CONFIG_BF_REV_ANY) := any | 54 | rev-$(CONFIG_BF_REV_ANY) := any |
| 55 | 55 | ||
| 56 | CFLAGS += -mcpu=$(cpu-y)-$(rev-y) | 56 | KBUILD_CFLAGS += -mcpu=$(cpu-y)-$(rev-y) |
| 57 | AFLAGS += -mcpu=$(cpu-y)-$(rev-y) | 57 | KBUILD_AFLAGS += -mcpu=$(cpu-y)-$(rev-y) |
| 58 | 58 | ||
| 59 | head-y := arch/$(ARCH)/mach-$(MACHINE)/head.o arch/$(ARCH)/kernel/init_task.o | 59 | head-y := arch/$(ARCH)/mach-$(MACHINE)/head.o arch/$(ARCH)/kernel/init_task.o |
| 60 | 60 | ||