Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dac7102 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull h8300 updates from Yoshinori Sato:
 "Some bug fixes"

* tag 'for-4.4' of git://git.osdn.jp/gitroot/uclinux-h8/linux:
  h8300: enable CLKSRC_OF
  h8300: Don't set CROSS_COMPILE unconditionally
  asm-generic: {get,put}_user ptr argument evaluate only 1 time
  h8300: bit io fix
  h8300: zImage fix
  h8300: register address fix
  h8300: Fix alignment for .data
  h8300: unaligned divcr register support.
parents 3370b69e f639eeb4

arch/h8300/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ config H8300 
	select OF_EARLY_FLATTREE

	select HAVE_MEMBLOCK

	select HAVE_DMA_ATTRS

	select CLKSRC_OF



config RWSEM_GENERIC_SPINLOCK

	def_bool y

arch/h8300/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -22,7 +22,9 @@ KBUILD_CFLAGS += -DUTS_SYSNAME=\"uClinux\" 
KBUILD_AFLAGS += $(aflags-y)

LDFLAGS += $(ldflags-y)



ifeq ($(CROSS_COMPILE),)

CROSS_COMPILE := h8300-unknown-linux-

endif



core-y	+= arch/$(ARCH)/kernel/ arch/$(ARCH)/mm/

ifneq '$(CONFIG_H8300_BUILTIN_DTB)' '""'

arch/h8300/boot/compressed/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -14,11 +14,12 @@ OBJECTS = $(obj)/head.o $(obj)/misc.o 
# in order to suppress error message.

#

CONFIG_MEMORY_START     ?= 0x00400000

CONFIG_BOOT_LINK_OFFSET ?= 0x00140000

CONFIG_BOOT_LINK_OFFSET ?= 0x00280000

IMAGE_OFFSET := $(shell printf "0x%08x" $$(($(CONFIG_MEMORY_START)+$(CONFIG_BOOT_LINK_OFFSET))))



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

LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -estartup $(obj)/vmlinux.lds

LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -estartup -T $(obj)/vmlinux.lds \

	--defsym output=$(CONFIG_MEMORY_START)



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

	$(call if_changed,ld)

arch/h8300/boot/compressed/head.S

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 
	.section	.text..startup,"ax"

	.global	startup

startup:

	mov.l	#startup, sp

	mov.l	er0, er4

	mov.l	er0, sp

	mov.l	#__sbss, er0

	mov.l	#__ebss, er1

	sub.l	er0, er1
@@ -24,7 +24,7 @@ startup: 
	bne	1b

	jsr	@decompress_kernel

	mov.l	er4, er0

	jmp	@0x400000

	jmp	@output



	.align	9

fake_headers_as_bzImage:

arch/h8300/boot/compressed/misc.c

+1 −6
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static unsigned long free_mem_end_ptr; 


extern char input_data[];

extern int input_len;

static unsigned char *output;

extern char output[];



#define HEAP_SIZE             0x10000
@@ -56,15 +56,10 @@ void *memcpy(void *dest, const void *src, size_t n) 


static void error(char *x)

{



	while (1)

		;	/* Halt */

}



#define STACK_SIZE (4096)

long user_stack[STACK_SIZE];

long *stack_start = &user_stack[STACK_SIZE];



void decompress_kernel(void)

{

	free_mem_ptr = (unsigned long)&_end;