Commit 278e5aca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-4.5' of git://git.osdn.jp/gitroot/uclinux-h8/linux 

Pull h8300 updates from Yoshinori Sato:
 - Add KGDB support
 - zImage fix
 - various cleanup

* tag 'for-4.5' of git://git.osdn.jp/gitroot/uclinux-h8/linux:
  h8300: System call entry enable interrupt.
  h8300: show_stack cleanup
  h8300: Restraint of warning.
  h8300: Add KGDB support.
  irqchip: renesas-h8s: Replace ctrl_outw/ctrl_inw with writew/readw
  h8300: signal stack fix
  h8300: Add LZO compression
  h8300: zImage alignment fix
  clk: h8300: Remove "sh73a0-" part from compatible value
  h8300: zImage alignment fix
parents 30f05309 2f1b0077

Documentation/devicetree/bindings/clock/renesas,h8300-div-clock.txt

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


Required Properties:



  - compatible: Must be "renesas,sh73a0-h8300-div-clock"

  - compatible: Must be "renesas,h8300-div-clock"



  - clocks: Reference to the parent clocks ("extal1" and "extal2")

arch/h8300/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ config H8300 
	select HAVE_DMA_ATTRS

	select CLKSRC_OF

	select H8300_TMR8

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_LZO

	select HAVE_ARCH_KGDB



config RWSEM_GENERIC_SPINLOCK

	def_bool y

arch/h8300/boot/compressed/Makefile

+8 −3
Original line number Diff line number Diff line
@@ -28,11 +28,16 @@ $(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o $(LIBGCC) FORCE 
$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)



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

	$(call if_changed,gzip)

suffix-$(CONFIG_KERNEL_GZIP)    := gzip

suffix-$(CONFIG_KERNEL_LZO)     := lzo



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

	$(call if_changed,$(suffix-y))



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

OBJCOPYFLAGS := -O binary



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

$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix-y) FORCE

	$(call if_changed,ld)



CFLAGS_misc.o = -O0

arch/h8300/boot/compressed/misc.c

+6 −0
Original line number Diff line number Diff line
@@ -32,7 +32,13 @@ extern char output[]; 


#define HEAP_SIZE             0x10000



#ifdef CONFIG_KERNEL_GZIP

#include "../../../../lib/decompress_inflate.c"

#endif



#ifdef CONFIG_KERNEL_LZO

#include "../../../../lib/decompress_unlzo.c"

#endif



void *memset(void *s, int c, size_t n)

{

arch/h8300/boot/compressed/vmlinux.lds

+3 −1
Original line number Diff line number Diff line
@@ -13,16 +13,18 @@ SECTIONS 
	{

		*(.rodata)

	}

        . = ALIGN(0x4) ;

        .data :



        {

        . = ALIGN(0x4) ;

        __sdata = . ;

        ___data_start = . ;

                *(.data.*)

	}

        . = ALIGN(0x4) ;

        .bss :

        {

        . = ALIGN(0x4) ;

        __sbss = . ;

                *(.bss*)

        . = ALIGN(0x4) ;

CRA Git | Maintained and supported by SUSTech CRA and CCSE