sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'for-next/imx'

This commit is contained in:
Sascha Hauer 2016-01-11 13:11:06 +01:00
parent a7964180e1 1b099f06ca
commit b1ebbe76eb
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/dts/imx6q-embedsky-e9.dts
View File

@ -22,13 +22,13 @@
environment-mmc1 {
compatible = "barebox,environment";
device-path = &usdhc2, "partname:barebox-environment";
device-path = &environment_mmc1;
status = "disabled";
};
environment-mmc3 {
compatible = "barebox,environment";
device-path = &usdhc4, "partname:barebox-environment";
device-path = &environment_mmc3;
status = "disabled";
};
@ -43,7 +43,7 @@
label = "barebox";
reg = <0x0 0x80000>;
};
partition@1 {
environment_mmc1: partition@1 {
label = "barebox-environment";
reg = <0x80000 0x80000>;
};
@ -57,7 +57,7 @@
label = "barebox";
reg = <0x0 0x80000>;
};
partition@1 {
environment_mmc3: partition@1 {
label = "barebox-environment";
reg = <0x80000 0x80000>;
};

11
scripts/imx/imx-usb-loader.c
View File

@ -96,20 +96,27 @@ struct mach_id imx_ids[] = {
.header_type = HDR_MX53,
.mode = MODE_HID,
.max_transfer = 1024,
}, {
}, {
.vid = 0x15a2,
.pid = 0x0061,
.name = "i.MX6dl/s",
.header_type = HDR_MX53,
.mode = MODE_HID,
.max_transfer = 1024,
}, {
}, {
.vid = 0x15a2,
.pid = 0x0071,
.name = "i.MX6 SoloX",
.header_type = HDR_MX53,
.mode = MODE_HID,
.max_transfer = 1024,
}, {
.vid = 0x15a2,
.pid = 0x007d,
.name = "i.MX6ul",
.header_type = HDR_MX53,
.mode = MODE_HID,
.max_transfer = 1024,
}, {
.vid = 0x15a2,
.pid = 0x0041,