summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Borleis <jbe@pengutronix.de>2014-05-20 09:44:21 +0200
committerJuergen Borleis <jbe@pengutronix.de>2014-05-20 09:44:59 +0200
commit80cc44f1732cdab07550716d5df911d4925ee50d (patch)
tree869221c4047bc8847700995c905fb6b70ec7a79e
parent60ad99468f3149091c0b183ab60f777b797952cf (diff)
BSP/platforms: back to development
Signed-off-by: Juergen Borleis <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 7a76106..207fb4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-20 Juergen Borleis <jbe@pengutronix.de>
+
+ * BSP: back to development
+
2013-12-11 Juergen Beisert <jbe@pengutronix.de>
* BSP/platforms: back to development
diff --git a/configs/arm-qemu/Changelog b/configs/arm-qemu/Changelog
index d3bf752..99deb46 100644
--- a/configs/arm-qemu/Changelog
+++ b/configs/arm-qemu/Changelog
@@ -1,3 +1,7 @@
+2014-05-20 Juergen Borleis <jbe@pengutronix.de>
+
+ * platform: back to development
+
2013-12-11 Juergen Beisert <jbe@pengutronix.de>
* platform: back to development
diff --git a/configs/arm-qemu/platformconfig b/configs/arm-qemu/platformconfig
index 57316eb..a68506f 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="-2013.12.0"
+PTXCONF_PLATFORM_VERSION="-master"
#
# architecture
diff --git a/configs/i586-qemu/Changelog b/configs/i586-qemu/Changelog
index 96c3180..face1b0 100644
--- a/configs/i586-qemu/Changelog
+++ b/configs/i586-qemu/Changelog
@@ -1,3 +1,7 @@
+2014-05-20 Juergen Borleis <jbe@pengutronix.de>
+
+ * platform: back to development
+
2013-12-11 Juergen Beisert <jbe@pengutronix.de>
* platform: back to development
diff --git a/configs/i586-qemu/platformconfig b/configs/i586-qemu/platformconfig
index 8c2fe7f..b0416c8 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="-2013.12.0"
+PTXCONF_PLATFORM_VERSION="-master"
#
# architecture
diff --git a/configs/ptxconfig b/configs/ptxconfig
index f3a2127..48d2cad 100644
--- a/configs/ptxconfig
+++ b/configs/ptxconfig
@@ -17,7 +17,7 @@ PTXCONF_MODULES=y
#
PTXCONF_PROJECT_VENDOR="PTX"
PTXCONF_PROJECT="Generic"
-PTXCONF_PROJECT_VERSION="-2013.12.0"
+PTXCONF_PROJECT_VERSION="-master"
#
# ------------------------------------