summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2013-12-11 15:18:37 +0100
committerJuergen Beisert <jbe@pengutronix.de>2013-12-11 15:20:34 +0100
commitc0fc87fd4505346f1b7153e5c1645cb9e24ad5db (patch)
treee8808f2129101e123a5f2580df11e621e8515dea
parentd2c932b7f7f96c0580e80e844a8792d94bb86637 (diff)
downloadOSELAS.BSP-Pengutronix-Generic-c0fc87fd4505346f1b7153e5c1645cb9e24ad5db.tar.gz
BSP/platforms: back to development
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
-rw-r--r--ChangeLog4
-rw-r--r--configs/arm-qemu/Changelog4
-rw-r--r--configs/arm-qemu/platformconfig2
-rw-r--r--configs/i586-qemu/Changelog4
-rw-r--r--configs/i586-qemu/platformconfig2
-rw-r--r--configs/ptxconfig2
6 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 29ce617..05e876a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-11 Juergen Beisert <jbe@pengutronix.de>
+
+ * BSP/platforms: back to development
+
2012-12-30 Juergen Beisert <jbe@pengutronix.de>
* Platforms: use 2012.12.0 platform releases
diff --git a/configs/arm-qemu/Changelog b/configs/arm-qemu/Changelog
index 5b144ef..8210ffd 100644
--- a/configs/arm-qemu/Changelog
+++ b/configs/arm-qemu/Changelog
@@ -1,3 +1,7 @@
+2013-12-11 Juergen Beisert <jbe@pengutronix.de>
+
+ * platform: back to development
+
2012-12-30 Juergen Beisert <jbe@pengutronix.de>
* platform:
diff --git a/configs/arm-qemu/platformconfig b/configs/arm-qemu/platformconfig
index 0cc4e76..c1e0174 100644
--- a/configs/arm-qemu/platformconfig
+++ b/configs/arm-qemu/platformconfig
@@ -19,7 +19,7 @@ PTXCONF__platformconfig_MAGIC__=y
# ------------------------------------
#
PTXCONF_PLATFORM="versatilepb"
-PTXCONF_PLATFORM_VERSION="-2012.12.0"
+PTXCONF_PLATFORM_VERSION="-master"
#
# architecture
diff --git a/configs/i586-qemu/Changelog b/configs/i586-qemu/Changelog
index 74628fc..e4a1a9d 100644
--- a/configs/i586-qemu/Changelog
+++ b/configs/i586-qemu/Changelog
@@ -1,3 +1,7 @@
+2013-12-11 Juergen Beisert <jbe@pengutronix.de>
+
+ * platform: back to development
+
2012-12-29 Juergen Beisert <jbe@pengutronix.de>
* platform:
diff --git a/configs/i586-qemu/platformconfig b/configs/i586-qemu/platformconfig
index fecda15..6207b39 100644
--- a/configs/i586-qemu/platformconfig
+++ b/configs/i586-qemu/platformconfig
@@ -19,7 +19,7 @@ PTXCONF__platformconfig_MAGIC__=y
# ------------------------------------
#
PTXCONF_PLATFORM="i586"
-PTXCONF_PLATFORM_VERSION="-2012.12.0"
+PTXCONF_PLATFORM_VERSION="-master"
#
# architecture
diff --git a/configs/ptxconfig b/configs/ptxconfig
index 9507257..1c1c694 100644
--- a/configs/ptxconfig
+++ b/configs/ptxconfig
@@ -17,7 +17,7 @@ PTXCONF_MODULES=y
#
PTXCONF_PROJECT_VENDOR="PTX"
PTXCONF_PROJECT="Generic"
-PTXCONF_PROJECT_VERSION="-29C3"
+PTXCONF_PROJECT_VERSION="-master"
#
# ------------------------------------