mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
![Jesper Nilsson](/assets/img/avatar_default.png)
Remove the links to architecture and machine dependent directories (boot, lib, drivers, arch, mach) The links were created and used mostly from the arch/cris/Makefile, so why not dispense with them altogether? Changed $(ARCH) to "cris" in Makefile, it is easier to read this way. The CRISv32 head.S common files for the kernel and compressed images needed to be modified to use ifdefs instead of using the now removed mach link. Since there are only two versions, this is not a huge loss in readability. The link to vmlinux.lds.S is also replaced with a merged version which uses ifdefs to select the correct layout. System.map before and after are identical. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> Acked-by: Sam Ravnborg <sam@ravnborg.org>
100 lines
2.5 KiB
Makefile
100 lines
2.5 KiB
Makefile
#
|
|
# cris/Makefile
|
|
#
|
|
# This file is included by the global makefile so that you can add your own
|
|
# architecture-specific flags and dependencies. Remember to do have actions
|
|
# for "archclean" and "archdep" for cleaning up and making dependencies for
|
|
# this architecture
|
|
#
|
|
# This file is subject to the terms and conditions of the GNU General Public
|
|
# License. See the file "COPYING" in the main directory of this archive
|
|
# for more details.
|
|
|
|
KBUILD_DEFCONFIG := etrax-100lx_v2_defconfig
|
|
|
|
arch-y := v10
|
|
arch-$(CONFIG_ETRAX_ARCH_V10) := v10
|
|
arch-$(CONFIG_ETRAX_ARCH_V32) := v32
|
|
|
|
# No config available for make clean etc
|
|
mach-y := fs
|
|
mach-$(CONFIG_CRIS_MACH_ARTPEC3) := a3
|
|
mach-$(CONFIG_ETRAXFS) := fs
|
|
|
|
ifneq ($(arch-y),)
|
|
SARCH := arch-$(arch-y)
|
|
inc := -Iarch/cris/include/$(SARCH)
|
|
inc += -Iarch/cris/include/$(SARCH)/arch
|
|
else
|
|
SARCH :=
|
|
inc :=
|
|
endif
|
|
|
|
ifneq ($(mach-y),)
|
|
MACH := mach-$(mach-y)
|
|
inc += -Iarch/cris/include/$(SARCH)/$(MACH)/
|
|
inc += -Iarch/cris/include/$(SARCH)/$(MACH)/mach
|
|
else
|
|
MACH :=
|
|
endif
|
|
|
|
LD = $(CROSS_COMPILE)ld -mcrislinux
|
|
|
|
OBJCOPYFLAGS := -O binary -R .note -R .comment -S
|
|
|
|
CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE)
|
|
|
|
KBUILD_AFLAGS += -mlinux -march=$(arch-y) $(inc)
|
|
KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe $(inc)
|
|
KBUILD_CPPFLAGS += $(inc)
|
|
|
|
ifdef CONFIG_FRAME_POINTER
|
|
KBUILD_CFLAGS := $(subst -fomit-frame-pointer,,$(KBUILD_CFLAGS)) -g
|
|
KBUILD_CFLAGS += -fno-omit-frame-pointer
|
|
endif
|
|
|
|
head-y := arch/cris/$(SARCH)/kernel/head.o
|
|
|
|
LIBGCC = $(shell $(CC) $(KBUILD_CFLAGS) -print-file-name=libgcc.a)
|
|
|
|
core-y += arch/cris/kernel/ arch/cris/mm/
|
|
core-y += arch/cris/$(SARCH)/kernel/ arch/cris/$(SARCH)/mm/
|
|
ifdef CONFIG_ETRAX_ARCH_V32
|
|
core-y += arch/cris/$(SARCH)/$(MACH)/
|
|
endif
|
|
drivers-y += arch/cris/$(SARCH)/drivers/
|
|
libs-y += arch/cris/$(SARCH)/lib/ $(LIBGCC)
|
|
|
|
# cris source path
|
|
SRC_ARCH = $(srctree)/arch/cris
|
|
# cris object files path
|
|
OBJ_ARCH = $(objtree)/arch/cris
|
|
|
|
boot := arch/cris/$(SARCH)/boot
|
|
MACHINE := arch/cris/$(SARCH)
|
|
|
|
all: zImage
|
|
|
|
zImage Image: vmlinux
|
|
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
|
|
|
|
archprepare:
|
|
|
|
archclean:
|
|
$(Q)if [ -e arch/cris/$(SARCH)/boot ]; then \
|
|
$(MAKE) $(clean)=arch/cris/$(SARCH)/boot; \
|
|
fi
|
|
|
|
CLEAN_FILES += \
|
|
$(MACHINE)/boot/zImage \
|
|
$(MACHINE)/boot/compressed/decompress.bin \
|
|
$(MACHINE)/boot/compressed/piggy.gz \
|
|
$(MACHINE)/boot/rescue/rescue.bin
|
|
|
|
|
|
# MRPROPER_FILES +=
|
|
|
|
define archhelp
|
|
echo '* zImage - Compressed kernel image (arch/cris/boot/zImage)'
|
|
echo '* Image - Uncompressed kernel image (arch/cris/boot/Image)'
|
|
endef
|