Commit a780c6e8 authored by Mike Frysinger's avatar Mike Frysinger
Browse files

Blackfin: encode cpu-rev into uImage name 



Encoding the cpu family name apparently confuses people when they try to
boot an image on a sub-variant, so encode the specific cpu name and the
silicon rev instead.

Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
parent b66acb63

arch/blackfin/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -97,8 +97,11 @@ rev-$(CONFIG_BF_REV_0_6) := 0.6 
rev-$(CONFIG_BF_REV_NONE) := none

rev-$(CONFIG_BF_REV_ANY)  := any



KBUILD_CFLAGS += -mcpu=$(cpu-y)-$(rev-y)

KBUILD_AFLAGS += -mcpu=$(cpu-y)-$(rev-y)

CPU_REV := $(cpu-y)-$(rev-y)

export CPU_REV



KBUILD_CFLAGS += -mcpu=$(CPU_REV)

KBUILD_AFLAGS += -mcpu=$(CPU_REV)



# - we utilize the silicon rev from the toolchain, so move it over to the checkflags

CHECKFLAGS_SILICON = $(shell echo "" | $(CPP) $(KBUILD_CFLAGS) -dD - 2>/dev/null | awk '$$2 == "__SILICON_REVISION__" { print $$3 }')

arch/blackfin/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 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)' \

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

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

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