summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2015-11-06 17:25:35 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2015-11-09 07:31:31 +0100
commit1071a1d78a7045369e451f35ec2bb93e1f1a3886 (patch)
tree4d11b0c5eacead6c8bc223cc1862101f7c94230e
parent2fb71a0ce718b9a6ce9620652116818e7a19a2ed (diff)
downloadbarebox-1071a1d78a7045369e451f35ec2bb93e1f1a3886.tar.gz
barebox-1071a1d78a7045369e451f35ec2bb93e1f1a3886.tar.xz
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 <l.stach@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/boards/solidrun-microsom/lowlevel.c2
-rw-r--r--images/Makefile.imx8
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 30f4a3f591..703c0aafd1 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 a09afd695b..898fcb6e21 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