Commit 52fefcec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
  xtensa: Update platform files to reflect new location of the header files.
  xtensa: switch to packed struct unaligned access implementation
  xtensa: Add xt2000 support files.
  xtensa: move headers files to arch/xtensa/include
  xtensa: use the new byteorder headers
parents a0e280e0 5fee325e

arch/xtensa/Makefile

+9 −19
Original line number Diff line number Diff line
@@ -33,6 +33,15 @@ KBUILD_CFLAGS += -ffreestanding 


KBUILD_CFLAGS += -pipe -mlongcalls



vardirs := $(patsubst %,arch/xtensa/variants/%/,$(variant-y))

plfdirs := $(patsubst %,arch/xtensa/platforms/%/,$(platform-y))



ifeq ($(KBUILD_SRC),)

KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(vardirs) $(plfdirs))

else

KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(vardirs) $(plfdirs))

endif



KBUILD_DEFCONFIG := iss_defconfig



# ramdisk/initrd support
@@ -66,21 +75,6 @@ libs-y += arch/xtensa/lib/ $(LIBGCC) 


boot		:= arch/xtensa/boot



archinc		:= include/asm-xtensa



archprepare: $(archinc)/.platform



# Update processor variant and platform symlinks if something which affects

# them changed.



$(archinc)/.platform: $(wildcard include/config/arch/*.h) include/config/auto.conf

	@echo '  SYMLINK $(archinc)/variant -> $(archinc)/variant-$(VARIANT)'

	$(Q)mkdir -p $(archinc)

	$(Q)ln -fsn $(srctree)/$(archinc)/variant-$(VARIANT) $(archinc)/variant

	@echo '  SYMLINK $(archinc)/platform -> $(archinc)/platform-$(PLATFORM)'

	$(Q)ln -fsn $(srctree)/$(archinc)/platform-$(PLATFORM) $(archinc)/platform

	@touch $@





all: zImage
@@ -89,10 +83,6 @@ bzImage : zImage 
zImage zImage.initrd: vmlinux

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



CLEAN_FILES	+= arch/xtensa/vmlinux.lds                      \

		   $(archinc)/platform $(archinc)/variant	\

		   $(archinc)/.platform



define archhelp

  @echo '* zImage      - Compressed kernel image (arch/xtensa/boot/images/zImage.*)'

endef

arch/xtensa/boot/boot-elf/boot.lds.S

+1 −1
Original line number Diff line number Diff line 
#include <asm/variant/core.h>

#include <variant/core.h>

OUTPUT_ARCH(xtensa)

ENTRY(_ResetVector)

arch/xtensa/boot/boot-redboot/bootstrap.S

+1 −1
Original line number Diff line number Diff line 
#include <asm/variant/core.h>

#include <variant/core.h>

#include <asm/regs.h>

#include <asm/asmmacro.h>

#include <asm/cacheasm.h>

include/asm-xtensa/asmmacro.h→arch/xtensa/include/asm/asmmacro.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#ifndef _XTENSA_ASMMACRO_H

#define _XTENSA_ASMMACRO_H



#include <asm/variant/core.h>

#include <variant/core.h>



/*

 * Some little helpers for loops. Use zero-overhead-loops

CRA Git | Maintained and supported by SUSTech CRA and CCSE