diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
| commit | 239060b93bb30a4ad55f1ecaa512464a035cc5ba (patch) | |
| tree | 77f79810e57d4fc24356eca0cd6db463e8994128 /arch/microblaze/Makefile | |
| parent | 1408b15b98635a13bad2e2a50b3c2ae2ccdf625b (diff) | |
| parent | e9203c988234aa512bd45ca32b52e21c7bbfc414 (diff) | |
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
We need to revert the temporary hack in 71ebc01, hence the merge.
Diffstat (limited to 'arch/microblaze/Makefile')
| -rw-r--r-- | arch/microblaze/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile index 72f6e8583746..592c7079de88 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile | |||
| @@ -25,7 +25,7 @@ ifeq (,$(findstring spartan2,$(CONFIG_XILINX_MICROBLAZE0_FAMILY))) | |||
| 25 | ifeq ($(CPU_MAJOR),3) | 25 | ifeq ($(CPU_MAJOR),3) |
| 26 | CPUFLAGS-1 += -mno-xl-soft-mul | 26 | CPUFLAGS-1 += -mno-xl-soft-mul |
| 27 | else | 27 | else |
| 28 | # USE_HW_MUL can be 0, 1, or 2, defining a heirarchy of HW Mul support. | 28 | # USE_HW_MUL can be 0, 1, or 2, defining a hierarchy of HW Mul support. |
| 29 | CPUFLAGS-$(subst 1,,$(CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL)) += -mxl-multiply-high | 29 | CPUFLAGS-$(subst 1,,$(CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL)) += -mxl-multiply-high |
| 30 | CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL) += -mno-xl-soft-mul | 30 | CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL) += -mno-xl-soft-mul |
| 31 | endif | 31 | endif |