[kernel] r5048 - dists/trunk/utils/kernel-package/10/kernel/ruleset/arches

[Sven Luther]

Author: luther
Date: Mon Dec 19 23:14:15 2005
New Revision: 5048

Added:
   dists/trunk/utils/kernel-package/10/kernel/ruleset/arches/powerpc.mk
      - copied, changed from r5035, dists/trunk/utils/kernel-package/10/kernel/ruleset/arches/ppc.mk
Log:
Added the new powerpc.mk file.


Copied: dists/trunk/utils/kernel-package/10/kernel/ruleset/arches/powerpc.mk (from r5035, dists/trunk/utils/kernel-package/10/kernel/ruleset/arches/ppc.mk)
==============================================================================
--- dists/trunk/utils/kernel-package/10/kernel/ruleset/arches/ppc.mk	(original)
+++ dists/trunk/utils/kernel-package/10/kernel/ruleset/arches/powerpc.mk	Mon Dec 19 23:14:15 2005
@@ -30,42 +30,47 @@
 ##
 ###############################################################################
 
+# prpmc and mbx are not guessed automatically yet.
 ifeq ($(DEB_BUILD_ARCH),powerpc)
 # This is only meaningful when building on a PowerPC
   ifeq ($(GUESS_SUBARCH),)
-    GUESS_SUBARCH:=$(shell awk '/machine/ { print $$3}' /proc/cpuinfo)
-    ifneq (,$(findstring Power,$(GUESS_SUBARCH)))
-      GUESS_SUBARCH:=pmac
+    GUESS_MACHINE:=$(shell awk '/machine/ { print $$3}' /proc/cpuinfo)
+    GUESS_CPU:=$(shell awk '/cpu/ { print $$3}' /proc/cpuinfo)
+    GUESS_GENERATION:=$(shell awk '/generation/ { print $$3}' /proc/cpuinfo)
+    ifneq (,$(findstring POWER,$(GUESS_CPU)))
+      GUESS_SUBARCH:=powerpc64
     else
-      # At the request of Colin Watson, changed from find string iMac.
-      # Any powerpc system that would contain  Mac in /proc/cpuinfo is a
-      # PowerMac system, according to arch/ppc/platforms/* in the kernel source
-      ifneq (,$(findstring Mac,$(GUESS_SUBARCH)))
-        GUESS_SUBARCH:=pmac
+      ifneq (,$(findstring PPC970,$(GUESS_CPU)))
+        GUESS_SUBARCH:=powerpc64
+      else
+        ifneq (,$(findstring NuBus,$(GUESS_GENERATION)))
+          GUESS_SUBARCH:=nubus
+        else
+          ifneq (,$(findstring Amiga,$(GUESS_MACHINE)))
+            GUESS_SUBARCH:=apus
+          endif
+	endif
       endif
     endif
+    ifeq ($(GUESS_SUBARCH),)
+      GUESS_SUBARCH:=powerpc
+    endif
   else
-    GUESS_SUBARCH:=pmac
+    GUESS_SUBARCH:=powerpc
   endif
-  # Well NuBus powermacs are not pmac subarchs, but nubus ones.
-  #ifeq (,$(shell grep NuBus /proc/cpuinfo))
-  #  GUESS_SUBARCH:=nubus
-  #endif
 endif
 
-ifeq (,$(findstring $(KPKG_SUBARCH),apus prpmc chrp mbx pmac prep Amiga APUs CHRP MBX PReP chrp-rs6k nubus powerpc powerpc64 ))
+ifeq (,$(findstring $(KPKG_SUBARCH),apus Amiga APUs nubus powerpc powerpc32 powerpc64 prpmc mbx MBX))
   KPKG_SUBARCH:=$(GUESS_SUBARCH)
 endif
 
-KERNEL_ARCH:=ppc
+KERNEL_ARCH:=powerpc
 
-ifneq (,$(findstring $(KPKG_SUBARCH), powerpc powerpc64))
+ifneq (,$(findstring $(KPKG_SUBARCH), powerpc powerpc32 powerpc64))
   ifneq (,$(findstring $(KPKG_SUBARCH), powerpc64))
-    KERNEL_ARCH:=ppc64
     target := vmlinux
   endif
-  ifneq (,$(findstring $(KPKG_SUBARCH), powerpc))
-    KERNEL_ARCH:=ppc
+  ifneq (,$(findstring $(KPKG_SUBARCH), powerpc powerpc32))
     NEED_IMAGE_POST_PROCESSING = YES
     IMAGE_POST_PROCESS_TARGET := mkvmlinuz_support_install
     IMAGE_POST_PROCESS_DIR    := arch/ppc/boot
@@ -81,6 +86,7 @@
 
 ifneq (,$(findstring $(KPKG_SUBARCH),APUs apus Amiga))
   KPKG_SUBARCH:=apus
+  KERNEL_ARCH:=ppc
   loader := NoLoader
   kimage := vmapus.gz
   target = zImage
@@ -93,40 +99,19 @@
   DEBCONFIG = $(CONFDIR)/config.apus
 endif
 
-ifneq (,$(findstring $(KPKG_SUBARCH),chrp-rs6k))
-  KPKG_SUBARCH:=chrp-rs6k
-  loaderdep=quik
-  loader=quik
-  loaderdoc=QuikDefault
-  kimage := zImage
-  target = $(kimage)
-  kimagesrc = $(shell if [ -d arch/$(KERNEL_ARCH)/chrpboot ]; then \
-	echo arch/$(KERNEL_ARCH)/chrpboot/$(kimage) ; else \
-	echo arch/$(KERNEL_ARCH)/boot/images/$(kimage).chrp-rs6k ; fi)
-  kimagedest = $(INT_IMAGE_DESTDIR)/vmlinuz-$(version)
-  kelfimagesrc = vmlinux
-  kelfimagedest = $(INT_IMAGE_DESTDIR)/vmlinux-$(version)
-  DEBCONFIG = $(CONFDIR)/config.chrp
-endif
-
-ifneq (,$(findstring $(KPKG_SUBARCH),CHRP chrp))
-  KPKG_SUBARCH:=chrp
-  loaderdep=quik
-  loader=quik
-  loaderdoc=QuikDefault
-  kimage := zImage
-  target = $(kimage)
-  kimagesrc = $(shell if [ -d arch/$(KERNEL_ARCH)/chrpboot ]; then \
-       echo arch/$(KERNEL_ARCH)/chrpboot/$(kimage) ; else \
-       echo arch/$(KERNEL_ARCH)/boot/images/$(kimage).chrp ; fi)
+ifneq (,$(findstring $(KPKG_SUBARCH), NuBuS nubus))
+  KPKG_SUBARCH := nubus
+  KERNEL_ARCH:=ppc
+  target := zImage
+  loader= NoLoader
+  kimagesrc = arch/$(KERNEL_ARCH)/appleboot/Mach\ Kernel
+  kimage := vmlinux
   kimagedest = $(INT_IMAGE_DESTDIR)/vmlinuz-$(version)
-  kelfimagesrc = vmlinux
-  kelfimagedest = $(INT_IMAGE_DESTDIR)/vmlinux-$(version)
-  DEBCONFIG = $(CONFDIR)/config.chrp
 endif
 
 ifneq (,$(findstring $(KPKG_SUBARCH),PRPMC prpmc))
   KPKG_SUBARCH:=prpmc
+  KERNEL_ARCH:=ppc
   loader := NoLoader
   kimage := zImage
   target = $(kimage)
@@ -138,6 +123,7 @@
 
 ifneq (,$(findstring $(KPKG_SUBARCH),MBX mbx))
   KPKG_SUBARCH:=mbx
+  KERNEL_ARCH:=ppc
   loader := NoLoader
   kimage := zImage
   target = $(kimage)
@@ -150,58 +136,6 @@
   DEBCONFIG = $(CONFDIR)/config.mbx
 endif
 
-ifneq (,$(findstring $(KPKG_SUBARCH),pmac))
-  KPKG_SUBARCH:=pmac
-  target := zImage
-  ifeq ($(DEB_BUILD_ARCH),powerpc)
-    # This is only meaningful when building on a PowerPC
-    ifneq (,$(shell grep NewWorld /proc/cpuinfo))
-      loaderdep=yaboot
-      loader=yaboot
-      #loaderdoc=
-    else
-      loaderdep=quik
-      loader=quik
-      loaderdoc=QuikDefault
-    endif
-  else
-    loaderdep=yaboot
-    loader=yaboot
-  endif
-  kimagesrc = vmlinux
-  kimage := vmlinux
-  kimagedest = $(INT_IMAGE_DESTDIR)/vmlinux-$(version)
-  HAVE_COFF_IMAGE = YES
-  coffsrc = $(shell if [ -d arch/$(KERNEL_ARCH)/coffboot ]; then \
-       echo arch/$(KERNEL_ARCH)/coffboot/$(kimage).coff ; else \
-       echo arch/$(KERNEL_ARCH)/boot/images/$(kimage).coff ; fi)
-  coffdest=$(INT_IMAGE_DESTDIR)/vmlinux.coff-$(version)
-  DEBCONFIG = $(CONFDIR)/config.pmac
-endif
-
-ifneq (,$(findstring $(KPKG_SUBARCH),PReP prep))
-  KPKG_SUBARCH:=prep
-  loader := NoLoader
-  kimage := zImage
-  target = $(kimage)
-  kimagesrc = $(shell if [ -d arch/$(KERNEL_ARCH)/boot/images ]; then \
-       echo arch/$(KERNEL_ARCH)/boot/images/$(kimage).prep ; else \
-       echo arch/$(KERNEL_ARCH)/boot/$(kimage) ; fi)
-  kimagedest = $(INT_IMAGE_DESTDIR)/vmlinuz-$(version)
-  kelfimagesrc = vmlinux
-  kelfimagedest = $(INT_IMAGE_DESTDIR)/vmlinux-$(version)
-  DEBCONFIG = $(CONFDIR)/config.prep
-endif
-
-ifneq (,$(findstring $(KPKG_SUBARCH), NuBuS nubus))
-  KPKG_SUBARCH := nubus
-  target := zImage
-  loader= NoLoader
-  kimagesrc = arch/$(KERNEL_ARCH)/appleboot/Mach\ Kernel
-  kimage := vmlinux
-  kimagedest = $(INT_IMAGE_DESTDIR)/vmlinuz-$(version)
-endif
-
 #Local variables:
 #mode: makefile
 #End: