docs: end of line for sumo32

Signed-off-by: Ferry Toth <ftoth@exalondelft.nl>

README.md

@@ -1,30 +1,30 @@
 # meta-intel-edison Layer
 
-This is the Intel Edison image layer for the Intel Edison Development Platform. Here
-are all the parts needed to build and flash a Yocto image for Intel Edison.
+This is the Intel Edison image layer for the Intel Edison Development Platform. It builds the boot loader, kernel and root file system for the Intel Edison.
 
-This layer depends on:
-
-
-URI: [git://git.yoctoproject.org/poky](URL) tag: morty
-
-URI: [git@github.com:htot/meta-intel-iot-middleware.git](URL) branch: morty
-
-You will find more details in the README file in this directory
+You will find more (stale) details in the README file in this directory
 
 # What is here
 
 This is a fork of [http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-edison/](URL)
 
-Currently I am tracking origin/master but I have created four additional branches: dizzy-uptodate, dizzy-latest, dizzy-rt and morty.
+You can find our latest sources on [edison-fw/meta-intel-edison](https://github.com/edison-fw/meta-intel-edison). The documentation can be found in the /docs directory or for the latest (master) on [Intel Edison Image Builder](https://edison-fw.github.io/meta-intel-edison/).
+
+Currently we have Intel's original (factory) firmware: orignal and created four additional branches: dizzy-uptodate, dizzy-latest, dizzy-rt and morty.
 
   * **dizzy-uptodate** tracks origin/dizzy with 3.10.98 kernel. This branch pulls [https://github.com/htot/meta-intel-iot-middleware.git](URL) branch dizzy-uptodate with fixes for paho-mqtt relocated and iotkit-comm-js no longer supported. 
   * **dizzy-latest** tracks origin/master as much as possible with 3.10.98 kernel. This branch pulls [https://github.com/htot/meta-intel-iot-middleware.git](URL) branch dizzy-latest with fixes for paho-mqtt relocated and iotkit-comm-js no longer supported + java support removed. This gives mraa 0.9.0, upm 0.4.1 and mosquitto 1.4.
-* **dizzy-rt** same as dizzy-latest but with **real time** kernel. Switches the kernel to the PREEMPT_RT 3.10.17-rt kernel
-* **morty** experimental branch based on Yocto Morty, vanilla kernel 4.13
-* **morty-64** experimental branch based on Yocto Morty, vanilla kernel 4.13 (64 bit)
-* **pyro64** experimental branch based on Yocto Pyro, vanilla kernel 4.13 (64 bit). This version actually builds u-boot with `bitbake -R conf/u-boot.conf lib32-u-boot` (wiki to be updated)
+* **dizzy-rt** same as dizzy-latest but with **real time** kernel. Switches the kernel to the PREEMPT_RT 3.10.17-rt kernel.
+* **morty** experimental branch based on Yocto Morty, vanilla kernel 4.13.
+* **morty-64** experimental branch based on Yocto Morty, vanilla kernel 4.13 (64 bit).
+* **pyro64** experimental branch based on Yocto Pyro, vanilla kernel 4.13 (64 bit). This version actually builds u-boot with `bitbake -R conf/u-boot.conf lib32-u-boot` (wiki to be updated).
+* **rocko32** and **rocko64-acpi** with based on Yocto Rocko with kernel 4.16. 
+* **sumo32** and **sumo64-acpi** with based on Yocto Sumo with kernel 4.18
+
+# What to choose
+
+Yocto Morty and later will build on Ubuntu Artful (17.10) up to at least Cosmic (18.10).
 
-# How to use this
+Generally **sumo32** will give best results if you rely on MRAA and UPM. If you want highly configurable hardware and don't need MRAA, the **sumo64-acpi** enabled version is best. Also, all development on **master** will be focusing on the acpi enabled U-Boot and kernel.
 
-Yocto Morty / Pyro will build on Ubuntu Artful (17.10). For detailed instructions see the wiki [https://github.com/edison-fw/meta-intel-edison/wiki](https://github.com/edison-fw/meta-intel-edison/wiki)
+The 64 bit kernel exists because we can, but may be actually slower than the 32bit kernel.

docs/_data/edison.yml

@@ -54,6 +54,11 @@ folders:
     jurl: /0.5-Road-map.html
     ref: 0.5-Road-map
     pdf: true
+
+  - title: News
+    jurl: /0.6-News.html
+    ref: 0.6-News
+    pdf: true
 
 - title: Setting up
   pdf: true

docs/_docs/Edison/Introduction/0.5-Road-map.md

@@ -16,13 +16,10 @@ product: Edison
 
  6. Switch to Andy Shevshenko's kernel https://github.com/andy-shev/linux/tree/eds (done)
 
-    This work is in the morty branch and is highly experimental. Read on about what works, what not and how to get this working in [Current state of Edison Morty](https://github.com/htot/meta-intel-edison/wiki/Current-state-of-Edison-Morty "Current state of Edison Morty").
-
-
  7. Switch to 64-bit kernel (done in branch morty-64)
 
  8. Upgrade to pyro (done in pyro64)
 
  9. Get u-boot to build and work (done in pyro64)
 
- 10. Get acpi table to build in u-boot and linux (planned for pyro64-acpi)
+ 10. Get acpi table to build in u-boot and linux (done)

docs/_docs/Edison/Introduction/0.6-News.md

@@ -0,0 +1,24 @@
+---
+title: News
+permalink: 0.6-News.html
+sidebar: edison
+product: Edison
+---
+## What's new for this release
+ 1. Documentation  
+    This documentation has been added to sumo32 to reflect the status of the branch at all times.  
+    The documentation can be read using a mark down viewer like ReText or when stored on Github, by enabling Github to generate the documentation to Github Pages.  
+    If you prefer to generate the documentation locally, install Jekyll, go to the /docs directory and run:
+```
+    jekyll serve --incremental
+```
+ 2. Add edison-image-minimal
+
+    We have added a minimal image that others can include/require in their own application meta layers. It's easier to have a minimal image than removing stuff in the bbappends. Thanks Georgii Staroselskii.
+
+ 3. End of the line for sumo32 (non-acpi)  
+    With Andy Shevchenko focussing on ACPI ([Why ACPI and no-ACPI?](1.3-ACPI-or-not.html#why-acpi-and-no-acpi)) new kernels with the particular patches to get I2C working will become more and more difficult to maintain without any spectacular new features to be expected. The same holds for U-Boot.  
+
+    Instead, we will freeze sumo32 and only take pull requests for bug fixes.
+
+    {% include note.html content="Remember that the no-ACPI branch at this point in time is the only one where MRAA and UPM are working. If you are depending on MRAA stick to this branch. Or better, help us out by fixing MRAA Edison platform support." %}