[PARISC] Attempt to clean up parisc/Makefile

Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>

diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile
index 20d327f63d57af2f1557c4464881cb1f58b36924..3ea7ce3a8c576e257215c4fd79db4fef52ee14bd 100644 (file)
--- a/arch/parisc/Makefile
+++ b/arch/parisc/Makefile
@@ -19,26 +19,27 @@
 NM             = sh $(srctree)/arch/parisc/nm
 CHECKFLAGS     += -D__hppa__=1
 
+MACHINE                := $(shell uname -m)
+ifeq ($(MACHINE),parisc*)
+NATIVE         := 1
+endif
+
 ifdef CONFIG_64BIT
-CROSS_COMPILE  := $(shell if [ -x /usr/bin/hppa64-linux-gnu-gcc ]; then \
-                       echo hppa64-linux-gnu-; else echo hppa64-linux-; fi)
 UTS_MACHINE    := parisc64
 CHECKFLAGS     += -D__LP64__=1 -m64
-else
-MACHINE := $(subst 64,,$(shell uname -m))
-ifneq ($(MACHINE),parisc)
-CROSS_COMPILE  := hppa-linux-
-endif
+WIDTH          := 64
+CROSS_COMPILE  := hppa64-linux-gnu-
+else # 32-bit
+WIDTH          :=
 endif
 
-FINAL_LD=$(CROSS_COMPILE)ld --warn-common --warn-section-align 
+# attempt to help out folks who are cross-compiling
+ifeq ($(NATIVE),1)
+CROSS_COMPILE  := hppa$(WIDTH)-linux-
+endif
 
 OBJCOPY_FLAGS =-O binary -R .note -R .comment -S
 
-ifneq ($(call cc-ifversion, -lt, 0303, "bad"),)
-$(error Sorry, GCC v3.3 or above is required.)
-endif
-
 cflags-y       := -pipe
 
 # These flags should be implied by an hppa-linux configuration, but they
@@ -73,31 +74,8 @@ libs-y       += arch/parisc/lib/
 
 drivers-$(CONFIG_OPROFILE)             += arch/parisc/oprofile/
 
-PALO := $(shell if which palo; then : ; \
-       elif [ -x /sbin/palo ]; then echo /sbin/palo; \
-       fi)
-
-palo: vmlinux
-       @if [ -x $PALO ]; then \
-               echo 'ERROR: Please install palo first (apt-get install palo)';\
-               echo 'or build it from source and install it somewhere in your $$PATH';\
-               false; \
-       fi
-       @if [ ! -f ./palo.conf ]; then \
-               cp arch/parisc/defpalo.conf palo.conf; \
-               echo 'A generic palo config file (./palo.conf) has been created for you.'; \
-               echo 'You should check it and re-run "make palo".'; \
-               echo 'WARNING: the "lifimage" file is now placed in this directory by default!'; \
-               false; \
-       fi
-       $(PALO) -f ./palo.conf
-
-oldpalo: vmlinux
-       export TOPDIR=`pwd`; \
-       unset STRIP LDFLAGS CPP CPPFLAGS AFLAGS CFLAGS CC LD; cd ../palo && make lifimage
-
-# Shorthands for known targets not supported by parisc, use palo as default
-Image zImage bzImage: palo
+# Shorthands for known targets not supported by parisc, use vmlinux as default
+Image zImage bzImage: vmlinux
 
 kernel_install: vmlinux
        sh $(src)/arch/parisc/install.sh \
@@ -110,9 +88,17 @@ MRPROPER_FILES      += palo.conf
 
 define archhelp
        @echo  '* vmlinux       - Uncompressed kernel image (./vmlinux)'
-       @echo  '  palo          - Bootable image (./lifimage)'
        @echo  '  install       - Install kernel using'
        @echo  '                  (your) ~/bin/installkernel or'
        @echo  '                  (distribution) /sbin/installkernel or'
        @echo  '                  copy to $$(INSTALL_PATH)'
 endef
+
+# we require gcc 3.3 or above to compile the kernel
+archprepare: checkbin
+checkbin:
+       @if test "$(call cc-version)" -lt "0303"; then \
+               echo -n "Sorry, GCC v3.3 or above is required to build " ; \
+               echo "the kernel." ; \
+               false ; \
+       fi