patch-2.0.4 linux/arch/ppc/Makefile

Next file: linux/arch/ppc/boot/Makefile
Previous file: linux/arch/alpha/defconfig
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.0.3/linux/arch/ppc/Makefile linux/arch/ppc/Makefile
@@ -15,58 +15,54 @@
 #
 
 # PowerPC (cross) tools
-AS		= as.ppc
-ASFLAGS		=
-LD		= ld.ppc
-#LINKFLAGS	= -T arch/ppc/ld.script -Ttext 0x90000000 -Map vmlinux.map
-LINKFLAGS	= -T arch/ppc/ld.script -Ttext 0x90000000
+SUFFIX		=.ppc
+#AS		= /u/cort/ppc/gcc/ppc-linux-elf/bin/as
+AS		= as$(SUFFIX)
+ASFLAGS		= 
+#LD		= /u/cort/ppc/gcc/ppc-linux-elf/bin/ld
+LD		= ld$(SUFFIX)
+LINKFLAGS	= -T arch/ppc/ld.script -Ttext 0x90000000 
 HOSTCC		= gcc
-CC		= cc.ppc
-CFLAGS		= -D__KERNEL__ -I$(TOPDIR)/include \
-		-Wall -Wstrict-prototypes \
-		-msoft-float \
+#CC		= /u/cort/ppc/gcc/bin/gcc
+CC		= gcc$(SUFFIX)
+#CC 		= /u/cort/ppc/gcc/bin/gcc.ppc
+CFLAGS		= -D__KERNEL__ -I$(TOPDIR)/include -D__powerpc__ \
+		-Wstrict-prototypes \
 		-fomit-frame-pointer \
 		-fno-builtin \
 		-finhibit-size-directive \
-		-fsigned-char \
-		-O2
+		-O2 -fsigned-char
 CPP		= $(CC) -E $(CFLAGS)
-AR		= ar.ppc
-RANLIB		= ranlib.ppc
-STRIP		= strip.ppc
-NM		= nm.ppc
+#AR		= /u/cort/ppc/gcc/ppc-linux-elf/bin/ar
+AR		= ar$(SUFFIX)
+#RANLIB		= /u/cort/ppc/gcc/ppc-linux-elf/bin/ranlib
+RANLIB		= ar$(SUFFIX)
+#STRIP		= /u/cort/ppc/gcc/ppc-linux-elf/bin/strip
+STRIP		= strip$(SUFFIX)
+#NM		= /u/cort/ppc/gcc/ppc-linux-elf/bin/nm
+NM		= nm$(SUFFIX)
 
 #
-# Set these to indicate how to link it..
+# NFS_ROOT_NAME specifies the default name of the directory to mount
+# as root via NFS, if the kernel does not get the "root=" option from
+# the boot loader. The "%s" will be replaced by the IP-number of the
+# local system.
 #
-# -zmagic:   
-#
-# ZLINKFLAGS   = -Ttext 0x1000
-# LINKFLAGS    = -Ttext 0x100000
-#
-# -qmagic (we need to remove the 32 byte header for bootup purposes)
-#
-## ZLINKFLAGS =-qmagic -Ttext 0xfe0
-## LINKFLAGS =-qmagic -Ttext 0xfffe0
-## CFLAGS := $(CFLAGS) -pipe
-
-## ifdef CONFIG_M486
-## CFLAGS := $(CFLAGS) -m486
-## else
-## ifdef CONFIG_M586
-## CFLAGS := $(CFLAGS) -mpentium
-## else
-## CFLAGS := $(CFLAGS) -m386
-## endif
-## endif
+NFS_ROOT = -DNFS_ROOT="\"/joplin/ppc/root/\""
 
 HEAD := arch/ppc/kernel/head.o
 
 ARCH_SUBDIRS = arch/ppc/kernel arch/ppc/mm arch/ppc/lib
 SUBDIRS := $(SUBDIRS) $(ARCH_SUBDIRS)
 ARCHIVES := arch/ppc/kernel/kernel.o arch/ppc/mm/mm.o arch/ppc/lib/lib.o $(ARCHIVES)
-NO_RD_ARCHIVES := arch/ppc/kernel/no_ramdisk.o $(ARCHIVES)
-ARCHIVES := arch/ppc/kernel/ramdisk.o $(ARCHIVES)
+
+
+MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
+
+tImage: vmlinux
+	@$(MAKEBOOT) tImage
+
+
 
 arch/ppc/kernel: dummy
 	$(MAKE) linuxsubdirs SUBDIRS=arch/ppc/kernel
@@ -77,41 +73,12 @@
 arch/ppc/lib: dummy
 	$(MAKE) linuxsubdirs SUBDIRS=arch/ppc/lib
 
-MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
-
-vmlinux.no_ramdisk: $(CONFIGURATION) init/main.o init/version.o linuxsubdirs
-	$(LD) $(LINKFLAGS) $(HEAD) init/main.o init/version.o \
-		$(NO_RD_ARCHIVES) \
-		$(FILESYSTEMS) \
-		$(DRIVERS) \
-		$(LIBS) -o vmlinux.no_ramdisk
-
-## 
-zImage: vmlinux
-	@$(MAKEBOOT) zImage
-
-tImage: vmlinux
-	@$(MAKEBOOT) tImage
-
-bImage: vmlinux.no_ramdisk
-	@$(MAKEBOOT) bImage
-
-bdisk: vmlinux.no_ramdisk
-	@$(MAKEBOOT) bdisk
-
-## compressed: zImage
-## 
-## zlilo: vmlinux
-## 	@$(MAKEBOOT) zlilo
-## 
-zdisk: vmlinux
-	@$(MAKEBOOT) zdisk
- 
-## install: vmlinux
-## 	@$(MAKEBOOT) install
 
 archclean:
-	@$(MAKEBOOT) clean
+	/bin/rm -f arch/ppc/*/*.o #arch/ppc/kernel/mk_defs arch/ppc/kernel/ppc_defs.h
+	/bin/rm -f arch/ppc/*~ arch/ppc/*/*~ include/asm-ppc/*~ arch/ppc/boot/mkboot
 
 archdep:
-#	@$(MAKEBOOT) dep
+
+corttags :
+	etags arch/ppc/*/*.c include/asm-ppc/* drivers/*/*.c net/*.c */*.c

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov