Commit fd3830b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 

* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Fix build of sh7750 base boards
  sh: update INTC to clear IRQ sense valid flag
  sh: Fix sh build failure when CONFIG_SFC=m
  sh: fix MSIOF0 SPI on ecovec: it conflicts with VOU
  sh: support XZ-compressed kernel.
  sh: Fix up breakage from asm-generic/pgtable.h changes.
parents ceb73c12 75a9fa0a

arch/sh/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ config SUPERH 
	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_XZ

	select HAVE_KERNEL_LZO

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_REGS_AND_STACK_ACCESS_API

arch/sh/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ endif 
libs-$(CONFIG_SUPERH32)		:= arch/sh/lib/	$(libs-y)

libs-$(CONFIG_SUPERH64)		:= arch/sh/lib64/ $(libs-y)



BOOT_TARGETS = uImage uImage.bz2 uImage.gz uImage.lzma uImage.lzo \

BOOT_TARGETS = uImage uImage.bz2 uImage.gz uImage.lzma uImage.xz uImage.lzo \

	       uImage.srec uImage.bin zImage vmlinux.bin vmlinux.srec \

	       romImage

PHONY += $(BOOT_TARGETS)
@@ -230,5 +230,6 @@ define archhelp 
	@echo '* uImage.gz	           - Kernel-only image for U-Boot (gzip)'

	@echo '  uImage.bz2	           - Kernel-only image for U-Boot (bzip2)'

	@echo '  uImage.lzma	           - Kernel-only image for U-Boot (lzma)'

	@echo '  uImage.xz	           - Kernel-only image for U-Boot (xz)'

	@echo '  uImage.lzo	           - Kernel-only image for U-Boot (lzo)'

endef

arch/sh/boards/mach-ecovec24/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -1294,6 +1294,7 @@ static int __init arch_setup(void) 
	i2c_register_board_info(1, i2c1_devices,

				ARRAY_SIZE(i2c1_devices));



#if defined(CONFIG_VIDEO_SH_VOU) || defined(CONFIG_VIDEO_SH_VOU_MODULE)

	/* VOU */

	gpio_request(GPIO_FN_DV_D15, NULL);

	gpio_request(GPIO_FN_DV_D14, NULL);
@@ -1325,6 +1326,7 @@ static int __init arch_setup(void) 


	/* Remove reset */

	gpio_set_value(GPIO_PTG4, 1);

#endif



	return platform_add_devices(ecovec_devices,

				    ARRAY_SIZE(ecovec_devices));

arch/sh/boot/Makefile

+9 −2
Original line number Diff line number Diff line
@@ -24,12 +24,13 @@ suffix-y := bin 
suffix-$(CONFIG_KERNEL_GZIP)	:= gz

suffix-$(CONFIG_KERNEL_BZIP2)	:= bz2

suffix-$(CONFIG_KERNEL_LZMA)	:= lzma

suffix-$(CONFIG_KERNEL_XZ)	:= xz

suffix-$(CONFIG_KERNEL_LZO)	:= lzo



targets := zImage vmlinux.srec romImage uImage uImage.srec uImage.gz \

	   uImage.bz2 uImage.lzma uImage.lzo uImage.bin

	   uImage.bz2 uImage.lzma uImage.xz uImage.lzo uImage.bin

extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma \

	   vmlinux.bin.lzo

	   vmlinux.bin.xz vmlinux.bin.lzo

subdir- := compressed romimage



$(obj)/zImage: $(obj)/compressed/vmlinux FORCE
@@ -76,6 +77,9 @@ $(obj)/vmlinux.bin.bz2: $(obj)/vmlinux.bin FORCE 
$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE

	$(call if_changed,lzma)



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

	$(call if_changed,xzkern)



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

	$(call if_changed,lzo)
@@ -88,6 +92,9 @@ $(obj)/uImage.gz: $(obj)/vmlinux.bin.gz 
$(obj)/uImage.lzma: $(obj)/vmlinux.bin.lzma

	$(call if_changed,uimage,lzma)



$(obj)/uImage.xz: $(obj)/vmlinux.bin.xz

	$(call if_changed,uimage,xz)



$(obj)/uImage.lzo: $(obj)/vmlinux.bin.lzo

	$(call if_changed,uimage,lzo)

arch/sh/boot/compressed/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


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

		   vmlinux.bin.bz2 vmlinux.bin.lzma \

		   vmlinux.bin.lzo \

		   vmlinux.bin.xz vmlinux.bin.lzo \

		   head_$(BITS).o misc.o piggy.o



OBJECTS = $(obj)/head_$(BITS).o $(obj)/misc.o $(obj)/cache.o
@@ -50,6 +50,8 @@ $(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE 
	$(call if_changed,bzip2)

$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE

	$(call if_changed,lzma)

$(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) FORCE

	$(call if_changed,xzkern)

$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE

	$(call if_changed,lzo)

CRA Git | Maintained and supported by SUSTech CRA and CCSE