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

Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze 

* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (24 commits)
  microblaze: Disable heartbeat/enable emaclite in defconfigs
  microblaze: Support simpleImage.dts make target
  microblaze: Fix _start symbol to physical address
  microblaze: Use LOAD_OFFSET macro to get correct LMA for all sections
  microblaze: Create the LOAD_OFFSET macro used to compute VMA vs LMA offsets
  microblaze: Copy ppc asm-compat.h for clean handling of constants in asm and C
  microblaze: Actually show KiB rather than pages in "Freeing initrd memory:"
  microblaze: Support ptrace syscall tracing.
  microblaze: Updated CPU version and FPGA family codes in PVR
  microblaze: Generate correct signal and siginfo for integer div-by-zero
  microblaze: Don't be noisy when userspace causes hardware exceptions
  microblaze: Remove ipc.h file which points to non-existing asm-generic file
  microblaze: Clear sticky FSR register after generating exception signals
  microblaze: Ensure CPU usermode is set on new userspace processes
  microblaze: Use correct kbuild variable KBUILD_CFLAGS
  microblaze: Save and restore msr in hw exception
  microblaze: Add architectural support for USB EHCI host controllers
  microblaze: Implement include/asm/syscall.h.
  microblaze: Improve checking mechanism for MSR instruction
  microblaze: Add checking mechanism for MSR instruction
  ...
parents 2c9871de bfc81258

arch/microblaze/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ mainmenu "Linux/Microblaze Kernel Configuration" 
config MICROBLAZE

	def_bool y

	select HAVE_LMB

	select USB_ARCH_HAS_EHCI

	select ARCH_WANT_OPTIONAL_GPIOLIB



config SWAP

arch/microblaze/Makefile

+25 −6
Original line number Diff line number Diff line
@@ -37,12 +37,12 @@ CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR) += -mxl-pattern-compare 
CPUFLAGS-1 += $(call cc-option,-mcpu=v$(CPU_VER))



# r31 holds current when in kernel mode

KBUILD_KERNEL += -ffixed-r31 $(CPUFLAGS-1) $(CPUFLAGS-2)

KBUILD_CFLAGS += -ffixed-r31 $(CPUFLAGS-1) $(CPUFLAGS-2)



LDFLAGS		:=

LDFLAGS_vmlinux	:=



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

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



head-y := arch/microblaze/kernel/head.o

libs-y += arch/microblaze/lib/
@@ -53,22 +53,41 @@ core-y += arch/microblaze/platform/ 


boot := arch/microblaze/boot



# Are we making a simpleImage.<boardname> target? If so, crack out the boardname

DTB:=$(subst simpleImage.,,$(filter simpleImage.%, $(MAKECMDGOALS)))



ifneq ($(DTB),)

	core-y	+= $(boot)/

endif



# defines filename extension depending memory management type

ifeq ($(CONFIG_MMU),)

MMU := -nommu

endif



export MMU

export MMU DTB



all: linux.bin



BOOT_TARGETS = linux.bin linux.bin.gz simpleImage.%



archclean:

	$(Q)$(MAKE) $(clean)=$(boot)



linux.bin linux.bin.gz: vmlinux

$(BOOT_TARGETS): vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



define archhelp

  echo '* linux.bin    - Create raw binary'

  echo '  linux.bin.gz - Create compressed raw binary'

  echo '  simpleImage.<dt> - ELF image with $(arch)/boot/dts/<dt>.dts linked in'

  echo '                   - stripped elf with fdt blob

  echo '  simpleImage.<dt>.unstrip - full ELF image with fdt blob'

  echo '  *_defconfig      - Select default config from arch/microblaze/configs'

  echo ''

  echo '  Targets with <dt> embed a device tree blob inside the image'

  echo '  These targets support board with firmware that does not'

  echo '  support passing a device tree directly. Replace <dt> with the'

  echo '  name of a dts file from the arch/microblaze/boot/dts/ directory'

  echo '  (minus the .dts extension).'

endef

arch/microblaze/boot/Makefile

+39 −2
Original line number Diff line number Diff line
@@ -2,10 +2,24 @@ 
# arch/microblaze/boot/Makefile

#



targets := linux.bin linux.bin.gz

obj-y += linked_dtb.o



targets := linux.bin linux.bin.gz simpleImage.%



OBJCOPYFLAGS_linux.bin  := -O binary



# Where the DTS files live

dtstree         := $(srctree)/$(src)/dts



# Ensure system.dtb exists

$(obj)/linked_dtb.o: $(obj)/system.dtb



# Generate system.dtb from $(DTB).dtb

ifneq ($(DTB),system)

$(obj)/system.dtb: $(obj)/$(DTB).dtb

	$(call if_changed,cp)

endif



$(obj)/linux.bin: vmlinux FORCE

	[ -n $(CONFIG_INITRAMFS_SOURCE) ] && [ ! -e $(CONFIG_INITRAMFS_SOURCE) ] && \

	touch $(CONFIG_INITRAMFS_SOURCE) || echo "No CPIO image"
@@ -16,4 +30,27 @@ $(obj)/linux.bin.gz: $(obj)/linux.bin FORCE 
	$(call if_changed,gzip)

	@echo 'Kernel: $@ is ready' ' (#'`cat .version`')'



clean-kernel += linux.bin linux.bin.gz
 
quiet_cmd_cp = CP      $< $@$2

	cmd_cp = cat $< >$@$2 || (rm -f $@ && echo false)



quiet_cmd_strip = STRIP   $@

      cmd_strip = $(STRIP) -K _start -K _end -K __log_buf -K _fdt_start vmlinux -o $@



$(obj)/simpleImage.%: vmlinux FORCE

	$(call if_changed,cp,.unstrip)

	$(call if_changed,strip)

	@echo 'Kernel: $@ is ready' ' (#'`cat .version`')'



# Rule to build device tree blobs

DTC = $(objtree)/scripts/dtc/dtc



# Rule to build device tree blobs

quiet_cmd_dtc = DTC     $@

	cmd_dtc = $(DTC) -O dtb -o $(obj)/$*.dtb -b 0 -p 1024 $(dtstree)/$*.dts



$(obj)/%.dtb: $(dtstree)/%.dts FORCE

	$(call if_changed,dtc)



clean-kernel += linux.bin linux.bin.gz simpleImage.*



clean-files += *.dtb

arch/microblaze/boot/dts/system.dts

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../platform/generic/system.dts
 
 No newline at end of file

arch/microblaze/boot/linked_dtb.S

0 → 100644
+3 −0
Original line number Diff line number Diff line 
.section __fdt_blob,"a"

.incbin "arch/microblaze/boot/system.dtb"

CRA Git | Maintained and supported by SUSTech CRA and CCSE