diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-11 00:42:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-11 00:42:03 -0400 |
| commit | 398364a35daed7361e76c3666fb9a97792edce09 (patch) | |
| tree | 7a63b4df27d2dc75da8549499c79805128183f28 /arch/arm/Kconfig | |
| parent | d2b6b4c832f7e3067709e8d4970b7b82b44419ac (diff) | |
| parent | ad97f9df0fee4ddc9ef056dda4dcbc6630d9f972 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68nommu updates from Greg Ungerer:
"A series of cleanups for the FLAT format binary loader, binfmt_flat,
from Christoph.
The end goal is to support no-MMU on RISC-V, and the last patch
enables that"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
riscv: add binfmt_flat support
binfmt_flat: don't offset the data start
binfmt_flat: move the MAX_SHARED_LIBS definition to binfmt_flat.c
binfmt_flat: remove the persistent argument from flat_get_addr_from_rp
binfmt_flat: provide an asm-generic/flat.h
binfmt_flat: make support for old format binaries optional
binfmt_flat: add a ARCH_HAS_BINFMT_FLAT option
binfmt_flat: add endianess annotations
binfmt_flat: use fixed size type for the on-disk format
binfmt_flat: consolidate two version of flat_v2_reloc_t
binfmt_flat: remove the unused OLD_FLAT_FLAG_RAM definition
binfmt_flat: remove the uapi <linux/flat.h> header
binfmt_flat: replace flat_argvp_envp_on_stack with a Kconfig variable
binfmt_flat: remove flat_old_ram_flag
binfmt_flat: provide a default version of flat_get_relocate_addr
binfmt_flat: remove flat_set_persistent
binfmt_flat: remove flat_reloc_valid
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ad00e17d6988..d850feb5cc0a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -4,6 +4,7 @@ config ARM | |||
| 4 | default y | 4 | default y |
| 5 | select ARCH_32BIT_OFF_T | 5 | select ARCH_32BIT_OFF_T |
| 6 | select ARCH_CLOCKSOURCE_DATA | 6 | select ARCH_CLOCKSOURCE_DATA |
| 7 | select ARCH_HAS_BINFMT_FLAT | ||
| 7 | select ARCH_HAS_DEBUG_VIRTUAL if MMU | 8 | select ARCH_HAS_DEBUG_VIRTUAL if MMU |
| 8 | select ARCH_HAS_DEVMEM_IS_ALLOWED | 9 | select ARCH_HAS_DEVMEM_IS_ALLOWED |
| 9 | select ARCH_HAS_ELF_RANDOMIZE | 10 | select ARCH_HAS_ELF_RANDOMIZE |
| @@ -30,6 +31,7 @@ config ARM | |||
| 30 | select ARCH_USE_BUILTIN_BSWAP | 31 | select ARCH_USE_BUILTIN_BSWAP |
| 31 | select ARCH_USE_CMPXCHG_LOCKREF | 32 | select ARCH_USE_CMPXCHG_LOCKREF |
| 32 | select ARCH_WANT_IPC_PARSE_VERSION | 33 | select ARCH_WANT_IPC_PARSE_VERSION |
| 34 | select BINFMT_FLAT_ARGVP_ENVP_ON_STACK | ||
| 33 | select BUILDTIME_EXTABLE_SORT if MMU | 35 | select BUILDTIME_EXTABLE_SORT if MMU |
| 34 | select CLONE_BACKWARDS | 36 | select CLONE_BACKWARDS |
| 35 | select CPU_PM if SUSPEND || CPU_IDLE | 37 | select CPU_PM if SUSPEND || CPU_IDLE |