Commit 1ea4f4f8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xtensa-next-20121008' of git://github.com/czankel/xtensa-linux 

Pull Xtensa patchset from Chris Zankel:
 "The Xtensa tree has been broken for some time now, and this patchset
  brings it back to life.  It has been part of the linux-next tree for
  some time.

  Most changes are inside the xtensa subdirectory; the other changes
  mostly add another rule to already existing #ifdefs to exclude Xtensa,
  where required.  The only 'common' change is to add two more sections
  ('.xt.prop' and '.xt.lit') to the white list in modpost."

* tag 'xtensa-next-20121008' of git://github.com/czankel/xtensa-linux: (27 commits)
  xtensa: Setup CROSS_COMPILE at the top
  xtensa: drop CONFIG_EMBEDDED_RAMDISK
  xtensa: fix TIOCGSERIAL and TIOCSSERIAL definitions
  xtensa: provide dummy gcc intrinsics
  xtensa: add missing symbol exports
  parport: disable for xtensa arch
  xtensa: rename MISC SR definition to avoid name clashes
  hisax: disable build for big-endian xtensa
  xtensa: fix CODA build
  xtensa: fix parallel make
  xtensa: ISS: drop unused io.c
  xtensa: ISS: exit simulator in case of halt or poweroff
  xtensa: ISS: change keyboard polling rate
  xtensa: ISS: add platform_pcibios_init
  xtensa: ISS: add dummy serial.h for ISS platform
  xtensa: change default platform clock frequency to 10MHz
  xtensa: add ARCH_WANT_OPTIONAL_GPIOLIB to xtensa config
  xtensa: set NO_IOPORT to 'n' by default
  xtensa: adopt generic io routines
  xtensa: fix ioremap
  ...
parents dea77ccd 70cefe76

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -7170,6 +7170,8 @@ F: drivers/char/tlclk.c 


TENSILICA XTENSA PORT (xtensa)

M:	Chris Zankel <chris@zankel.net>

M:	Max Filippov <jcmvbkbc@gmail.com>

L:	linux-xtensa@linux-xtensa.org

S:	Maintained

F:	arch/xtensa/

arch/xtensa/Kconfig

+5 −18
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ config XTENSA 
	select HAVE_GENERIC_HARDIRQS

	select GENERIC_IRQ_SHOW

	select GENERIC_CPU_DEVICES

	select MODULES_USE_ELF_RELA

	select GENERIC_PCI_IOMAP

	select ARCH_WANT_OPTIONAL_GPIOLIB

	help

	  Xtensa processors are 32-bit RISC machines designed by Tensilica

	  primarily for embedded systems.  These processors are both
@@ -35,7 +38,7 @@ config ARCH_HAS_ILOG2_U64 
	def_bool n



config NO_IOPORT

	def_bool y

	def_bool n



config HZ

	int
@@ -142,6 +145,7 @@ config XTENSA_PLATFORM_XT2000 
config XTENSA_PLATFORM_S6105

	bool "S6105"

	select SERIAL_CONSOLE

	select NO_IOPORT



endchoice
@@ -205,23 +209,6 @@ source "drivers/Kconfig" 


source "fs/Kconfig"



menu "Xtensa initrd options"

	depends on BLK_DEV_INITRD



config EMBEDDED_RAMDISK

	bool "Embed root filesystem ramdisk into the kernel"



config EMBEDDED_RAMDISK_IMAGE

	string "Filename of gzipped ramdisk image"

	depends on EMBEDDED_RAMDISK

	default "ramdisk.gz"

	help

	  This is the filename of the ramdisk image to be built into the

	  kernel.  Relative pathnames are relative to arch/xtensa/boot/ramdisk/.

	  The ramdisk image is not part of the kernel distribution; you must

	  provide one yourself.

endmenu



source "arch/xtensa/Kconfig.debug"



source "security/Kconfig"

arch/xtensa/Makefile

+14 −20
Original line number Diff line number Diff line
@@ -21,6 +21,18 @@ variant-$(CONFIG_XTENSA_VARIANT_LINUX_CUSTOM) := custom 
VARIANT = $(variant-y)

export VARIANT



# Test for cross compiling



