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

Commit d86bfb16 authored by Barry Song's avatar Barry Song Committed by Mike Frysinger
Browse files

Blackfin: initial XIP support 



Signed-off-by: default avatarBarry Song <barry.song@analog.com>
Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent aad16f32

arch/blackfin/Kconfig

+12 −4
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ config BLACKFIN 
	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_TRACER

	select HAVE_IDE

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_GZIP if RAMKERNEL

	select HAVE_KERNEL_BZIP2 if RAMKERNEL

	select HAVE_KERNEL_LZMA if RAMKERNEL

	select HAVE_OPROFILE

	select ARCH_WANT_OPTIONAL_GPIOLIB
@@ -407,10 +407,18 @@ config BOOT_LOAD 
config ROM_BASE

	hex "Kernel ROM Base"

	depends on ROMKERNEL

	default "0x20040000"

	default "0x20040040"

	range 0x20000000 0x20400000 if !(BF54x || BF561)

	range 0x20000000 0x30000000 if (BF54x || BF561)

	help

	  Make sure your ROM base does not include any file-header

	  information that is prepended to the kernel.



	  For example, the bootable U-Boot format (created with

	  mkimage) has a 64 byte header (0x40).  So while the image

	  you write to flash might start at say 0x20080000, you have

	  to add 0x40 to get the kernel's ROM base as it will come

	  after the header.



comment "Clock/PLL Setup"

arch/blackfin/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ OBJCOPYFLAGS := -O binary -R .note -R .comment -S 
GZFLAGS          := -9



KBUILD_CFLAGS           += $(call cc-option,-mno-fdpic)

ifeq ($(CONFIG_ROMKERNEL),y)

KBUILD_CFLAGS           += -mlong-calls

endif

KBUILD_AFLAGS           += $(call cc-option,-mno-fdpic)

CFLAGS_MODULE    += -mlong-calls

LDFLAGS_MODULE   += -m elf32bfin
@@ -138,7 +141,7 @@ archclean: 


INSTALL_PATH ?= /tftpboot

boot := arch/$(ARCH)/boot

BOOT_TARGETS = vmImage vmImage.bin vmImage.bz2 vmImage.gz vmImage.lzma

BOOT_TARGETS = vmImage vmImage.bin vmImage.bz2 vmImage.gz vmImage.lzma vmImage.xip

PHONY += $(BOOT_TARGETS) install

KBUILD_IMAGE := $(boot)/vmImage
@@ -156,6 +159,7 @@ define archhelp 
  echo  '  vmImage.bz2     - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.bz2)'

  echo  '* vmImage.gz      - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.gz)'

  echo  '  vmImage.lzma    - Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.lzma)'

  echo  '  vmImage.xip     - XIP Kernel-only image for U-Boot (arch/$(ARCH)/boot/vmImage.xip)'

  echo  '  install         - Install kernel using'

  echo  '                     (your) ~/bin/$(INSTALLKERNEL) or'

  echo  '                     (distribution) PATH: $(INSTALLKERNEL) or'

arch/blackfin/boot/Makefile

+19 −4
Original line number Diff line number Diff line
@@ -8,14 +8,18 @@ 


MKIMAGE := $(srctree)/scripts/mkuboot.sh



targets := vmImage vmImage.bin vmImage.bz2 vmImage.gz vmImage.lzma

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

targets := vmImage vmImage.bin vmImage.bz2 vmImage.gz vmImage.lzma vmImage.xip

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



UIMAGE_OPTS-y :=

UIMAGE_OPTS-$(CONFIG_RAMKERNEL) += -a $(CONFIG_BOOT_LOAD)

UIMAGE_OPTS-$(CONFIG_ROMKERNEL) += -a $(CONFIG_ROM_BASE) -x



quiet_cmd_uimage = UIMAGE  $@

      cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A $(ARCH) -O linux -T kernel \

                   -C $(2) -n '$(MACHINE)-$(KERNELRELEASE)' -a $(CONFIG_BOOT_LOAD) \

                   -C $(2) -n '$(MACHINE)-$(KERNELRELEASE)' \

                   -e $(shell $(NM) vmlinux | awk '$$NF == "__start" {print $$1}') \

                   -d $< $@

                   $(UIMAGE_OPTS-y) -d $< $@



$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)
@@ -29,6 +33,12 @@ $(obj)/vmlinux.bin.bz2: $(obj)/vmlinux.bin FORCE 
$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE

	$(call if_changed,lzma)



# The mkimage tool wants 64bytes prepended to the image

quiet_cmd_mk_bin_xip = BIN     $@

      cmd_mk_bin_xip = ( printf '%64s' | tr ' ' '\377' ; cat $< ) > $@

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

	$(call if_changed,mk_bin_xip)



$(obj)/vmImage.bin: $(obj)/vmlinux.bin

	$(call if_changed,uimage,none)
@@ -41,10 +51,15 @@ $(obj)/vmImage.gz: $(obj)/vmlinux.bin.gz 
$(obj)/vmImage.lzma: $(obj)/vmlinux.bin.lzma

	$(call if_changed,uimage,lzma)



$(obj)/vmImage.xip: $(obj)/vmlinux.bin.xip

	$(call if_changed,uimage,none)



suffix-y                      := bin

suffix-$(CONFIG_KERNEL_GZIP)  := gz

suffix-$(CONFIG_KERNEL_BZIP2) := bz2

suffix-$(CONFIG_KERNEL_LZMA)  := lzma

suffix-$(CONFIG_ROMKERNEL)    := xip



$(obj)/vmImage: $(obj)/vmImage.$(suffix-y)

	@ln -sf $(notdir $<) $@

arch/blackfin/include/asm/context.S

+10 −0
Original line number Diff line number Diff line
@@ -374,3 +374,13 @@ 


	(R7:0, P5:0) = [SP++];

.endm



.macro pseudo_long_call func:req, scratch:req

#ifdef CONFIG_ROMKERNEL

	\scratch\().l = \func;

	\scratch\().h = \func;

	call (\scratch);

#else

	call \func;

#endif

.endm

arch/blackfin/include/asm/sections.h

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ extern unsigned long memory_start, memory_end, physical_mem_end; 
extern char _stext_l1[], _etext_l1[], _text_l1_lma[], __weak _text_l1_len[];

extern char _sdata_l1[], _edata_l1[], _sbss_l1[], _ebss_l1[],

	_data_l1_lma[], __weak _data_l1_len[];

#ifdef CONFIG_ROMKERNEL

extern char _data_lma[], _data_len[], _sinitdata[], _einitdata[], _init_data_lma[], _init_data_len[];

#endif

extern char _sdata_b_l1[], _edata_b_l1[], _sbss_b_l1[], _ebss_b_l1[],

	_data_b_l1_lma[], __weak _data_b_l1_len[];

extern char _stext_l2[], _etext_l2[], _sdata_l2[], _edata_l2[],