summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-12-06 08:22:48 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2013-12-06 08:22:48 +0100
commit0cb6f2c19e6fa41af25a0adaea651b29ef19c482 (patch)
treedd7c099a598dde44c157e01f4c8e74237b01ea1c /scripts
parent28124d02f2979a41b8f635e531c6e422a42ba816 (diff)
parentf87af10fb158033b922f19828c1164325df4974e (diff)
downloadbarebox-0cb6f2c19e6fa41af25a0adaea651b29ef19c482.tar.gz
barebox-0cb6f2c19e6fa41af25a0adaea651b29ef19c482.tar.xz
Merge branch 'for-next/imx'
Diffstat (limited to 'scripts')
-rw-r--r--scripts/imx/imx-image.c1
-rw-r--r--scripts/imx/imx-usb-loader.c7
2 files changed, 8 insertions, 0 deletions
diff --git a/scripts/imx/imx-image.c b/scripts/imx/imx-image.c
index ec571ebf3e..1d935be756 100644
--- a/scripts/imx/imx-image.c
+++ b/scripts/imx/imx-image.c
@@ -442,6 +442,7 @@ struct soc_type {
};
static struct soc_type socs[] = {
+ { .name = "imx25", .header_version = 1, },
{ .name = "imx35", .header_version = 1, },
{ .name = "imx51", .header_version = 1, },
{ .name = "imx53", .header_version = 2, },
diff --git a/scripts/imx/imx-usb-loader.c b/scripts/imx/imx-usb-loader.c
index 7ccfc99360..81c0640bee 100644
--- a/scripts/imx/imx-usb-loader.c
+++ b/scripts/imx/imx-usb-loader.c
@@ -124,6 +124,13 @@ struct mach_id imx_ids[] = {
.header_type = HDR_MX51,
.mode = MODE_BULK,
.max_transfer = 64,
+ }, {
+ .vid = 0x15a2,
+ .pid = 0x003a,
+ .name = "i.MX25",
+ .header_type = HDR_MX51,
+ .mode = MODE_BULK,
+ .max_transfer = 64,
},
};