From 1071a1d78a7045369e451f35ec2bb93e1f1a3886 Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Fri, 6 Nov 2015 17:25:35 +0100 Subject: [PATCH] ARM: microsom: change barebox image name for Hummingboard To reflect that the current image is in fact for a combination of a MicroSOM i1 with a Hummingboard baseboard. Signed-off-by: Lucas Stach Signed-off-by: Sascha Hauer --- arch/arm/boards/solidrun-microsom/lowlevel.c | 2 +- images/Makefile.imx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/boards/solidrun-microsom/lowlevel.c b/arch/arm/boards/solidrun-microsom/lowlevel.c index 30f4a3f59..703c0aafd 100644 --- a/arch/arm/boards/solidrun-microsom/lowlevel.c +++ b/arch/arm/boards/solidrun-microsom/lowlevel.c @@ -6,7 +6,7 @@ extern char __dtb_imx6dl_hummingboard_start[]; -ENTRY_FUNCTION(start_imx6dl_hummingboard, r0, r1, r2) +ENTRY_FUNCTION(start_hummingboard_microsom_i1, r0, r1, r2) { void *fdt; diff --git a/images/Makefile.imx b/images/Makefile.imx index a09afd695..898fcb6e2 100644 --- a/images/Makefile.imx +++ b/images/Makefile.imx @@ -202,10 +202,10 @@ CFG_start_imx6sx_sabresdb.pblx.imximg = $(board)/freescale-mx6sx-sabresdb/flash- FILE_barebox-freescale-imx6sx-sabresdb.img = start_imx6sx_sabresdb.pblx.imximg image-$(CONFIG_MACH_FREESCALE_IMX6SX_SABRESDB) += barebox-freescale-imx6sx-sabresdb.img -pblx-$(CONFIG_MACH_SOLIDRUN_MICROSOM) += start_imx6dl_hummingboard -CFG_start_imx6dl_hummingboard.pblx.imximg = $(board)/solidrun-microsom/flash-header-solidrun-hummingboard.imxcfg -FILE_barebox-solidrun-imx6dl-hummingboard.img = start_imx6dl_hummingboard.pblx.imximg -image-$(CONFIG_MACH_SOLIDRUN_MICROSOM) += barebox-solidrun-imx6dl-hummingboard.img +pblx-$(CONFIG_MACH_SOLIDRUN_MICROSOM) += start_hummingboard_microsom_i1 +CFG_start_hummingboard_microsom_i1.pblx.imximg = $(board)/solidrun-microsom/flash-header-solidrun-hummingboard.imxcfg +FILE_barebox-solidrun-hummingboard-microsom-i1.img = start_hummingboard_microsom_i1.pblx.imximg +image-$(CONFIG_MACH_SOLIDRUN_MICROSOM) += barebox-solidrun-hummingboard-microsom-i1.img pblx-$(CONFIG_MACH_TECHNEXION_WANDBOARD) += start_imx6_wandboard CFG_start_imx6_wandboard.imx-sram-img = $(board)/technexion-wandboard/flash-header-technexion-wandboard.imxcfg