From c81707c3e24babda53520547e1b857f936b98b26 Mon Sep 17 00:00:00 2001 From: Christian Mauderer Date: Wed, 29 Jul 2020 10:55:18 +0200 Subject: [PATCH] README: Update with information for RTEMS 6 --- README.md | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9ab8a260..7794b12b 100644 --- a/README.md +++ b/README.md @@ -170,17 +170,23 @@ Branches * master - branch intended for the RTEMS master which tracks the FreeBSD master branch. This branch must be used for libbsd development. Back ports to the - 5-freebsd-12 are allowed. + 6-freebsd-12 are allowed. -* 5-freebsd-12 - branch intended for RTEMS 5 which tracks the FreeBSD stable/12 +* 6-freebsd-12 - branch intended for RTEMS 6 which tracks the FreeBSD stable/12 branch. This branch is maintained and regular updates from FreeBSD are planned. It is recommended for production systems. +* 5-freebsd-12 - branch belongs to the RTEMS 5 release. It is based on FreeBSD + stable/12 branch. It is recommended for production systems that use RTEMS 5. + +* 5 - branch belongs to the RTEMS 5 release. It is based on a FreeBSD + development version. + * freebsd-9.3 - branch for some RTEMS version with a FreeBSD 9.3 baseline. - This branch is unmaintained. It is recommended to update to RTEMS 5. + This branch is unmaintained. It is recommended to update to RTEMS 5 or 6. * 4.11 - branch for the RTEMS 4.11 release series. This branch is - unmaintained. It is recommended to update to RTEMS 5. + unmaintained. It is recommended to update to RTEMS 5 or 6. Updating RTEMS Waf Support --------------------------