Commit 989b0b93 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6: (29 commits)
  [XTENSA] Allow debugger to modify the WINDOWBASE register.
  [XTENSA] Fix makefile to work with binutils-2.18.
  [XTENSA] Fix register corruption for certain processor configurations
  [XTENSA] Fix cache flush macro for D$/I$ aliasing/non-aliasing
  [XTENSA] Exclude thread-global registers from the xtregs structures.
  [XTENSA] Add support for the sa_restorer function
  [XTENSA] Add support for configurable registers and coprocessors
  [XTENSA] Clean up stat structs.
  [XTENSA] Use preprocessor to generate the linker script for the ELF boot image
  [XTENSA] Add missing RELOCATE_ENTRY for debug vector
  [XTENSA] Add volatile keyword to asm statements accessing counter registers
  [XTENSA] Remove unused code
  [XTENSA] Fix modules for non-exec processor configurations
  [XTENSA] Add missing cast in elf.h ELF_CORE_COPY_REGS()
  [XTENSA] Fix comments regarding the number of frames to save
  [XTENSA] Add missing a2 register restore in register spill routine
  [XTENSA] adjust boot linker script start addresses
  [XTENSA] Remove oldmask from sigcontext and fix register flush
  [XTENSA] Clean up elf-gregset.
  [XTENSA] Fix icache flush for cache aliasing
  ...
parents e03f1a84 42086cec

arch/xtensa/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) 
head-y		:= arch/xtensa/kernel/head.o

core-y		+= arch/xtensa/kernel/ arch/xtensa/mm/

ifneq ($(PLATFORM),)

core-y		+= arch/xtensa/platform-$(PLATFORM)/

core-y		+= arch/xtensa/platforms/$(PLATFORM)/

endif

libs-y		+= arch/xtensa/lib/ $(LIBGCC)

arch/xtensa/boot/boot-elf/Makefile

+5 −4
Original line number Diff line number Diff line
@@ -14,25 +14,26 @@ OBJCOPY_ARGS := -O elf32-xtensa-le 
endif



export OBJCOPY_ARGS

export CPPFLAGS_boot.lds += -P -C



boot-y		:= bootstrap.o



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



Image:	vmlinux $(OBJS)

	$(OBJCOPY) --strip-all -R .comment -R .xt.insn -O binary \

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

	$(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 $(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



Image.initrd:	vmlinux $(OBJS)

	$(OBJCOPY) --strip-all -R .comment -R .xt.insn -O binary \

	$(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

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

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

OUTPUT_ARCH(xtensa)

ENTRY(_ResetVector)



SECTIONS

{
@@ -61,7 +63,7 @@ SECTIONS 
	_end = .;

	_param_start = .;



	.ResetVector.text 0xfe000020 :

	.ResetVector.text XCHAL_RESET_VECTOR_VADDR :

	{

		*(.ResetVector.text)

	}

arch/xtensa/boot/boot-redboot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ LIBS := arch/xtensa/boot/lib/lib.a arch/xtensa/lib/lib.a 
LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)



zImage: vmlinux $(OBJS) $(LIBS)

	$(OBJCOPY) --strip-all -R .comment -R .xt.insn -O binary \

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

		vmlinux vmlinux.tmp

	gzip -vf9 vmlinux.tmp

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

arch/xtensa/boot/boot-redboot/boot.ld

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ OUTPUT_ARCH(xtensa) 


SECTIONS

{

	.start 0xD0200000 : { *(.start) }

	.start 0xD1000000 : { *(.start) }



	.text :

	{

CRA Git | Maintained and supported by SUSTech CRA and CCSE