diff options
| author |   Franck Bui-Huu <fbuihuu@gmail.com> | 2007-02-15 12:06:48 +0100 |
|---|---|---|
| committer |   Ralf Baechle <ralf@linux-mips.org> | 2007-10-11 23:45:59 +0100 |
| commit | adff90a9333004d5459823665e8bcf6cb9214f79 (patch) | |
| tree | d4eadd84faed02ef8514cca0e22756efbbfe5d2f /include/asm-mips | |
| parent | [MIPS] Remove '-mno-explicit-relocs' option when CONFIG_BUILD_ELF64 (diff) | |
| download | linux-dev-adff90a9333004d5459823665e8bcf6cb9214f79.tar.xz linux-dev-adff90a9333004d5459823665e8bcf6cb9214f79.zip | |
[MIPS] Automatically set CONFIG_BUILD_ELF64
We do not rely on user anymore to setup this config correctly.
Instead we make our choice depending on the load address.
If we want to force Kbuild to use ELF64 format whatever
the load address we can still do:
$ make BUILD_ELF32=no
Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'include/asm-mips')
| -rw-r--r-- | include/asm-mips/page.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/page.h b/include/asm-mips/page.h index e3301e54d559..b92dd8c760da 100644 --- a/include/asm-mips/page.h +++ b/include/asm-mips/page.h @@ -142,7 +142,7 @@ typedef struct { unsigned long pgprot; } pgprot_t; /* * __pa()/__va() should be used only during mem init. */ -#ifdef CONFIG_64BIT +#if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64) #define __pa(x) \ ({ \ unsigned long __x = (unsigned long)(x); \ |