mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 12:28:41 +08:00
Merge branch 'arm-multiplatform-cleanup' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc into arm/soc
Now that everything except StrongARM is unified under CONFIG_ARCH_MULTIPLATFORM, the option is rather meaningless in its current form. Rework the Kconfig logic to make this useful again, similar to the way that RISC-V has CONFIG_NONPORTABLE (with the opposite polarity), this now controls the visibility of options that get in the way of building generic kernels, while allowing custom kernels. One side-effect is that 'randconfig' builds now rarely hit strongarm machines, rather than testing them three quarters of the time. * 'arm-multiplatform-cleanup' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: ARM: make ARCH_MULTIPLATFORM user-visible ARM: fix XIP_KERNEL dependencies ARM: Kconfig: clean up platform selection ARM: simplify machdirs/platdirs handling ARM: remove obsolete Makefile.boot infrastructure
This commit is contained in:
commit
8774d33544
130
arch/arm/Kconfig
130
arch/arm/Kconfig
@ -28,7 +28,6 @@ config ARM
|
||||
select ARCH_HAS_GCOV_PROFILE_ALL
|
||||
select ARCH_KEEP_MEMBLOCK
|
||||
select ARCH_MIGHT_HAVE_PC_PARPORT
|
||||
select ARCH_NO_SG_CHAIN if !ARM_HAS_SG_CHAIN
|
||||
select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX
|
||||
select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT if CPU_V7
|
||||
select ARCH_SUPPORTS_ATOMIC_RMW
|
||||
@ -42,6 +41,7 @@ config ARM
|
||||
select ARCH_WANT_LD_ORPHAN_WARN
|
||||
select BINFMT_FLAT_ARGVP_ENVP_ON_STACK
|
||||
select BUILDTIME_TABLE_SORT if MMU
|
||||
select COMMON_CLK if !(ARCH_RPC || ARCH_FOOTBRIDGE)
|
||||
select CLONE_BACKWARDS
|
||||
select CPU_PM if SUSPEND || CPU_IDLE
|
||||
select DCACHE_WORD_ACCESS if HAVE_EFFICIENT_UNALIGNED_ACCESS
|
||||
@ -110,6 +110,7 @@ config ARM
|
||||
select HAVE_MOD_ARCH_SPECIFIC
|
||||
select HAVE_NMI
|
||||
select HAVE_OPTPROBES if !THUMB2_KERNEL
|
||||
select HAVE_PCI
|
||||
select HAVE_PERF_EVENTS
|
||||
select HAVE_PERF_REGS
|
||||
select HAVE_PERF_USER_STACK_DUMP
|
||||
@ -126,13 +127,17 @@ config ARM
|
||||
select OF_EARLY_FLATTREE if OF
|
||||
select OLD_SIGACTION
|
||||
select OLD_SIGSUSPEND3
|
||||
select PCI_DOMAINS_GENERIC if PCI
|
||||
select PCI_SYSCALL if PCI
|
||||
select PERF_USE_VMALLOC
|
||||
select RTC_LIB
|
||||
select SPARSE_IRQ if !(ARCH_FOOTBRIDGE || ARCH_RPC)
|
||||
select SYS_SUPPORTS_APM_EMULATION
|
||||
select THREAD_INFO_IN_TASK
|
||||
select TIMER_OF if OF
|
||||
select HAVE_ARCH_VMAP_STACK if MMU && ARM_HAS_GROUP_RELOCS
|
||||
select TRACE_IRQFLAGS_SUPPORT if !CPU_V7M
|
||||
select USE_OF if !(ARCH_FOOTBRIDGE || ARCH_RPC || ARCH_SA1100)
|
||||
# Above selects are sorted alphabetically; please add new ones
|
||||
# according to that. Thanks.
|
||||
help
|
||||
@ -154,12 +159,8 @@ config ARM_HAS_GROUP_RELOCS
|
||||
which is usually sufficient, but not for allyesconfig, so we disable
|
||||
this feature when doing compile testing.
|
||||
|
||||
config ARM_HAS_SG_CHAIN
|
||||
bool
|
||||
|
||||
config ARM_DMA_USE_IOMMU
|
||||
bool
|
||||
select ARM_HAS_SG_CHAIN
|
||||
select NEED_SG_DMA_LENGTH
|
||||
|
||||
if ARM_DMA_USE_IOMMU
|
||||
@ -245,7 +246,7 @@ config ARCH_MTD_XIP
|
||||
config ARM_PATCH_PHYS_VIRT
|
||||
bool "Patch physical to virtual translations at runtime" if EMBEDDED
|
||||
default y
|
||||
depends on !XIP_KERNEL && MMU
|
||||
depends on MMU
|
||||
help
|
||||
Patch phys-to-virt and virt-to-phys translation functions at
|
||||
boot and module load time according to the position of the
|
||||
@ -274,7 +275,7 @@ config NEED_MACH_MEMORY_H
|
||||
|
||||
config PHYS_OFFSET
|
||||
hex "Physical address of main memory" if MMU
|
||||
depends on !ARM_PATCH_PHYS_VIRT
|
||||
depends on !ARM_PATCH_PHYS_VIRT || !AUTO_ZRELADDR
|
||||
default DRAM_BASE if !MMU
|
||||
default 0x00000000 if ARCH_FOOTBRIDGE
|
||||
default 0x10000000 if ARCH_OMAP1 || ARCH_RPC
|
||||
@ -307,13 +308,8 @@ config MMU
|
||||
config ARM_SINGLE_ARMV7M
|
||||
def_bool !MMU
|
||||
select ARM_NVIC
|
||||
select AUTO_ZRELADDR
|
||||
select TIMER_OF
|
||||
select COMMON_CLK
|
||||
select CPU_V7M
|
||||
select NO_IOPORT_MAP
|
||||
select SPARSE_IRQ
|
||||
select USE_OF
|
||||
|
||||
config ARCH_MMAP_RND_BITS_MIN
|
||||
default 8
|
||||
@ -323,94 +319,31 @@ config ARCH_MMAP_RND_BITS_MAX
|
||||
default 15 if PAGE_OFFSET=0x80000000
|
||||
default 16
|
||||
|
||||
#
|
||||
# The "ARM system type" choice list is ordered alphabetically by option
|
||||
# text. Please add new entries in the option alphabetic order.
|
||||
#
|
||||
choice
|
||||
prompt "ARM system type"
|
||||
depends on MMU
|
||||
default ARCH_MULTIPLATFORM
|
||||
|
||||
config ARCH_MULTIPLATFORM
|
||||
bool "Allow multiple platforms to be selected"
|
||||
select ARCH_FLATMEM_ENABLE
|
||||
select ARCH_SPARSEMEM_ENABLE
|
||||
select ARCH_SELECT_MEMORY_MODEL
|
||||
select ARM_HAS_SG_CHAIN
|
||||
select ARM_PATCH_PHYS_VIRT
|
||||
select AUTO_ZRELADDR
|
||||
select TIMER_OF
|
||||
select COMMON_CLK
|
||||
select HAVE_PCI
|
||||
select PCI_DOMAINS_GENERIC if PCI
|
||||
select SPARSE_IRQ
|
||||
select USE_OF
|
||||
|
||||
config ARCH_FOOTBRIDGE
|
||||
bool "FootBridge"
|
||||
depends on CPU_LITTLE_ENDIAN
|
||||
depends on ATAGS
|
||||
select CPU_SA110
|
||||
select FOOTBRIDGE
|
||||
select NEED_MACH_MEMORY_H
|
||||
bool "Require kernel to be portable to multiple machines" if EXPERT
|
||||
depends on MMU && !(ARCH_FOOTBRIDGE || ARCH_RPC || ARCH_SA1100)
|
||||
default y
|
||||
help
|
||||
Support for systems based on the DC21285 companion chip
|
||||
("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
|
||||
In general, all Arm machines can be supported in a single
|
||||
kernel image, covering either Armv4/v5 or Armv6/v7.
|
||||
|
||||
config ARCH_RPC
|
||||
bool "RiscPC"
|
||||
depends on !CC_IS_CLANG && GCC_VERSION < 90100 && GCC_VERSION >= 60000
|
||||
depends on CPU_LITTLE_ENDIAN
|
||||
depends on ATAGS
|
||||
select ARCH_ACORN
|
||||
select ARCH_MAY_HAVE_PC_FDC
|
||||
select ARCH_SPARSEMEM_ENABLE
|
||||
select ARM_HAS_SG_CHAIN
|
||||
select CPU_SA110
|
||||
select FIQ
|
||||
select HAVE_PATA_PLATFORM
|
||||
select ISA_DMA_API
|
||||
select LEGACY_TIMER_TICK
|
||||
select NEED_MACH_IO_H
|
||||
select NEED_MACH_MEMORY_H
|
||||
select NO_IOPORT_MAP
|
||||
help
|
||||
On the Acorn Risc-PC, Linux can support the internal IDE disk and
|
||||
CD-ROM interface, serial and parallel port, and the floppy drive.
|
||||
However, some configuration options require hardcoding machine
|
||||
specific physical addresses or enable errata workarounds that may
|
||||
break other machines.
|
||||
|
||||
config ARCH_SA1100
|
||||
bool "SA1100-based"
|
||||
depends on CPU_LITTLE_ENDIAN
|
||||
depends on ATAGS
|
||||
select ARCH_MTD_XIP
|
||||
select ARCH_SPARSEMEM_ENABLE
|
||||
select CLKSRC_MMIO
|
||||
select CLKSRC_PXA
|
||||
select TIMER_OF if OF
|
||||
select COMMON_CLK
|
||||
select CPU_FREQ
|
||||
select CPU_SA1100
|
||||
select GPIOLIB
|
||||
select IRQ_DOMAIN
|
||||
select ISA
|
||||
select NEED_MACH_MEMORY_H
|
||||
select SPARSE_IRQ
|
||||
help
|
||||
Support for StrongARM 11x0 based boards.
|
||||
Selecting N here allows using those options, including
|
||||
DEBUG_UNCOMPRESS, XIP_KERNEL and ZBOOT_ROM. If unsure, say Y.
|
||||
|
||||
endchoice
|
||||
|
||||
menu "Multiple platform selection"
|
||||
depends on ARCH_MULTIPLATFORM
|
||||
menu "Platform selection"
|
||||
depends on MMU
|
||||
|
||||
comment "CPU Core family selection"
|
||||
|
||||
config ARCH_MULTI_V4
|
||||
bool "ARMv4 based platforms (FA526)"
|
||||
bool "ARMv4 based platforms (FA526, StrongARM)"
|
||||
depends on !ARCH_MULTI_V6_V7
|
||||
select ARCH_MULTI_V4_V5
|
||||
select CPU_FA526
|
||||
select CPU_FA526 if !(CPU_SA110 || CPU_SA1100)
|
||||
|
||||
config ARCH_MULTI_V4T
|
||||
bool "ARMv4T based platforms (ARM720T, ARM920T, ...)"
|
||||
@ -472,7 +405,6 @@ config ARCH_AIROHA
|
||||
select ARM_GIC_V3
|
||||
select ARM_PSCI
|
||||
select HAVE_ARM_ARCH_TIMER
|
||||
select COMMON_CLK
|
||||
help
|
||||
Support for Airoha EN7523 SoCs
|
||||
|
||||
@ -573,6 +505,8 @@ source "arch/arm/mach-rda/Kconfig"
|
||||
|
||||
source "arch/arm/mach-realtek/Kconfig"
|
||||
|
||||
source "arch/arm/mach-rpc/Kconfig"
|
||||
|
||||
source "arch/arm/mach-rockchip/Kconfig"
|
||||
|
||||
source "arch/arm/mach-s3c/Kconfig"
|
||||
@ -638,7 +572,6 @@ config ARCH_ACORN
|
||||
config PLAT_ORION
|
||||
bool
|
||||
select CLKSRC_MMIO
|
||||
select COMMON_CLK
|
||||
select GENERIC_IRQ_CHIP
|
||||
select IRQ_DOMAIN
|
||||
|
||||
@ -1049,7 +982,7 @@ config SMP
|
||||
|
||||
config SMP_ON_UP
|
||||
bool "Allow booting SMP kernel on uniprocessor systems"
|
||||
depends on SMP && !XIP_KERNEL && MMU
|
||||
depends on SMP && MMU
|
||||
default y
|
||||
help
|
||||
SMP kernels contain instructions which fail on non-SMP processors.
|
||||
@ -1298,7 +1231,7 @@ config THUMB2_KERNEL
|
||||
|
||||
config ARM_PATCH_IDIV
|
||||
bool "Runtime patch udiv/sdiv instructions into __aeabi_{u}idiv()"
|
||||
depends on CPU_32v7 && !XIP_KERNEL
|
||||
depends on CPU_32v7
|
||||
default y
|
||||
help
|
||||
The ARM compiler inserts calls to __aeabi_idiv() and
|
||||
@ -1353,13 +1286,13 @@ config OABI_COMPAT
|
||||
at all). If in doubt say N.
|
||||
|
||||
config ARCH_SELECT_MEMORY_MODEL
|
||||
bool
|
||||
def_bool y
|
||||
|
||||
config ARCH_FLATMEM_ENABLE
|
||||
bool
|
||||
def_bool !(ARCH_RPC || ARCH_SA1100)
|
||||
|
||||
config ARCH_SPARSEMEM_ENABLE
|
||||
bool
|
||||
def_bool !ARCH_FOOTBRIDGE
|
||||
select SPARSEMEM_STATIC if SPARSEMEM
|
||||
|
||||
config HIGHMEM
|
||||
@ -1683,6 +1616,7 @@ config CMDLINE_EXTEND
|
||||
|
||||
config CMDLINE_FORCE
|
||||
bool "Always use the default kernel command string"
|
||||
depends on !ARCH_MULTIPLATFORM
|
||||
help
|
||||
Always use the default kernel command string, even if the boot
|
||||
loader passes other arguments to the kernel.
|
||||
@ -1693,6 +1627,7 @@ endchoice
|
||||
config XIP_KERNEL
|
||||
bool "Kernel Execute-In-Place from ROM"
|
||||
depends on !ARM_LPAE && !ARCH_MULTIPLATFORM
|
||||
depends on !ARM_PATCH_IDIV && !ARM_PATCH_PHYS_VIRT && !SMP_ON_UP
|
||||
help
|
||||
Execute-In-Place allows the kernel to run from non-volatile storage
|
||||
directly addressable by the CPU, such as NOR flash. This saves RAM
|
||||
@ -1767,7 +1702,8 @@ config CRASH_DUMP
|
||||
For more details see Documentation/admin-guide/kdump/kdump.rst
|
||||
|
||||
config AUTO_ZRELADDR
|
||||
bool "Auto calculation of the decompressed kernel image address"
|
||||
bool "Auto calculation of the decompressed kernel image address" if !ARCH_MULTIPLATFORM
|
||||
default !(ARCH_FOOTBRIDGE || ARCH_RPC || ARCH_SA1100)
|
||||
help
|
||||
ZRELADDR is the physical address where the decompressed kernel
|
||||
image will be placed. If AUTO_ZRELADDR is selected, the address
|
||||
|
@ -1904,7 +1904,8 @@ config DEBUG_UART_8250_PALMCHIP
|
||||
|
||||
config DEBUG_UNCOMPRESS
|
||||
bool "Enable decompressor debugging via DEBUG_LL output"
|
||||
depends on ARCH_MULTIPLATFORM || PLAT_SAMSUNG || ARM_SINGLE_ARMV7M
|
||||
depends on !ARCH_MULTIPLATFORM
|
||||
depends on !(ARCH_FOOTBRIDGE || ARCH_RPC || ARCH_SA1100)
|
||||
depends on DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \
|
||||
(!DEBUG_TEGRA_UART || !ZBOOT_ROM) && \
|
||||
!DEBUG_BRCMSTB_UART && !DEBUG_SEMIHOSTING
|
||||
@ -1921,9 +1922,8 @@ config DEBUG_UNCOMPRESS
|
||||
|
||||
config UNCOMPRESS_INCLUDE
|
||||
string
|
||||
default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
|
||||
PLAT_SAMSUNG || ARM_SINGLE_ARMV7M
|
||||
default "mach/uncompress.h"
|
||||
default "mach/uncompress.h" if ARCH_FOOTBRIDGE || ARCH_RPC || ARCH_SA1100
|
||||
default "debug/uncompress.h"
|
||||
|
||||
config EARLY_PRINTK
|
||||
bool "Early printk"
|
||||
|
@ -224,40 +224,24 @@ machine-$(CONFIG_ARCH_ZYNQ) += zynq
|
||||
machine-$(CONFIG_PLAT_VERSATILE) += versatile
|
||||
machine-$(CONFIG_PLAT_SPEAR) += spear
|
||||
|
||||
# Platform directory name. This list is sorted alphanumerically
|
||||
# by CONFIG_* macro name.
|
||||
plat-$(CONFIG_PLAT_ORION) += orion
|
||||
# legacy platforms provide their own mach/*.h headers globally,
|
||||
# these three are mutually exclusive
|
||||
machdirs-$(CONFIG_ARCH_FOOTBRIDGE) += arch/arm/mach-footbridge
|
||||
machdirs-$(CONFIG_ARCH_RPC) += arch/arm/mach-rpc
|
||||
machdirs-$(CONFIG_ARCH_SA1100) += arch/arm/mach-sa1100
|
||||
KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%/include,$(machdirs-y))
|
||||
|
||||
# The byte offset of the kernel image in RAM from the start of RAM.
|
||||
TEXT_OFFSET := $(textofs-y)
|
||||
|
||||
# The first directory contains additional information for the boot setup code
|
||||
ifneq ($(machine-y),)
|
||||
MACHINE := arch/arm/mach-$(word 1,$(machine-y))/
|
||||
else
|
||||
MACHINE :=
|
||||
endif
|
||||
ifeq ($(CONFIG_ARCH_MULTIPLATFORM),y)
|
||||
MACHINE :=
|
||||
endif
|
||||
|
||||
machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
|
||||
platdirs := $(patsubst %,arch/arm/plat-%/,$(sort $(plat-y)))
|
||||
|
||||
ifneq ($(CONFIG_ARCH_MULTIPLATFORM),y)
|
||||
ifneq ($(CONFIG_ARM_SINGLE_ARMV7M),y)
|
||||
KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs) $(platdirs))
|
||||
endif
|
||||
endif
|
||||
|
||||
export TEXT_OFFSET GZFLAGS MMUEXT
|
||||
|
||||
# If we have a machine-specific directory, then include it in the build.
|
||||
core-y += $(machdirs) $(platdirs)
|
||||
|
||||
core-y += $(patsubst %,arch/arm/mach-%/,$(machine-y))
|
||||
# For cleaning
|
||||
core- += $(patsubst %,arch/arm/mach-%/, $(machine-))
|
||||
core- += $(patsubst %,arch/arm/plat-%/, $(plat-))
|
||||
core- += $(patsubst %,arch/arm/mach-%/,$(machine-))
|
||||
|
||||
core-$(CONFIG_PLAT_ORION) += arch/arm/plat-orion/
|
||||
|
||||
libs-y := arch/arm/lib/ $(libs-y)
|
||||
|
||||
@ -310,7 +294,7 @@ bootpImage uImage: zImage
|
||||
zImage: Image
|
||||
|
||||
$(BOOT_TARGETS): vmlinux
|
||||
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
|
||||
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
|
||||
@$(kecho) ' Kernel: $(boot)/$@ is ready'
|
||||
|
||||
$(INSTALL_TARGETS): KBUILD_IMAGE = $(boot)/$(patsubst %install,%Image,$@)
|
||||
@ -324,7 +308,7 @@ ifeq ($(CONFIG_VDSO),y)
|
||||
endif
|
||||
|
||||
# My testing targets (bypasses dependencies)
|
||||
bp:; $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/bootpImage
|
||||
bp:; $(Q)$(MAKE) $(build)=$(boot) $(boot)/bootpImage
|
||||
|
||||
|
||||
define archhelp
|
||||
|
@ -10,22 +10,16 @@
|
||||
#
|
||||
# Copyright (C) 1995-2002 Russell King
|
||||
#
|
||||
|
||||
OBJCOPYFLAGS :=-O binary -R .comment -S
|
||||
|
||||
ifneq ($(MACHINE),)
|
||||
include $(MACHINE)/Makefile.boot
|
||||
# ZRELADDR == virt_to_phys(PAGE_OFFSET + TEXT_OFFSET)
|
||||
ifdef CONFIG_PHYS_OFFSET
|
||||
add_hex = $(shell printf 0x%x $$(( $(1) + $(2) )) )
|
||||
ZRELADDR := $(call add_hex, $(CONFIG_PHYS_OFFSET), $(TEXT_OFFSET))
|
||||
endif
|
||||
|
||||
# Note: the following conditions must always be true:
|
||||
# ZRELADDR == virt_to_phys(PAGE_OFFSET + TEXT_OFFSET)
|
||||
# PARAMS_PHYS must be within 4MB of ZRELADDR
|
||||
# INITRD_PHYS must be in RAM
|
||||
ZRELADDR := $(zreladdr-y)
|
||||
PARAMS_PHYS := $(params_phys-y)
|
||||
INITRD_PHYS := $(initrd_phys-y)
|
||||
|
||||
export ZRELADDR INITRD_PHYS PARAMS_PHYS
|
||||
PHYS_OFFSET := $(CONFIG_PHYS_OFFSET)
|
||||
export ZRELADDR PARAMS_PHYS PHYS_OFFSET
|
||||
|
||||
targets := Image zImage xipImage bootpImage uImage
|
||||
|
||||
@ -90,17 +84,10 @@ $(obj)/uImage: $(obj)/zImage FORCE
|
||||
@$(check_for_multiple_loadaddr)
|
||||
$(call if_changed,uimage)
|
||||
|
||||
$(obj)/bootp/bootp: $(obj)/zImage initrd FORCE
|
||||
$(obj)/bootp/bootp: $(obj)/zImage FORCE
|
||||
$(Q)$(MAKE) $(build)=$(obj)/bootp $@
|
||||
|
||||
$(obj)/bootpImage: $(obj)/bootp/bootp FORCE
|
||||
$(call if_changed,objcopy)
|
||||
|
||||
PHONY += initrd
|
||||
initrd:
|
||||
@test "$(INITRD_PHYS)" != "" || \
|
||||
(echo This machine does not support INITRD; exit -1)
|
||||
@test "$(INITRD)" != "" || \
|
||||
(echo You must specify INITRD; exit -1)
|
||||
|
||||
subdir- := bootp compressed dts
|
||||
|
@ -5,9 +5,40 @@
|
||||
# This file is included by the global makefile so that you can add your own
|
||||
# architecture-specific flags and dependencies.
|
||||
#
|
||||
|
||||
GCOV_PROFILE := n
|
||||
|
||||
ifdef PHYS_OFFSET
|
||||
add_hex = $(shell printf 0x%x $$(( $(1) + $(2) )) )
|
||||
|
||||
# If PHYS_OFFSET is set, INITRD_PHYS and PARAMS_PHYS can be derived,
|
||||
# otherwise they must be passed on the command line.
|
||||
#
|
||||
# Note: the following conditions must always be true:
|
||||
# PARAMS_PHYS must be within 4MB of ZRELADDR
|
||||
# INITRD_PHYS must be in RAM
|
||||
|
||||
PARAMS_PHYS := $(call add_hex, $(PHYS_OFFSET), 0x100)
|
||||
|
||||
# guess an initrd location if possible
|
||||
initrd_offset-$(CONFIG_ARCH_FOOTBRIDGE) += 0x00800000
|
||||
initrd_offset-$(CONFIG_ARCH_SA1100) += 0x00800000
|
||||
initrd_offset-$(CONFIG_ARCH_RPC) += 0x08000000
|
||||
INITRD_OFFSET := $(initrd_offset-y)
|
||||
ifdef INITRD_OFFSET
|
||||
INITRD_PHYS := $(call add_hex, $(PHYS_OFFSET), $(INITRD_OFFSET))
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
PHONY += initrd
|
||||
initrd:
|
||||
@test "$(PARAMS_PHYS)" != "" || \
|
||||
(echo bootpImage: You must specify PHYS_OFFSET of PARAMS_PHYS ; exit -1)
|
||||
@test "$(INITRD_PHYS)" != "" || \
|
||||
(echo bootpImage: You must specify INITRD_OFFSET or INITRD_PHYS ; exit -1)
|
||||
@test "$(INITRD)" != "" || \
|
||||
(echo bootpImage: You must specify INITRD; exit -1)
|
||||
|
||||
LDFLAGS_bootp := --no-undefined -X \
|
||||
--defsym initrd_phys=$(INITRD_PHYS) \
|
||||
--defsym params_phys=$(PARAMS_PHYS) -T
|
||||
@ -24,6 +55,6 @@ $(obj)/bootp: $(src)/bootp.lds $(addprefix $(obj)/,init.o kernel.o initrd.o) FOR
|
||||
|
||||
$(obj)/kernel.o: arch/arm/boot/zImage FORCE
|
||||
|
||||
$(obj)/initrd.o: $(INITRD) FORCE
|
||||
$(obj)/initrd.o: initrd $(INITRD) FORCE
|
||||
|
||||
PHONY += $(INITRD)
|
||||
|
@ -1,6 +1,8 @@
|
||||
CONFIG_SYSVIPC=y
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_BLK_DEV_INITRD=y
|
||||
CONFIG_ARCH_MULTI_V4=y
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_SA1100=y
|
||||
CONFIG_SA1100_ASSABET=y
|
||||
CONFIG_CMDLINE="mem=32M console=ttySA0,38400n8 initrd=0xc0800000,3M root=/dev/ram"
|
||||
|
@ -1,5 +1,7 @@
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_EXPERT=y
|
||||
CONFIG_ARCH_MULTI_V4=y
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_SA1100=y
|
||||
CONFIG_SA1100_BADGE4=y
|
||||
CONFIG_UNUSED_BOARD_FILES=y
|
||||
|
@ -1,6 +1,8 @@
|
||||
CONFIG_SYSVIPC=y
|
||||
CONFIG_BSD_PROCESS_ACCT=y
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_ARCH_MULTI_V4=y
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_SA1100=y
|
||||
CONFIG_SA1100_CERF=y
|
||||
CONFIG_SA1100_CERF_FLASH_16MB=y
|
||||
|
@ -5,6 +5,8 @@ CONFIG_BLK_DEV_INITRD=y
|
||||
CONFIG_EXPERT=y
|
||||
# CONFIG_BASE_FULL is not set
|
||||
# CONFIG_EPOLL is not set
|
||||
CONFIG_ARCH_MULTI_V4=y
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_SA1100=y
|
||||
CONFIG_SA1100_COLLIE=y
|
||||
CONFIG_CMDLINE="noinitrd root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1"
|
||||
|
@ -4,6 +4,8 @@ CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_BLK_DEV_INITRD=y
|
||||
CONFIG_EXPERT=y
|
||||
# CONFIG_HOTPLUG is not set
|
||||
CONFIG_ARCH_MULTI_V4=y
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_FOOTBRIDGE=y
|
||||
CONFIG_ARCH_EBSA285_HOST=y
|
||||
CONFIG_ARCH_NETWINDER=y
|
||||
|
@ -4,6 +4,8 @@ CONFIG_HIGH_RES_TIMERS=y
|
||||
CONFIG_PREEMPT=y
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_BLK_DEV_INITRD=y
|
||||
CONFIG_ARCH_MULTI_V4=y
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_SA1100=y
|
||||
CONFIG_SA1100_H3600=y
|
||||
# CONFIG_CPU_FREQ_STAT is not set
|
||||
|
@ -1,6 +1,8 @@
|
||||
CONFIG_SYSVIPC=y
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_BLK_DEV_INITRD=y
|
||||
CONFIG_ARCH_MULTI_V4=y
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_SA1100=y
|
||||
CONFIG_SA1100_HACKKIT=y
|
||||
CONFIG_UNUSED_BOARD_FILES=y
|
||||
|
@ -1,6 +1,8 @@
|
||||
CONFIG_SYSVIPC=y
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_SYSFS_DEPRECATED_V2=y
|
||||
CONFIG_ARCH_MULTI_V4=y
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_SA1100=y
|
||||
CONFIG_SA1100_JORNADA720=y
|
||||
CONFIG_SA1100_JORNADA720_SSP=y
|
||||
|
@ -1,6 +1,8 @@
|
||||
CONFIG_SYSVIPC=y
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_BLK_DEV_INITRD=y
|
||||
CONFIG_ARCH_MULTI_V4=y
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_SA1100=y
|
||||
CONFIG_SA1100_LART=y
|
||||
CONFIG_UNUSED_BOARD_FILES=y
|
||||
|
@ -1,6 +1,8 @@
|
||||
CONFIG_SYSVIPC=y
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_BLK_DEV_INITRD=y
|
||||
CONFIG_ARCH_MULTI_V4=y
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_SA1100=y
|
||||
CONFIG_SA1100_ASSABET=y
|
||||
CONFIG_ASSABET_NEPONSET=y
|
||||
|
@ -1,5 +1,7 @@
|
||||
CONFIG_SYSVIPC=y
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_ARCH_MULTI_V4=y
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_FOOTBRIDGE=y
|
||||
CONFIG_ARCH_NETWINDER=y
|
||||
CONFIG_DEPRECATED_PARAM_STRUCT=y
|
||||
|
@ -4,6 +4,8 @@ CONFIG_BLK_DEV_INITRD=y
|
||||
CONFIG_EXPERT=y
|
||||
# CONFIG_HOTPLUG is not set
|
||||
# CONFIG_SHMEM is not set
|
||||
CONFIG_ARCH_MULTI_V4=y
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_SA1100=y
|
||||
CONFIG_SA1100_PLEB=y
|
||||
CONFIG_UNUSED_BOARD_FILES=y
|
||||
|
@ -4,6 +4,8 @@ CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_BLK_DEV_INITRD=y
|
||||
CONFIG_MODULES=y
|
||||
CONFIG_MODULE_UNLOAD=y
|
||||
CONFIG_ARCH_MULTI_V4=y
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_RPC=y
|
||||
CONFIG_CPU_SA110=y
|
||||
CONFIG_FPE_NWFPE=y
|
||||
|
@ -1,6 +1,8 @@
|
||||
CONFIG_SYSVIPC=y
|
||||
CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_BLK_DEV_INITRD=y
|
||||
CONFIG_ARCH_MULTI_V4=y
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_SA1100=y
|
||||
CONFIG_SA1100_SHANNON=y
|
||||
CONFIG_UNUSED_BOARD_FILES=y
|
||||
|
@ -5,6 +5,8 @@ CONFIG_LOG_BUF_SHIFT=14
|
||||
CONFIG_EXPERT=y
|
||||
CONFIG_KALLSYMS_ALL=y
|
||||
CONFIG_KALLSYMS_EXTRA_PASS=y
|
||||
CONFIG_ARCH_MULTI_V4=y
|
||||
# CONFIG_ARCH_MULTI_V7 is not set
|
||||
CONFIG_ARCH_SA1100=y
|
||||
CONFIG_SA1100_SIMPAD=y
|
||||
CONFIG_UNUSED_BOARD_FILES=y
|
||||
|
@ -194,14 +194,12 @@ const struct machine_desc * __init setup_machine_fdt(void *dt_virt)
|
||||
{
|
||||
const struct machine_desc *mdesc, *mdesc_best = NULL;
|
||||
|
||||
#if defined(CONFIG_ARCH_MULTIPLATFORM) || defined(CONFIG_ARM_SINGLE_ARMV7M)
|
||||
DT_MACHINE_START(GENERIC_DT, "Generic DT based system")
|
||||
.l2c_aux_val = 0x0,
|
||||
.l2c_aux_mask = ~0x0,
|
||||
MACHINE_END
|
||||
|
||||
mdesc_best = &__mach_desc_GENERIC_DT;
|
||||
#endif
|
||||
|
||||
if (!dt_virt || !early_init_dt_verify(dt_virt))
|
||||
return NULL;
|
||||
|
@ -1,4 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
# Empty file waiting for deletion once Makefile.boot isn't needed any more.
|
||||
# Patch waits for application at
|
||||
# https://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 .
|
@ -1,8 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
zreladdr-$(CONFIG_ARCH_DAVINCI_DA8XX) += 0xc0008000
|
||||
params_phys-$(CONFIG_ARCH_DAVINCI_DA8XX) := 0xc0000100
|
||||
initrd_phys-$(CONFIG_ARCH_DAVINCI_DA8XX) := 0xc0800000
|
||||
|
||||
zreladdr-$(CONFIG_ARCH_DAVINCI_DMx) += 0x80008000
|
||||
params_phys-$(CONFIG_ARCH_DAVINCI_DMx) := 0x80000100
|
||||
initrd_phys-$(CONFIG_ARCH_DAVINCI_DMx) := 0x80800000
|
@ -1,5 +1,5 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-orion/include
|
||||
ccflags-y := -I$(srctree)/arch/arm/plat-orion/include
|
||||
|
||||
obj-y += common.o
|
||||
obj-$(CONFIG_DOVE_LEGACY) += irq.o mpp.o
|
||||
|
@ -1,4 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
zreladdr-y += 0x00008000
|
||||
params_phys-y := 0x00000100
|
||||
initrd_phys-y := 0x00800000
|
@ -1,2 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
# Empty file waiting for deletion once Makefile.boot isn't needed any more.
|
@ -1,7 +1,20 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
if ARCH_FOOTBRIDGE
|
||||
menuconfig ARCH_FOOTBRIDGE
|
||||
bool "FootBridge Implementations"
|
||||
depends on ARCH_MULTI_V4 && !(ARCH_MULTI_V4T || ARCH_MULTI_V5)
|
||||
depends on !(ARCH_MOXART || ARCH_GEMINI || ARCH_SA1100)
|
||||
depends on ATAGS
|
||||
depends on CPU_LITTLE_ENDIAN
|
||||
depends on MMU
|
||||
select ARCH_NO_SG_CHAIN
|
||||
select CPU_SA110
|
||||
select FOOTBRIDGE
|
||||
select NEED_MACH_MEMORY_H
|
||||
help
|
||||
Support for systems based on the DC21285 companion chip
|
||||
("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
|
||||
|
||||
menu "Footbridge Implementations"
|
||||
if ARCH_FOOTBRIDGE
|
||||
|
||||
config ARCH_CATS
|
||||
bool "CATS"
|
||||
@ -41,8 +54,6 @@ config ARCH_NETWINDER
|
||||
|
||||
Saying N will reduce the size of the Footbridge kernel.
|
||||
|
||||
endmenu
|
||||
|
||||
# Footbridge support
|
||||
config FOOTBRIDGE
|
||||
def_bool y
|
||||
|
@ -1,5 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
zreladdr-y += 0x00008000
|
||||
params_phys-y := 0x00000100
|
||||
initrd_phys-y := 0x00800000
|
||||
|
@ -1,7 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
menuconfig ARCH_MXC
|
||||
bool "Freescale i.MX family"
|
||||
depends on (ARCH_MULTI_V4_V5 && CPU_LITTLE_ENDIAN) || \
|
||||
depends on ((ARCH_MULTI_V4T || ARCH_MULTI_V5) && CPU_LITTLE_ENDIAN) || \
|
||||
ARCH_MULTI_V6_V7 || ARM_SINGLE_ARMV7M
|
||||
select CLKSRC_IMX_GPT
|
||||
select GENERIC_IRQ_CHIP
|
||||
|
@ -1,4 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
zreladdr-y += 0xa0008000
|
||||
params_phys-y := 0xa0000100
|
||||
initrd_phys-y := 0xa0800000
|
@ -1,4 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
# Empty file waiting for deletion once Makefile.boot isn't needed any more.
|
||||
# Patch waits for application at
|
||||
# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 .
|
@ -1,4 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
zreladdr-y += 0x80008000
|
||||
params_phys-y := 0x80000100
|
||||
initrd_phys-y := 0x82000000
|
@ -1,5 +1,5 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-orion/include
|
||||
ccflags-y := -I$(srctree)/arch/arm/plat-orion/include
|
||||
|
||||
obj-y += common.o mpp.o irq.o pcie.o
|
||||
obj-$(CONFIG_MACH_DB78X00_BP) += db78x00-bp-setup.o
|
||||
|
@ -1,5 +1,5 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-orion/include
|
||||
ccflags-y := -I$(srctree)/arch/arm/plat-orion/include
|
||||
|
||||
AFLAGS_coherency_ll.o := -Wa,-march=armv7-a
|
||||
CFLAGS_pmsu.o := -march=armv7-a
|
||||
|
@ -1,7 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
config ARCH_NSPIRE
|
||||
bool "TI-NSPIRE based"
|
||||
depends on ARCH_MULTI_V4_V5
|
||||
depends on ARCH_MULTI_V4T
|
||||
depends on CPU_LITTLE_ENDIAN
|
||||
select CPU_ARM926T
|
||||
select GENERIC_IRQ_CHIP
|
||||
|
@ -1,4 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
zreladdr-y += 0x10008000
|
||||
params_phys-y := 0x10000100
|
||||
initrd_phys-y := 0x10800000
|
@ -1,5 +1,5 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-orion/include
|
||||
ccflags-y := -I$(srctree)/arch/arm/plat-orion/include
|
||||
|
||||
obj-y += common.o pci.o irq.o mpp.o
|
||||
obj-$(CONFIG_MACH_DB88F5281) += db88f5281-setup.o
|
||||
|
21
arch/arm/mach-rpc/Kconfig
Normal file
21
arch/arm/mach-rpc/Kconfig
Normal file
@ -0,0 +1,21 @@
|
||||
config ARCH_RPC
|
||||
bool "RiscPC"
|
||||
depends on ARCH_MULTI_V4 && !(ARCH_MULTI_V4T || ARCH_MULTI_V5)
|
||||
depends on !(ARCH_FOOTBRIDGE || ARCH_SA1100 || ARCH_MOXART || ARCH_GEMINI)
|
||||
depends on !CC_IS_CLANG && GCC_VERSION < 90100 && GCC_VERSION >= 60000
|
||||
depends on CPU_LITTLE_ENDIAN
|
||||
depends on ATAGS
|
||||
depends on MMU
|
||||
select ARCH_ACORN
|
||||
select ARCH_MAY_HAVE_PC_FDC
|
||||
select CPU_SA110
|
||||
select FIQ
|
||||
select HAVE_PATA_PLATFORM
|
||||
select ISA_DMA_API
|
||||
select LEGACY_TIMER_TICK
|
||||
select NEED_MACH_IO_H
|
||||
select NEED_MACH_MEMORY_H
|
||||
select NO_IOPORT_MAP
|
||||
help
|
||||
On the Acorn Risc-PC, Linux can support the internal IDE disk and
|
||||
CD-ROM interface, serial and parallel port, and the floppy drive.
|
@ -1,5 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
zreladdr-y += 0x10008000
|
||||
params_phys-y := 0x10000100
|
||||
initrd_phys-y := 0x18000000
|
||||
|
@ -1,9 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
ifeq ($(CONFIG_PM_H1940),y)
|
||||
zreladdr-y += 0x30108000
|
||||
params_phys-y := 0x30100100
|
||||
else
|
||||
zreladdr-y += 0x30008000
|
||||
params_phys-y := 0x30000100
|
||||
endif
|
@ -1,7 +1,25 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
if ARCH_SA1100
|
||||
menuconfig ARCH_SA1100
|
||||
bool "SA11x0 Implementations"
|
||||
depends on ARCH_MULTI_V4 && !(ARCH_MULTI_V4T || ARCH_MULTI_V5)
|
||||
depends on !(ARCH_MOXART || ARCH_GEMINI)
|
||||
depends on ATAGS
|
||||
depends on CPU_LITTLE_ENDIAN
|
||||
depends on MMU
|
||||
select ARCH_NO_SG_CHAIN
|
||||
select ARCH_MTD_XIP
|
||||
select CLKSRC_MMIO
|
||||
select CLKSRC_PXA
|
||||
select CPU_FREQ
|
||||
select CPU_SA1100
|
||||
select GPIOLIB
|
||||
select IRQ_DOMAIN
|
||||
select ISA
|
||||
select NEED_MACH_MEMORY_H
|
||||
help
|
||||
Support for StrongARM 11x0 based boards.
|
||||
|
||||
menu "SA11x0 Implementations"
|
||||
if ARCH_SA1100
|
||||
|
||||
config SA1100_ASSABET
|
||||
bool "Assabet"
|
||||
@ -179,7 +197,4 @@ config SA1100_SSP
|
||||
This isn't for audio support, but for attached sensors and
|
||||
other devices, eg for BadgePAD 4 sensor support.
|
||||
|
||||
endmenu
|
||||
|
||||
endif
|
||||
|
||||
|
@ -1,9 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
ifeq ($(CONFIG_SA1111),y)
|
||||
zreladdr-y += 0xc0208000
|
||||
else
|
||||
zreladdr-y += 0xc0008000
|
||||
endif
|
||||
params_phys-y := 0xc0000100
|
||||
initrd_phys-y := 0xc0800000
|
||||
|
@ -1,4 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
# Empty file waiting for deletion once Makefile.boot isn't needed any more.
|
||||
# Patch waits for application at
|
||||
# https://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 .
|
@ -1,4 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
# Empty file waiting for deletion once Makefile.boot isn't needed any more.
|
||||
# Patch waits for application at
|
||||
# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 .
|
@ -1,4 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
zreladdr-y += 0x00008000
|
||||
params_phys-y := 0x00000100
|
||||
initrd_phys-y := 0x01000000
|
Loading…
Reference in New Issue
Block a user