summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Keller <rainer.keller@theqtcompany.com>2014-12-04 10:21:36 +0100
committerRainer Keller <rainer.keller@theqtcompany.com>2014-12-04 14:13:46 +0200
commitd133a9739a6d0c2fcd56ae0dc5e9a684cdfcb2a1 (patch)
tree21925584bd45f198aa54a308ca065fd08afd7a77
parentfc2f6ac9d7e7ac8ab343c11786f7437610fa0a19 (diff)
b2qt-flashing-wizard: Support missing platforms
Change-Id: I20cbdda83efde42bed9e474f4db529fde2b810c4 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
-rw-r--r--src/b2qt-flashing-wizard/commit_page.cpp12
-rw-r--r--src/b2qt-flashing-wizard/platform_page.cpp32
2 files changed, 38 insertions, 6 deletions
diff --git a/src/b2qt-flashing-wizard/commit_page.cpp b/src/b2qt-flashing-wizard/commit_page.cpp
index 1da2e38..1013640 100644
--- a/src/b2qt-flashing-wizard/commit_page.cpp
+++ b/src/b2qt-flashing-wizard/commit_page.cpp
@@ -141,6 +141,12 @@ void CommitPage::initializePage()
i->setAdditionalArgs(QStringList() << "-y" <<G_device << "--verbose");
i->setEnvironment("VERBOSE","1");
mActor = i;
+ } else if (G_platform == "imx6dsabresd" && G_os == "eLinux") {
+ ScriptWriter *i = new ScriptWriter(this);
+ i->setScriptFile(G_SDKDIR + G_version + "/imx6qsabresd-" + G_os + "/images/deploy.sh");
+ i->setAdditionalArgs(QStringList() << "-y" <<G_device << "--verbose" << "--uboot" << "u-boot-imx6dlsabresd.imx");
+ i->setEnvironment("VERBOSE","1");
+ mActor = i;
} else if (G_platform == "apalis-imx6" && G_os == "eLinux") {
ScriptWriter *i = new ScriptWriter(this);
i->setScriptFile(G_SDKDIR + G_version + "/" + G_platform + "-" + G_os + "/images/deploy.sh");
@@ -153,6 +159,12 @@ void CommitPage::initializePage()
i->setAdditionalArgs(QStringList() << "-y" <<G_device << "--verbose");
i->setEnvironment("VERBOSE","1");
mActor = i;
+ } else if (G_platform == "colibri-vf" && G_os == "eLinux") {
+ ScriptWriter *i = new ScriptWriter(this);
+ i->setScriptFile(G_SDKDIR + G_version + "/" + G_platform + "-" + G_os + "/images/deploy.sh");
+ i->setAdditionalArgs(QStringList() << "-y" <<G_device << "--verbose");
+ i->setEnvironment("VERBOSE","1");
+ mActor = i;
} else {
mError->setText(tr("Unsupported platform combination"));
mComplete = false;
diff --git a/src/b2qt-flashing-wizard/platform_page.cpp b/src/b2qt-flashing-wizard/platform_page.cpp
index 6a0ea11..31ee880 100644
--- a/src/b2qt-flashing-wizard/platform_page.cpp
+++ b/src/b2qt-flashing-wizard/platform_page.cpp
@@ -130,12 +130,32 @@ void PlatformPage::initializePage()
}
} else if (os == "eAndroid" || os == "eLinux") {
- QRadioButton *button = new QRadioButton;
- button->setText(j + " (" + i + ")");
- mLayout->insertWidget(0, button);
- connect(button, &QRadioButton::toggled, this, &PlatformPage::itemSelected);
- mButtons.append(button);
- mButtonData.insert(button, QStringList() << name << os << i << name);
+ // Will be fixed with http://qt-gerrit.it.local/#change,7842
+ if (name == "imx6qsabresd") {
+ {
+ QRadioButton *button = new QRadioButton;
+ button->setText(j + " (" + i + ")");
+ mLayout->insertWidget(0, button);
+ connect(button, &QRadioButton::toggled, this, &PlatformPage::itemSelected);
+ mButtons.append(button);
+ mButtonData.insert(button, QStringList() << name << os << i << name);
+ }
+ {
+ QRadioButton *button = new QRadioButton;
+ button->setText("imx6dsabresd-eLinux (" + i + ")");
+ mLayout->insertWidget(0, button);
+ connect(button, &QRadioButton::toggled, this, &PlatformPage::itemSelected);
+ mButtons.append(button);
+ mButtonData.insert(button, QStringList() << "imx6dsabresd" << os << i << name);
+ }
+ } else {
+ QRadioButton *button = new QRadioButton;
+ button->setText(j + " (" + i + ")");
+ mLayout->insertWidget(0, button);
+ connect(button, &QRadioButton::toggled, this, &PlatformPage::itemSelected);
+ mButtons.append(button);
+ mButtonData.insert(button, QStringList() << name << os << i << name);
+ }
}
}
}