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

Commit 950b260e authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Michal Simek
Browse files

microblaze: Makefile cleanup 



Reviewed the Makefile on request by Michal and this is the resulting changes.

o Use ':=' for assignmnet so we do not re-evaluate for each use
o Use $(shell echo xxx) to remove ""
o Replaced CFLAGS_KERNEL with KBUILD_CFLAGS
  The settings are equally relevant for modules and the linked kernel
o Dropped LDFLAGS_BLOB - it is no longer used
o Refactored assignmnets to libs-y and core-y
o Use MMU for the MMU specific extension. "MMUEXT" was hurting my eyes
  and I did not wanted it spread to m68k

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarMichal Simek <monstr@monstr.eu>
parent 65d3db06

arch/microblaze/Makefile

+18 −17
Original line number Diff line number Diff line
@@ -6,14 +6,16 @@ endif 


# What CPU vesion are we building for, and crack it open

# as major.minor.rev

CPU_VER=$(subst ",,$(CONFIG_XILINX_MICROBLAZE0_HW_VER) )

CPU_MAJOR=$(shell echo $(CPU_VER) | cut -d '.' -f 1)

CPU_MINOR=$(shell echo $(CPU_VER) | cut -d '.' -f 2)

CPU_REV=$(shell echo $(CPU_VER) | cut -d '.' -f 3)

CPU_VER   := $(shell echo $(CONFIG_XILINX_MICROBLAZE0_HW_VER))

CPU_MAJOR := $(shell echo $(CPU_VER) | cut -d '.' -f 1)

CPU_MINOR := $(shell echo $(CPU_VER) | cut -d '.' -f 2)

CPU_REV   := $(shell echo $(CPU_VER) | cut -d '.' -f 3)



export CPU_VER CPU_MAJOR CPU_MINOR CPU_REV



# Use cpu-related CONFIG_ vars to set compile options.

# The various CONFIG_XILINX cpu features options are integers 0/1/2...

# rather than bools y/n



# Work out HW multipler support.  This is icky.

# 1. Spartan2 has no HW multiplers.
@@ -34,30 +36,29 @@ CPUFLAGS-$(CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR) += -mxl-pattern-compare 


CPUFLAGS-1 += $(call cc-option,-mcpu=v$(CPU_VER))



# The various CONFIG_XILINX cpu features options are integers 0/1/2...

# rather than bools y/n



# r31 holds current when in kernel mode

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

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



LDFLAGS		:=

LDFLAGS_vmlinux	:=

LDFLAGS_BLOB := --format binary --oformat elf32-microblaze



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

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



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

libs-y		+= arch/microblaze/lib/ $(LIBGCC)

core-y		+= arch/microblaze/kernel/ arch/microblaze/mm/ \

		   arch/microblaze/platform/

libs-y += arch/microblaze/lib/

libs-y += $(LIBGCC)

core-y += arch/microblaze/kernel/

core-y += arch/microblaze/mm/

core-y += arch/microblaze/platform/



boot := arch/$(ARCH)/boot

boot := arch/microblaze/boot



# defines filename extension depending memory management type

ifeq ($(CONFIG_MMU),)

MMUEXT		:= -nommu

MMU := -nommu

endif

export	MMUEXT



export MMU



all: linux.bin

arch/microblaze/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -17,4 +17,4 @@ obj-$(CONFIG_HEART_BEAT) += heartbeat.o 
obj-$(CONFIG_MODULES)		+= microblaze_ksyms.o module.o

obj-$(CONFIG_MMU)		+= misc.o



obj-y	+= entry$(MMUEXT).o
 
obj-y	+= entry$(MMU).o