patch-2.4.6 linux/arch/arm/Makefile
Next file: linux/arch/arm/boot/Makefile
Previous file: linux/arch/alpha/vmlinux.lds.in
Back to the patch index
Back to the overall index
- Lines: 40
- Date:
Wed Jun 27 14:12:04 2001
- Orig file:
v2.4.5/linux/arch/arm/Makefile
- Orig date:
Thu Apr 12 12:20:31 2001
diff -u --recursive --new-file v2.4.5/linux/arch/arm/Makefile linux/arch/arm/Makefile
@@ -26,7 +26,7 @@
apcs-$(CONFIG_CPU_26) :=-mcpu=arm3 -Os
arch-y :=
-arch-$(CONFIG_CPU_32v3) :=-march=armv3m
+arch-$(CONFIG_CPU_32v3) :=-march=armv3
arch-$(CONFIG_CPU_32v4) :=-march=armv4
arch-$(CONFIG_CPU_32v5) :=-march=armv5
@@ -123,6 +123,10 @@
MACHINE = clps711x
endif
+ifeq ($(CONFIG_ARCH_ANAKIN),y)
+MACHINE = anakin
+endif
+
export LIBGCC MACHINE PROCESSOR TEXTADDR GZFLAGS
# Only set INCDIR if its not already defined above
@@ -156,7 +160,7 @@
LIBS := arch/arm/fastfpe/fast-math-emu.o $(LIBS)
endif
-ifeq ($(CONFIG_ARCH_CLPS7500),y)
+ifeq ($(findstring y,$(CONFIG_ARCH_CLPS7500) $(CONFIG_ARCH_L7200)),y)
SUBDIRS += drivers/acorn/char
DRIVERS += drivers/acorn/char/acorn-char.o
endif
@@ -237,8 +241,8 @@
@( \
CFG=$(@:_config=); \
if [ -f arch/arm/def-configs/$$CFG ]; then \
- $(RM) arch/arm/defconfig; \
- cp arch/arm/def-configs/$$CFG arch/arm/defconfig; \
+ [ -f .config ] && $(MV) .config .config.old; \
+ cp arch/arm/def-configs/$$CFG .config; \
echo "*** Default configuration for $$CFG installed"; \
echo "*** Next, you may run 'make oldconfig'"; \
else \
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)