mirror of
https://github.com/torvalds/linux.git
synced 2024-11-01 09:41:44 +00:00
66d857b08b
There is a lot of common code that could be shared between the m68k and m68knommu arch branches. It makes sense to merge the two branches into a single directory structure so that we can more easily share that common code. This is a brute force merge, based on a script from Stephen King <sfking@fdwdc.com>, which was originally written by Arnd Bergmann <arnd@arndb.de>. > The script was inspired by the script Sam Ravnborg used to merge the > includes from m68knommu. For those files common to both arches but > differing in content, the m68k version of the file is renamed to > <file>_mm.<ext> and the m68knommu version of the file is moved into the > corresponding m68k directory and renamed <file>_no.<ext> and a small > wrapper file <file>.<ext> is used to select between the two version. Files > that are common to both but don't differ are removed from the m68knommu > tree and files and directories that are unique to the m68knommu tree are > moved to the m68k tree. Finally, the arch/m68knommu tree is removed. > > To select between the the versions of the files, the wrapper uses > > #ifdef CONFIG_MMU > #include <file>_mm.<ext> > #else > #include <file>_no.<ext> > #endif On top of this file merge I have done a simplistic merge of m68k and m68knommu Kconfig, which primarily attempts to keep existing options and menus in place. Other than a handful of options being moved it produces identical .config outputs on m68k and m68knommu targets I tested it on. With this in place there is now quite a bit of scope for merge cleanups in future patches. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
122 lines
3.1 KiB
Plaintext
122 lines
3.1 KiB
Plaintext
#
|
|
# m68k/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.
|
|
#
|
|
# Copyright (C) 1994 by Hamish Macdonald
|
|
#
|
|
|
|
# override top level makefile
|
|
AS += -m68020
|
|
LDFLAGS := -m m68kelf
|
|
KBUILD_LDFLAGS_MODULE += -T $(srctree)/arch/m68k/kernel/module.lds
|
|
ifneq ($(SUBARCH),$(ARCH))
|
|
ifeq ($(CROSS_COMPILE),)
|
|
CROSS_COMPILE := $(call cc-cross-prefix, \
|
|
m68k-linux-gnu- m68k-linux- m68k-unknown-linux-gnu-)
|
|
endif
|
|
endif
|
|
|
|
ifdef CONFIG_SUN3
|
|
LDFLAGS_vmlinux = -N
|
|
endif
|
|
|
|
CHECKFLAGS += -D__mc68000__
|
|
|
|
# without -fno-strength-reduce the 53c7xx.c driver fails ;-(
|
|
KBUILD_CFLAGS += -pipe -fno-strength-reduce -ffixed-a2
|
|
|
|
# enable processor switch if compiled only for a single cpu
|
|
ifndef CONFIG_M68020
|
|
ifndef CONFIG_M68030
|
|
|
|
ifndef CONFIG_M68060
|
|
KBUILD_CFLAGS += -m68040
|
|
endif
|
|
|
|
ifndef CONFIG_M68040
|
|
KBUILD_CFLAGS += -m68060
|
|
endif
|
|
|
|
endif
|
|
endif
|
|
|
|
ifdef CONFIG_KGDB
|
|
# If configured for kgdb support, include debugging infos and keep the
|
|
# frame pointer
|
|
KBUILD_CFLAGS := $(subst -fomit-frame-pointer,,$(KBUILD_CFLAGS)) -g
|
|
endif
|
|
|
|
ifndef CONFIG_SUN3
|
|
head-y := arch/m68k/kernel/head.o
|
|
else
|
|
head-y := arch/m68k/kernel/sun3-head.o
|
|
endif
|
|
|
|
core-y += arch/m68k/kernel/ arch/m68k/mm/
|
|
libs-y += arch/m68k/lib/
|
|
|
|
core-$(CONFIG_Q40) += arch/m68k/q40/
|
|
core-$(CONFIG_AMIGA) += arch/m68k/amiga/
|
|
core-$(CONFIG_ATARI) += arch/m68k/atari/
|
|
core-$(CONFIG_MAC) += arch/m68k/mac/
|
|
core-$(CONFIG_HP300) += arch/m68k/hp300/
|
|
core-$(CONFIG_APOLLO) += arch/m68k/apollo/
|
|
core-$(CONFIG_MVME147) += arch/m68k/mvme147/
|
|
core-$(CONFIG_MVME16x) += arch/m68k/mvme16x/
|
|
core-$(CONFIG_BVME6000) += arch/m68k/bvme6000/
|
|
core-$(CONFIG_SUN3X) += arch/m68k/sun3x/ arch/m68k/sun3/
|
|
core-$(CONFIG_SUN3) += arch/m68k/sun3/ arch/m68k/sun3/prom/
|
|
core-$(CONFIG_NATFEAT) += arch/m68k/emu/
|
|
core-$(CONFIG_M68040) += arch/m68k/fpsp040/
|
|
core-$(CONFIG_M68060) += arch/m68k/ifpsp060/
|
|
core-$(CONFIG_M68KFPU_EMU) += arch/m68k/math-emu/
|
|
|
|
all: zImage
|
|
|
|
lilo: vmlinux
|
|
if [ -f $(INSTALL_PATH)/vmlinux ]; then mv -f $(INSTALL_PATH)/vmlinux $(INSTALL_PATH)/vmlinux.old; fi
|
|
if [ -f $(INSTALL_PATH)/System.map ]; then mv -f $(INSTALL_PATH)/System.map $(INSTALL_PATH)/System.old; fi
|
|
cat vmlinux > $(INSTALL_PATH)/vmlinux
|
|
cp System.map $(INSTALL_PATH)/System.map
|
|
if [ -x /sbin/lilo ]; then /sbin/lilo; else /etc/lilo/install; fi
|
|
|
|
zImage compressed: vmlinux.gz
|
|
|
|
vmlinux.gz: vmlinux
|
|
|
|
ifndef CONFIG_KGDB
|
|
cp vmlinux vmlinux.tmp
|
|
$(STRIP) vmlinux.tmp
|
|
gzip -9c vmlinux.tmp >vmlinux.gz
|
|
rm vmlinux.tmp
|
|
else
|
|
gzip -9c vmlinux >vmlinux.gz
|
|
endif
|
|
|
|
bzImage: vmlinux.bz2
|
|
|
|
vmlinux.bz2: vmlinux
|
|
|
|
ifndef CONFIG_KGDB
|
|
cp vmlinux vmlinux.tmp
|
|
$(STRIP) vmlinux.tmp
|
|
bzip2 -1c vmlinux.tmp >vmlinux.bz2
|
|
rm vmlinux.tmp
|
|
else
|
|
bzip2 -1c vmlinux >vmlinux.bz2
|
|
endif
|
|
|
|
archclean:
|
|
rm -f vmlinux.gz vmlinux.bz2
|
|
|
|
install:
|
|
sh $(srctree)/arch/m68k/install.sh $(KERNELRELEASE) vmlinux.gz System.map "$(INSTALL_PATH)"
|