ifneq ($(VARIANT),)

  COMPILE_ARCH = $(shell uname -m)



  ifneq ($(COMPILE_ARCH), xtensa)

    ifndef CROSS_COMPILE

      CROSS_COMPILE = xtensa_$(VARIANT)-

    endif

  endif

endif



# Platform configuration



platform-$(CONFIG_XTENSA_PLATFORM_XT2000)	:= xt2000
@@ -31,7 +43,7 @@ PLATFORM = $(platform-y) 
export PLATFORM



# temporarily until string.h is fixed

KBUILD_CFLAGS += -ffreestanding

KBUILD_CFLAGS += -ffreestanding -D__linux__



KBUILD_CFLAGS += -pipe -mlongcalls
@@ -48,24 +60,6 @@ endif 


KBUILD_DEFCONFIG := iss_defconfig



# ramdisk/initrd support

# You need a compressed ramdisk image, named ramdisk.gz in

# arch/xtensa/boot/ramdisk



core-$(CONFIG_EMBEDDED_RAMDISK)	+= arch/xtensa/boot/ramdisk/



# Test for cross compiling



ifneq ($(VARIANT),)

  COMPILE_ARCH = $(shell uname -m)



  ifneq ($(COMPILE_ARCH), xtensa)

    ifndef CROSS_COMPILE

      CROSS_COMPILE = xtensa_$(VARIANT)-

    endif

  endif

endif



# Only build variant and/or platform if it includes a Makefile



buildvar := $(shell test -e $(srctree)/arch/xtensa/variants/$(VARIANT)/Makefile && echo arch/xtensa/variants/$(VARIANT)/)
@@ -87,7 +81,7 @@ all: zImage 


bzImage : zImage



zImage zImage.initrd: vmlinux

zImage: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $@



define archhelp

arch/xtensa/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ bootdir-$(CONFIG_XTENSA_PLATFORM_ISS) += boot-elf 
bootdir-$(CONFIG_XTENSA_PLATFORM_XT2000) += boot-redboot boot-elf





zImage zImage.initrd Image Image.initrd: $(bootdir-y)

zImage Image: $(bootdir-y)



$(bootdir-y): $(addprefix $(obj)/,$(subdir-y)) \

	      $(addprefix $(obj)/,$(host-progs))

arch/xtensa/boot/boot-elf/Makefile

+4 −20
Original line number Diff line number Diff line
@@ -20,34 +20,18 @@ boot-y := bootstrap.o 


OBJS		:= $(addprefix $(obj)/,$(boot-y))



Image:	vmlinux $(OBJS) arch/$(ARCH)/boot/boot-elf/boot.lds

vmlinux.tmp: vmlinux

	$(OBJCOPY) --strip-all -R .comment -R .note.gnu.build-id -O binary \

		vmlinux vmlinux.tmp

	$(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \

		--add-section image=vmlinux.tmp \

		--set-section-flags image=contents,alloc,load,load,data \

		$(OBJS) $@.tmp

	$(LD) $(LDFLAGS) $(LDFLAGS_vmlinux) \

		-T arch/$(ARCH)/boot/boot-elf/boot.lds \

		-o arch/$(ARCH)/boot/$@.elf $@.tmp

	rm -f $@.tmp vmlinux.tmp

		$^ $@



Image.initrd:	vmlinux $(OBJS)

	$(OBJCOPY) --strip-all -R .comment -R .note.gnu.build-id -O binary \

		--add-section .initrd=arch/$(ARCH)/boot/ramdisk \

		--set-section-flags .initrd=contents,alloc,load,load,data \

		vmlinux vmlinux.tmp

Image:	vmlinux.tmp $(OBJS) arch/$(ARCH)/boot/boot-elf/boot.lds

	$(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \

		--add-section image=vmlinux.tmp \

		--set-section-flags image=contents,alloc,load,load,data \

		$(OBJS) $@.tmp

	$(LD) $(LDFLAGS) $(LDFLAGS_vmlinux) \

		-T $(srctree)/arch/$(ARCH)/boot/boot-elf/boot.ld \

		-T arch/$(ARCH)/boot/boot-elf/boot.lds \

		-o arch/$(ARCH)/boot/$@.elf $@.tmp

	rm -f $@.tmp vmlinux.tmp





zImage:	Image

zImage.initrd:	Image.initrd

CRA Git | Maintained and supported by SUSTech CRA and CCSE