Commit 71373068 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Merge the sh64 zImage bits. 



Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 55183e9b

arch/sh/boot/compressed/Makefile

+4 −42
Original line number Diff line number Diff line 
#

# linux/arch/sh/boot/compressed/Makefile

#

# create a compressed vmlinux image from the original vmlinux

#



targets		:= vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o

EXTRA_AFLAGS	:= -traditional



OBJECTS = $(obj)/head.o $(obj)/misc.o



ifdef CONFIG_SH_STANDARD_BIOS

OBJECTS += $(obj)/../../kernel/sh_bios.o

ifeq ($(CONFIG_SUPERH32),y)

include ${srctree}/arch/sh/boot/compressed/Makefile_32

else

include ${srctree}/arch/sh/boot/compressed/Makefile_64

endif
 


#

# IMAGE_OFFSET is the load offset of the compression loader

#

IMAGE_OFFSET	:= $(shell /bin/bash -c 'printf "0x%08x" \

		     $$[$(CONFIG_PAGE_OFFSET)  + \

			$(CONFIG_MEMORY_START) + \

			$(CONFIG_BOOT_LINK_OFFSET)]')



LIBGCC	:= $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)



LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -e startup -T $(obj)/../../kernel/vmlinux.lds





$(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o $(LIBGCC) FORCE

	$(call if_changed,ld)

	@:



$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)



$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE

	$(call if_changed,gzip)



LDFLAGS_piggy.o := -r --format binary --oformat elf32-sh-linux -T

OBJCOPYFLAGS += -R .empty_zero_page



$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE

	$(call if_changed,ld)

arch/sh/boot/compressed/Makefile_32

0 → 100644
+43 −0
Original line number Diff line number Diff line 
#

# linux/arch/sh/boot/compressed/Makefile

#

# create a compressed vmlinux image from the original vmlinux

#



targets		:= vmlinux vmlinux.bin vmlinux.bin.gz \

		   head_32.o misc_32.o piggy.o

EXTRA_AFLAGS	:= -traditional



OBJECTS = $(obj)/head_32.o $(obj)/misc_32.o



ifdef CONFIG_SH_STANDARD_BIOS

OBJECTS += $(obj)/../../kernel/sh_bios.o

endif



#

# IMAGE_OFFSET is the load offset of the compression loader

#

IMAGE_OFFSET	:= $(shell /bin/bash -c 'printf "0x%08x" \

		     $$[$(CONFIG_PAGE_OFFSET)  + \

			$(CONFIG_MEMORY_START) + \

			$(CONFIG_BOOT_LINK_OFFSET)]')



LIBGCC	:= $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)



LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -e startup -T $(obj)/../../kernel/vmlinux.lds



$(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o $(LIBGCC) FORCE

	$(call if_changed,ld)

	@:



$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)



$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE

	$(call if_changed,gzip)



LDFLAGS_piggy.o := -r --format binary --oformat elf32-sh-linux -T

OBJCOPYFLAGS += -R .empty_zero_page



$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE

	$(call if_changed,ld)

arch/sh64/boot/compressed/Makefile→arch/sh/boot/compressed/Makefile_64

+7 −8
Original line number Diff line number Diff line
@@ -12,21 +12,21 @@ 
#



targets		:= vmlinux vmlinux.bin vmlinux.bin.gz \

		   head.o misc.o cache.o piggy.o vmlinux.lds



		   head_64.o misc_64.o cache.o piggy.o

EXTRA_AFLAGS	:= -traditional



OBJECTS		:= $(obj)/head.o $(obj)/misc.o $(obj)/cache.o

OBJECTS		:= $(obj)/vmlinux_64.lds $(obj)/head_64.o $(obj)/misc_64.o \

		   $(obj)/cache.o



#

# ZIMAGE_OFFSET is the load offset of the compression loader

# (4M for the kernel plus 64K for this loader)

#

ZIMAGE_OFFSET = $(shell printf "0x%8x" $$[$(CONFIG_MEMORY_START)+0x400000+0x10000])

ZIMAGE_OFFSET	:= $(shell /bin/bash -c 'printf "0x%08x" \

		     $$[$(CONFIG_PAGE_OFFSET)+0x400000+0x10000]')



LDFLAGS_vmlinux := -Ttext $(ZIMAGE_OFFSET) -e startup \

		    -T $(obj)/../../kernel/vmlinux.lds \

		    --no-warn-mismatch

		    -T $(obj)/../../kernel/vmlinux.lds



$(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o FORCE

	$(call if_changed,ld)
@@ -41,6 +41,5 @@ $(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE 
LDFLAGS_piggy.o := -r --format binary --oformat elf32-sh64-linux -T

OBJCOPYFLAGS += -R .empty_zero_page



$(obj)/piggy.o: $(obj)/vmlinux.lds $(obj)/vmlinux.bin.gz FORCE

$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE

	$(call if_changed,ld)

arch/sh/boot/compressed/cache.c

0 → 100644
+12 −0
Original line number Diff line number Diff line 
int cache_control(unsigned int command)

{

	volatile unsigned int *p = (volatile unsigned int *) 0x80000000;

	int i;



	for (i = 0; i < (32 * 1024); i += 32) {

		(void)*p;

		p += (32 / sizeof (int));

	}



	return 0;

}