From 60364154bb01a215641cce615e3f7ce8f613a922 Mon Sep 17 00:00:00 2001 From: Russell King Date: Tue, 19 Oct 2004 19:15:34 +0100 Subject: [PATCH] [ARM] Move machine specific boot variables to separate makefile. Move machine specific boot variables out of arch/arm/boot/Makefile into arch/arm/mach-*/Makefile.boot. --- arch/arm/Makefile | 17 ++++--- arch/arm/boot/Makefile | 65 ++------------------------ arch/arm/mach-clps711x/Makefile.boot | 7 +++ arch/arm/mach-clps7500/Makefile.boot | 2 + arch/arm/mach-ebsa110/Makefile.boot | 4 ++ arch/arm/mach-epxa10db/Makefile.boot | 2 + arch/arm/mach-footbridge/Makefile.boot | 4 ++ arch/arm/mach-h720x/Makefile.boot | 2 + arch/arm/mach-imx/Makefile.boot | 2 + arch/arm/mach-integrator/Makefile.boot | 4 ++ arch/arm/mach-iop3xx/Makefile.boot | 9 ++++ arch/arm/mach-ixp4xx/Makefile.boot | 3 ++ arch/arm/mach-l7200/Makefile.boot | 2 + arch/arm/mach-lh7a40x/Makefile.boot | 4 ++ arch/arm/mach-omap/Makefile.boot | 4 ++ arch/arm/mach-pxa/Makefile.boot | 2 + arch/arm/mach-rpc/Makefile.boot | 4 ++ arch/arm/mach-s3c2410/Makefile.boot | 3 ++ arch/arm/mach-sa1100/Makefile.boot | 7 +++ arch/arm/mach-shark/Makefile.boot | 2 + arch/arm/mach-versatile/Makefile.boot | 4 ++ 21 files changed, 86 insertions(+), 67 deletions(-) create mode 100644 arch/arm/mach-clps711x/Makefile.boot create mode 100644 arch/arm/mach-clps7500/Makefile.boot create mode 100644 arch/arm/mach-ebsa110/Makefile.boot create mode 100644 arch/arm/mach-epxa10db/Makefile.boot create mode 100644 arch/arm/mach-footbridge/Makefile.boot create mode 100644 arch/arm/mach-h720x/Makefile.boot create mode 100644 arch/arm/mach-imx/Makefile.boot create mode 100644 arch/arm/mach-integrator/Makefile.boot create mode 100644 arch/arm/mach-iop3xx/Makefile.boot create mode 100644 arch/arm/mach-ixp4xx/Makefile.boot create mode 100644 arch/arm/mach-l7200/Makefile.boot create mode 100644 arch/arm/mach-lh7a40x/Makefile.boot create mode 100644 arch/arm/mach-omap/Makefile.boot create mode 100644 arch/arm/mach-pxa/Makefile.boot create mode 100644 arch/arm/mach-rpc/Makefile.boot create mode 100644 arch/arm/mach-s3c2410/Makefile.boot create mode 100644 arch/arm/mach-sa1100/Makefile.boot create mode 100644 arch/arm/mach-shark/Makefile.boot create mode 100644 arch/arm/mach-versatile/Makefile.boot diff --git a/arch/arm/Makefile b/arch/arm/Makefile index a4878a0ae8e8c..826a3e4fe222e 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -109,6 +109,11 @@ ifeq ($(incdir-y),) incdir-y := $(machine-y) endif INCDIR := arch-$(incdir-y) +ifneq ($(machine-y),) +MACHINE := arch/arm/mach-$(machine-y)/ +else +MACHINE := +endif export TEXTADDR GZFLAGS @@ -120,9 +125,7 @@ endif # If we have a machine-specific directory, then include it in the build. core-y += arch/arm/kernel/ arch/arm/mm/ arch/arm/common/ -ifneq ($(machine-y),) -core-y += arch/arm/mach-$(machine-y)/ -endif +core-y += $(MACHINE) core-$(CONFIG_FPE_NWFPE) += arch/arm/nwfpe/ core-$(CONFIG_FPE_FASTFPE) += $(FASTFPE_OBJ) core-$(CONFIG_VFP) += arch/arm/vfp/ @@ -162,10 +165,10 @@ maketools: include/asm-arm/constants.h include/linux/version.h FORCE bzImage: zImage zImage Image bootpImage uImage: vmlinux - $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ + $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ zinstall install: vmlinux - $(Q)$(MAKE) $(build)=$(boot) $@ + $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ CLEAN_FILES += include/asm-arm/constants.h* include/asm-arm/mach-types.h \ include/asm-arm/arch include/asm-arm/.arch @@ -175,8 +178,8 @@ archclean: $(Q)$(MAKE) $(clean)=$(boot) # My testing targets (bypasses dependencies) -bp:; $(Q)$(MAKE) $(build)=$(boot) $(boot)/bootpImage -i zi:; $(Q)$(MAKE) $(build)=$(boot) $@ +bp:; $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/bootpImage +i zi:; $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \ include/asm-arm/.arch diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile index cfb4a252a59fd..d17494a822c3e 100644 --- a/arch/arm/boot/Makefile +++ b/arch/arm/boot/Makefile @@ -10,69 +10,14 @@ MKIMAGE := $(srctree)/scripts/mkuboot.sh +ifneq ($(MACHINE),) +include $(srctree)/$(MACHINE)/Makefile.boot +endif + # Note: the following conditions must always be true: # ZRELADDR == virt_to_phys(TEXTADDR) -# PARAMS_PHYS must be with 4MB of ZRELADDR +# PARAMS_PHYS must be within 4MB of ZRELADDR # INITRD_PHYS must be in RAM - - zreladdr-$(CONFIG_ARCH_RPC) := 0x10008000 -params_phys-$(CONFIG_ARCH_RPC) := 0x10000100 -initrd_phys-$(CONFIG_ARCH_RPC) := 0x18000000 - zreladdr-$(CONFIG_ARCH_CLPS7500) := 0x10008000 - zreladdr-$(CONFIG_ARCH_CLPS7500) := 0x10008000 - zreladdr-$(CONFIG_ARCH_EBSA110) := 0x00008000 -params_phys-$(CONFIG_ARCH_EBSA110) := 0x00000400 -initrd_phys-$(CONFIG_ARCH_EBSA110) := 0x00800000 - ztextaddr-$(CONFIG_ARCH_SHARK) := 0x08508000 - zreladdr-$(CONFIG_ARCH_SHARK) := 0x08008000 - zreladdr-$(CONFIG_FOOTBRIDGE) := 0x00008000 -params_phys-$(CONFIG_FOOTBRIDGE) := 0x00000100 -initrd_phys-$(CONFIG_FOOTBRIDGE) := 0x00800000 - zreladdr-$(CONFIG_ARCH_INTEGRATOR) := 0x00008000 -params_phys-$(CONFIG_ARCH_INTEGRATOR) := 0x00000100 -initrd_phys-$(CONFIG_ARCH_INTEGRATOR) := 0x00800000 - zreladdr-$(CONFIG_ARCH_CAMELOT) := 0x00008000 - zreladdr-$(CONFIG_ARCH_NEXUSPCI) := 0x40008000 - zreladdr-$(CONFIG_ARCH_L7200) := 0xf0008000 -# The standard locations for stuff on CLPS711x type processors - zreladdr-$(CONFIG_ARCH_CLPS711X) := 0xc0028000 -params_phys-$(CONFIG_ARCH_CLPS711X) := 0xc0000100 -# Should probably have some agreement on these... -initrd_phys-$(CONFIG_ARCH_P720T) := 0xc0400000 -initrd_phys-$(CONFIG_ARCH_CDB89712) := 0x00700000 - zreladdr-$(CONFIG_ARCH_SA1100) := 0xc0008000 -ifeq ($(CONFIG_ARCH_SA1100),y) - zreladdr-$(CONFIG_SA1111) := 0xc0208000 -endif -params_phys-$(CONFIG_ARCH_SA1100) := 0xc0000100 -initrd_phys-$(CONFIG_ARCH_SA1100) := 0xc0800000 - zreladdr-$(CONFIG_ARCH_PXA) := 0xa0008000 - zreladdr-$(CONFIG_ARCH_MX1ADS) := 0x08008000 - zreladdr-$(CONFIG_ARCH_IOP3XX) := 0xa0008000 -params_phys-$(CONFIG_ARCH_IOP3XX) := 0xa0000100 -initrd_phys-$(CONFIG_ARCH_IOP3XX) := 0xa0800000 -ifeq ($(CONFIG_ARCH_IOP331),y) - zreladdr-$(CONFIG_ARCH_IOP3XX) := 0x00008000 -params_phys-$(CONFIG_ARCH_IOP3XX) := 0x00000100 -initrd_phys-$(CONFIG_ARCH_IOP3XX) := 0x00800000 -endif - zreladdr-$(CONFIG_ARCH_IXP4XX) := 0x00008000 -params-phys-$(CONFIG_ARCH_IXP4XX) := 0x00000100 - zreladdr-$(CONFIG_ARCH_IXP2000) := 0x00008000 -params-phys-$(CONFIG_ARCH_IXP2000) := 0x00000100 - zreladdr-$(CONFIG_ARCH_OMAP) := 0x10008000 -params_phys-$(CONFIG_ARCH_OMAP) := 0x10000100 -initrd_phys-$(CONFIG_ARCH_OMAP) := 0x10800000 - zreladdr-$(CONFIG_ARCH_LH7A40X) := 0xc0008000 -params_phys-$(CONFIG_ARCH_LH7A40X) := 0xc0000100 -initrd_phys-$(CONFIG_ARCH_LH7A40X) := 0xc4000000 - zreladdr-$(CONFIG_ARCH_S3C2410) := 0x30008000 -params_phys-$(CONFIG_ARCH_S3C2410) := 0x30000100 - zreladdr-$(CONFIG_ARCH_VERSATILE_PB) := 0x00008000 -params_phys-$(CONFIG_ARCH_VERSATILE_PB) := 0x00000100 -initrd_phys-$(CONFIG_ARCH_VERSATILE_PB) := 0x00800000 - zreladdr-$(CONFIG_ARCH_H720X) := 0x40008000 - ZRELADDR := $(zreladdr-y) PARAMS_PHYS := $(params_phys-y) INITRD_PHYS := $(initrd_phys-y) diff --git a/arch/arm/mach-clps711x/Makefile.boot b/arch/arm/mach-clps711x/Makefile.boot new file mode 100644 index 0000000000000..d3d29339e149f --- /dev/null +++ b/arch/arm/mach-clps711x/Makefile.boot @@ -0,0 +1,7 @@ +# The standard locations for stuff on CLPS711x type processors + zreladdr-y := 0xc0028000 +params_phys-y := 0xc0000100 +# Should probably have some agreement on these... +initrd_phys-$(CONFIG_ARCH_P720T) := 0xc0400000 +initrd_phys-$(CONFIG_ARCH_CDB89712) := 0x00700000 + diff --git a/arch/arm/mach-clps7500/Makefile.boot b/arch/arm/mach-clps7500/Makefile.boot new file mode 100644 index 0000000000000..fe16506c15402 --- /dev/null +++ b/arch/arm/mach-clps7500/Makefile.boot @@ -0,0 +1,2 @@ + zreladdr-y := 0x10008000 + diff --git a/arch/arm/mach-ebsa110/Makefile.boot b/arch/arm/mach-ebsa110/Makefile.boot new file mode 100644 index 0000000000000..2321260449357 --- /dev/null +++ b/arch/arm/mach-ebsa110/Makefile.boot @@ -0,0 +1,4 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000400 +initrd_phys-y := 0x00800000 + diff --git a/arch/arm/mach-epxa10db/Makefile.boot b/arch/arm/mach-epxa10db/Makefile.boot new file mode 100644 index 0000000000000..28bec7d3fc88e --- /dev/null +++ b/arch/arm/mach-epxa10db/Makefile.boot @@ -0,0 +1,2 @@ + zreladdr-y := 0x00008000 + diff --git a/arch/arm/mach-footbridge/Makefile.boot b/arch/arm/mach-footbridge/Makefile.boot new file mode 100644 index 0000000000000..c7e75acfe6c9b --- /dev/null +++ b/arch/arm/mach-footbridge/Makefile.boot @@ -0,0 +1,4 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 + diff --git a/arch/arm/mach-h720x/Makefile.boot b/arch/arm/mach-h720x/Makefile.boot new file mode 100644 index 0000000000000..52984017bd91c --- /dev/null +++ b/arch/arm/mach-h720x/Makefile.boot @@ -0,0 +1,2 @@ + zreladdr-$(CONFIG_ARCH_H720X) := 0x40008000 + diff --git a/arch/arm/mach-imx/Makefile.boot b/arch/arm/mach-imx/Makefile.boot new file mode 100644 index 0000000000000..fd72ce5b80818 --- /dev/null +++ b/arch/arm/mach-imx/Makefile.boot @@ -0,0 +1,2 @@ + zreladdr-$(CONFIG_ARCH_MX1ADS) := 0x08008000 + diff --git a/arch/arm/mach-integrator/Makefile.boot b/arch/arm/mach-integrator/Makefile.boot new file mode 100644 index 0000000000000..c7e75acfe6c9b --- /dev/null +++ b/arch/arm/mach-integrator/Makefile.boot @@ -0,0 +1,4 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 + diff --git a/arch/arm/mach-iop3xx/Makefile.boot b/arch/arm/mach-iop3xx/Makefile.boot new file mode 100644 index 0000000000000..6387aa20461b7 --- /dev/null +++ b/arch/arm/mach-iop3xx/Makefile.boot @@ -0,0 +1,9 @@ + zreladdr-y := 0xa0008000 +params_phys-y := 0xa0000100 +initrd_phys-y := 0xa0800000 +ifeq ($(CONFIG_ARCH_IOP331),y) + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 +endif + diff --git a/arch/arm/mach-ixp4xx/Makefile.boot b/arch/arm/mach-ixp4xx/Makefile.boot new file mode 100644 index 0000000000000..d84c5807a43d7 --- /dev/null +++ b/arch/arm/mach-ixp4xx/Makefile.boot @@ -0,0 +1,3 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 + diff --git a/arch/arm/mach-l7200/Makefile.boot b/arch/arm/mach-l7200/Makefile.boot new file mode 100644 index 0000000000000..6c72ecbe6b640 --- /dev/null +++ b/arch/arm/mach-l7200/Makefile.boot @@ -0,0 +1,2 @@ + zreladdr-y := 0xf0008000 + diff --git a/arch/arm/mach-lh7a40x/Makefile.boot b/arch/arm/mach-lh7a40x/Makefile.boot new file mode 100644 index 0000000000000..af941be076eb6 --- /dev/null +++ b/arch/arm/mach-lh7a40x/Makefile.boot @@ -0,0 +1,4 @@ + zreladdr-y := 0xc0008000 +params_phys-y := 0xc0000100 +initrd_phys-y := 0xc4000000 + diff --git a/arch/arm/mach-omap/Makefile.boot b/arch/arm/mach-omap/Makefile.boot new file mode 100644 index 0000000000000..fee1a6a15b542 --- /dev/null +++ b/arch/arm/mach-omap/Makefile.boot @@ -0,0 +1,4 @@ + zreladdr-y := 0x10008000 +params_phys-y := 0x10000100 +initrd_phys-y := 0x10800000 + diff --git a/arch/arm/mach-pxa/Makefile.boot b/arch/arm/mach-pxa/Makefile.boot new file mode 100644 index 0000000000000..1ead67178eca3 --- /dev/null +++ b/arch/arm/mach-pxa/Makefile.boot @@ -0,0 +1,2 @@ + zreladdr-y := 0xa0008000 + diff --git a/arch/arm/mach-rpc/Makefile.boot b/arch/arm/mach-rpc/Makefile.boot new file mode 100644 index 0000000000000..9c9e7685ec7cf --- /dev/null +++ b/arch/arm/mach-rpc/Makefile.boot @@ -0,0 +1,4 @@ + zreladdr-y := 0x10008000 +params_phys-y := 0x10000100 +initrd_phys-y := 0x18000000 + diff --git a/arch/arm/mach-s3c2410/Makefile.boot b/arch/arm/mach-s3c2410/Makefile.boot new file mode 100644 index 0000000000000..7dab2a0325b5c --- /dev/null +++ b/arch/arm/mach-s3c2410/Makefile.boot @@ -0,0 +1,3 @@ + zreladdr-y := 0x30008000 +params_phys-y := 0x30000100 + diff --git a/arch/arm/mach-sa1100/Makefile.boot b/arch/arm/mach-sa1100/Makefile.boot new file mode 100644 index 0000000000000..a56ad0417cf28 --- /dev/null +++ b/arch/arm/mach-sa1100/Makefile.boot @@ -0,0 +1,7 @@ + zreladdr-y := 0xc0008000 +ifeq ($(CONFIG_ARCH_SA1100),y) + zreladdr-$(CONFIG_SA1111) := 0xc0208000 +endif +params_phys-y := 0xc0000100 +initrd_phys-y := 0xc0800000 + diff --git a/arch/arm/mach-shark/Makefile.boot b/arch/arm/mach-shark/Makefile.boot new file mode 100644 index 0000000000000..4320f8b927715 --- /dev/null +++ b/arch/arm/mach-shark/Makefile.boot @@ -0,0 +1,2 @@ + zreladdr-y := 0x08008000 + diff --git a/arch/arm/mach-versatile/Makefile.boot b/arch/arm/mach-versatile/Makefile.boot new file mode 100644 index 0000000000000..c7e75acfe6c9b --- /dev/null +++ b/arch/arm/mach-versatile/Makefile.boot @@ -0,0 +1,4 @@ + zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 + -- 2.53.0