hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MIPS] Rename CONFIG_BUILD_ELF64 into KBUILD_64BIT_SYM32 

This patch renames it for 3 reasons:

    - "CONFIG" pattern is used by Kconfig. Now this macro is
      no more defined by Kconfig but by Kbuild itself make this
      clear by translating "CONFIG" into "KBUILD".

    - "ELF32" word is improper because it is irrelevant to ELF
      format and it makes confusion with CONFIG_BOOT_ELF32. So
      translate it with SYM32.

    - Add "64BIT" part to make clear that this macro implies a
      64 bits kernel.

Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Franck Bui-Huu 2007-02-15 14:21:36 +01:00 committed by Ralf Baechle
parent adff90a933
commit 054c51b436
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/mips/Makefile
View File

@ -577,19 +577,17 @@ endif
# Automatically detect the build format. By default we choose # Automatically detect the build format. By default we choose
# the elf format according to the load address. # the elf format according to the load address.
# We can always force a build with a 64-bits symbol format by # We can always force a build with a 64-bits symbol format by
# passing 'BUILD_ELF32=no' option to the make's command line. # passing 'KBUILD_SYM32=no' option to the make's command line.
# #
ifdef CONFIG_64BIT ifdef CONFIG_64BIT
ifndef BUILD_ELF32 ifndef KBUILD_SYM32
ifeq ($(shell expr $(load-y) \< 0xffffffff80000000), 0) ifeq ($(shell expr $(load-y) \< 0xffffffff80000000), 0)
BUILD_ELF32 = y KBUILD_SYM32 = y
endif endif
endif endif
ifeq ($(BUILD_ELF32), y) ifeq ($(KBUILD_SYM32), y)
cflags-y += -msym32 cflags-y += -msym32 -DKBUILD_64BIT_SYM32
else
cflags-y += -DCONFIG_BUILD_ELF64
endif endif
endif endif

2
include/asm-mips/page.h
View File

@ -142,7 +142,7 @@ typedef struct { unsigned long pgprot; } pgprot_t;
/* /*
* __pa()/__va() should be used only during mem init. * __pa()/__va() should be used only during mem init.
*/ */
#if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64) #ifdef KBUILD_64BIT_SYM32
#define __pa(x) \ #define __pa(x) \
({ \ ({ \
unsigned long __x = (unsigned long)(x); \ unsigned long __x = (unsigned long)(x); \

2
include/asm-mips/pgtable-64.h
View File

@ -104,7 +104,7 @@
#define VMALLOC_START MAP_BASE #define VMALLOC_START MAP_BASE
#define VMALLOC_END \ #define VMALLOC_END \
(VMALLOC_START + PTRS_PER_PGD * PTRS_PER_PMD * PTRS_PER_PTE * PAGE_SIZE) (VMALLOC_START + PTRS_PER_PGD * PTRS_PER_PMD * PTRS_PER_PTE * PAGE_SIZE)
#if defined(CONFIG_MODULES) && !defined(CONFIG_BUILD_ELF64) && \ #if defined(CONFIG_MODULES) && defined(KBUILD_64BIT_SYM32) && \
VMALLOC_START != CKSSEG VMALLOC_START != CKSSEG
/* Load modules into 32bit-compatible segment. */ /* Load modules into 32bit-compatible segment. */
#define MODULE_START CKSSEG #define MODULE_START CKSSEG

12
include/asm-mips/stackframe.h
View File

@ -91,14 +91,14 @@
#else #else
MFC0 k0, CP0_CONTEXT MFC0 k0, CP0_CONTEXT
#endif #endif
#if defined(CONFIG_BUILD_ELF64) || (defined(CONFIG_64BIT) && __GNUC__ < 4) #if defined(CONFIG_32BIT) || defined(KBUILD_64BIT_SYM32)
lui k1, %hi(kernelsp)
#else
lui k1, %highest(kernelsp) lui k1, %highest(kernelsp)
daddiu k1, %higher(kernelsp) daddiu k1, %higher(kernelsp)
dsll k1, 16 dsll k1, 16
daddiu k1, %hi(kernelsp) daddiu k1, %hi(kernelsp)
dsll k1, 16 dsll k1, 16
#else
lui k1, %hi(kernelsp)
#endif #endif
LONG_SRL k0, PTEBASE_SHIFT LONG_SRL k0, PTEBASE_SHIFT
LONG_ADDU k1, k0 LONG_ADDU k1, k0
@ -116,14 +116,14 @@
.endm .endm
#else #else
.macro get_saved_sp /* Uniprocessor variation */ .macro get_saved_sp /* Uniprocessor variation */
#if defined(CONFIG_BUILD_ELF64) || (defined(CONFIG_64BIT) && __GNUC__ < 4) #if defined(CONFIG_32BIT) || defined(KBUILD_64BIT_SYM32)
lui k1, %hi(kernelsp)
#else
lui k1, %highest(kernelsp) lui k1, %highest(kernelsp)
daddiu k1, %higher(kernelsp) daddiu k1, %higher(kernelsp)
dsll k1, k1, 16 dsll k1, k1, 16
daddiu k1, %hi(kernelsp) daddiu k1, %hi(kernelsp)
dsll k1, k1, 16 dsll k1, k1, 16
#else
lui k1, %hi(kernelsp)
#endif #endif
LONG_L k1, %lo(kernelsp)(k1) LONG_L k1, %lo(kernelsp)(k1)
.endm .endm