Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfa76f02 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of hera.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6 

* 'master' of hera.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6: (29 commits)
  [PARISC] fix uninitialized variable warning in asm/rtc.h
  [PARISC] Port checkstack.pl to parisc
  [PARISC] Make palo target work when $obj != $src
  [PARISC] Zap unused variable warnings in pci.c
  [PARISC] Fix tests in palo target
  [PARISC] Fix palo target
  [PARISC] Restore palo target
  [PARISC] Attempt to clean up parisc/Makefile
  [PARISC] Fix infinite loop in /proc/iomem
  [PARISC] Quiet sysfs_create_link __must_check warnings in pdc_stable
  [PARISC] Squelch pci_enable_device __must_check warning in superio
  [PARISC] Kill off broken irqstack code
  [PARISC] Remove hardcoded uses of PAGE_SIZE
  [PARISC] Clean up pointless ASM_PAGE_SIZE_DIV use
  [PARISC] Kill off the last vestiges of ASM_PAGE_SIZE
  [PARISC] Kill off ASM_PAGE_SIZE use
  [PARISC] Beautify parisc vmlinux.lds.S
  [PARISC] Clean up a resource_size_t warning in sba_iommu
  [PARISC] Kill incorrect cast warning in unwinder
  [PARISC] Kill zone_to_nid printk warning
  ...

Fixed trivial conflict in include/asm-parisc/tlbflush.h manually
parents 093faa1d 7210c678

arch/parisc/Makefile

+34 −24
Original line number Diff line number Diff line
@@ -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
@@ -69,7 +70,7 @@ kernel-y := mm/ kernel/ math-emu/ kernel/init_task.o 
kernel-$(CONFIG_HPUX)		+= hpux/



core-y	+= $(addprefix arch/parisc/, $(kernel-y))

libs-y	+= arch/parisc/lib/ `$(CC) -print-libgcc-file-name`

libs-y	+= arch/parisc/lib/



drivers-$(CONFIG_OPROFILE)		+= arch/parisc/oprofile/
@@ -77,27 +78,27 @@ PALO := $(shell if which palo; then : ; \ 
	elif [ -x /sbin/palo ]; then echo /sbin/palo; \

	fi)



PALOCONF := $(shell if [ -f $(src)/palo.conf ]; then echo $(src)/palo.conf; \

	else echo $(obj)/palo.conf; \

	fi)



palo: vmlinux

	@if [ -x $PALO ]; then \

	@if test ! -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.'; \

	@if test ! -f "$(PALOCONF)"; then \

		cp $(src)/arch/parisc/defpalo.conf $(obj)/palo.conf; \

		echo 'A generic palo config file ($(obj)/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

	$(PALO) -f $(PALOCONF)



# 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 \
@@ -116,3 +117,12 @@ define archhelp 
	@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

arch/parisc/configs/712_defconfig

+230 −216

File changed.

Preview size limit exceeded, changes collapsed.

arch/parisc/configs/a500_defconfig

+322 −324

File changed.

Preview size limit exceeded, changes collapsed.

arch/parisc/configs/b180_defconfig

+261 −213

File changed.

Preview size limit exceeded, changes collapsed.

arch/parisc/configs/c3000_defconfig

+308 −274

File changed.

Preview size limit exceeded, changes collapsed.