[xtensa-cvscommit] linux/arch/xtensa/boot/boot-redboot Makefile,1.2,1.3 bootstrap.S,1.4,1.5

[<za...@us...>]

Update of /cvsroot/xtensa/linux/arch/xtensa/boot/boot-redboot
In directory sc8-pr-cvs1:/tmp/cvs-serv23057/boot-redboot

Modified Files:
	Makefile bootstrap.S 
Log Message:
Added missing files in common (from last commit).
Added targets Image and Image.initrd for RedBoot back in again.


Index: Makefile
===================================================================
RCS file: /cvsroot/xtensa/linux/arch/xtensa/boot/boot-redboot/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	2 May 2003 22:53:02 -0000	1.2
--- Makefile	7 May 2003 18:55:20 -0000	1.3
***************
*** 5,21 ****
  #
  
! obj-y	+= ../common/misc.o ../common/memcpy.o ../../lib/hal/libhal.a
  LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
  
! zImage: $(OBJECTS) ../images/vmlinux.gz ../lib/zlib.a $(obj-y) bootstrap.o
  	$(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \
! 		--add-section image=../images/vmlinux.gz \
  		--set-section-flags image=contents,alloc,load,load,data \
  		bootstrap.o $@.tmp
! 	$(LD) -Tboot.ld -o $@.elf $@.tmp $(obj-y) ../lib/zlib.a -L/xtensa-elf/lib $(LIBGCC)
  	$(OBJCOPY) -S -O binary $@.elf ../images/$@.redboot
! 	rm -f $@.tmp $@.elf
  
! zImage.initrd: $(OBJECTS) ../images/vmlinux.gz ../lib/zlib.a $(obj-y) bootstrap.o
  	$(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \
  		--add-section image=../images/vmlinux.gz \
--- 5,51 ----
  #
  
! ZOBJ   := ../common/misc.o ../common/memcpy.o ../../lib/hal/libhal.a
  LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
  
! Image: bootstrap.o $(TOPDIR)/vmlinux
! 	$(OBJCOPY) --strip-all -R .comment -R .xt.insn -O binary \
! 		$(TOPDIR)/vmlinux vmlinux.tmp
  	$(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \
! 		--add-section image=vmlinux.tmp \
  		--set-section-flags image=contents,alloc,load,load,data \
  		bootstrap.o $@.tmp
! 	$(LD) --defsym gunzip=0 -Tboot.ld -o $@.elf $@.tmp 
  	$(OBJCOPY) -S -O binary $@.elf ../images/$@.redboot
! 	rm -f $@.tmp $@.elf vmlinux.tmp
  
! Image.initrd: bootstrap.o $(TOPDIR)/vmlinux
! 	$(OBJCOPY) --strip-all -R .comment -R .xt.insn -O binary \
! 		$(TOPDIR)/vmlinux vmlinux.tmp
! 	$(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \
! 		--add-section image=vmlinux.tmp \
! 		--set-section-flags image=contents,alloc,load,load,data \
! 	        --add-section .initrd=../images/ramdisk \
! 	        --set-section-flags .initrd=contents,alloc,load,load,data \
! 		bootstrap.o $@.tmp
! 	$(LD) --defsym gunzip=0 -Tboot.ld -o $@.elf $@.tmp 
! 	$(OBJCOPY) -S -O binary $@.elf ../images/$@.redboot
! 	rm -f $@.tmp $@.elf vmlinux.tmp
! 
! zImage: bootstrap.o $(TOPDIR)/vmlinux ../lib/zlib.a $(ZOBJ)
! 	$(OBJCOPY) --strip-all -R .comment -R .xt.insn -O binary \
! 		$(TOPDIR)/vmlinux vmlinux.tmp
! 	gzip -vf9 vmlinux.tmp
! 	$(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \
! 		--add-section image=vmlinux.tmp.gz \
! 		--set-section-flags image=contents,alloc,load,load,data \
! 		bootstrap.o $@.tmp
! 	$(LD) -Tboot.ld -o $@.elf $@.tmp $(ZOBJ) ../lib/zlib.a -L/xtensa-elf/lib $(LIBGCC)
! 	$(OBJCOPY) -S -O binary $@.elf ../images/$@.redboot
! 	rm -f $@.tmp $@.elf vmlinux.tmp.gz
! 
! zImage.initrd: bootstrap.o $(TOPDIR)/vmlinux ../lib/zlib.a $(ZOBJ)
! 	$(OBJCOPY) --strip-all -R .comment -R .xt.insn -O binary \
! 		$(TOPDIR)/vmlinux vmlinux.tmp
! 	gzip -vf9 vmlinux.tmp
  	$(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \
  		--add-section image=../images/vmlinux.gz \
***************
*** 24,30 ****
  	        --set-section-flags .initrd=contents,alloc,load,load,data \
  		bootstrap.o $@.tmp
! 	$(LD) -Tboot.ld -o $@.elf $@.tmp $(obj-y) ../lib/zlib.a -L/xtensa-elf/lib
  	$(OBJCOPY) -S -O binary $@.elf ../images/$@.redboot
! 	rm -f $@.tmp $@.elf
  
  USE_STANDARD_AS_RULE=y
--- 54,60 ----
  	        --set-section-flags .initrd=contents,alloc,load,load,data \
  		bootstrap.o $@.tmp
! 	$(LD)  -Tboot.ld -o $@.elf $@.tmp $(ZOBJ) ../lib/zlib.a -L/xtensa-elf/lib $(LIBGCC)
  	$(OBJCOPY) -S -O binary $@.elf ../images/$@.redboot
! 	rm -f $@.tmp $@.elf vmlinux.tmp.gz
  
  USE_STANDARD_AS_RULE=y

Index: bootstrap.S
===================================================================
RCS file: /cvsroot/xtensa/linux/arch/xtensa/boot/boot-redboot/bootstrap.S,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** bootstrap.S	2 May 2003 22:53:02 -0000	1.4
--- bootstrap.S	7 May 2003 18:55:20 -0000	1.5
***************
*** 27,32 ****
  /* Make sure we have enough space for the 'uncompressor' */
  
! #define STACK_SIZE 163840
! #define HEAP_SIZE 524288
  	
  	# a2: Parameter list
--- 27,32 ----
  /* Make sure we have enough space for the 'uncompressor' */
  
! #define STACK_SIZE 32768
! #define HEAP_SIZE (131072*4)
  	
  	# a2: Parameter list
***************
*** 79,83 ****
  	
  	addi	a4, a0, __start - __start_a0
! 	mov.n	a0, a4
  	movi	a4, __start
  	movi	a5, __reloc_end
--- 79,83 ----
  	
  	addi	a4, a0, __start - __start_a0
! 	mov	a0, a4
  	movi	a4, __start
  	movi	a5, __reloc_end
***************
*** 167,173 ****
  	movi	a10, _image_end
  	movi	a7, 0x1000000
! 	sub	a10, a10, a6
  	movi	a9, complen
! 	s32i	a10, a9, 0
  
  	movi	a0, 0
--- 167,173 ----
  	movi	a10, _image_end
  	movi	a7, 0x1000000
! 	sub	a11, a10, a6
  	movi	a9, complen
! 	s32i	a11, a9, 0
  
  	movi	a0, 0
***************
*** 179,186 ****
  
  	.extern gunzip
! 	call4	gunzip
  
  	/* jump to the kernel */
! 	
  #if XCHAL_DCACHE_IS_WRITEBACK
  	dcache_writeback_all a5, a6
--- 179,211 ----
  
  	.extern gunzip
! 	movi	a4, gunzip
! 	beqz	a4, 1f
! 
! 	callx4	a4
! 	j	2f
! 
! 
! 	# a6 destination start
! 	# a7 maximum size of destination
! 	# a8 source start
! 	# a9 ptr to length
! 	# a10 destination end
! 
! 1:
!         l32i    a9, a8, 0
!         l32i    a11, a8, 4
!         s32i    a9, a6, 0
!         s32i    a11, a6, 4
!         l32i    a9, a8, 8
!         l32i    a11, a8, 12
!         s32i    a9, a6, 8
!         s32i    a11, a6, 12
!         addi    a6, a6, 16
!         addi    a8, a8, 16
!         blt     a6, a10, 1b
! 
  
  	/* jump to the kernel */
! 2:	
  #if XCHAL_DCACHE_IS_WRITEBACK
  	dcache_writeback_all a5, a6