Merge pull request #20 from advancedtelematic/rocko-to-master

Rocko to master

13 files changed, 31 insertions, 310 deletions

diff --git a/meta-sota-raspberrypi/conf/layer.conf b/meta-sota-raspberrypi/conf/layer.conf
index c2c3542..29e9a6c 100644
--- a/meta-sota-raspberrypi/conf/layer.conf
+++ b/meta-sota-raspberrypi/conf/layer.conf
@@ -9,3 +9,4 @@ BBFILE_COLLECTIONS += "updater-raspberrypi"
 BBFILE_PATTERN_updater-raspberrypi = "^${LAYERDIR}/"
 BBFILE_PRIORITY_updater-raspberrypi = "7"
 
+LAYERSERIES_COMPAT_updater-raspberrypi = "sumo"
diff --git a/meta-sota-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend b/meta-sota-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend
index 9222fd5..5073560 100644
--- a/meta-sota-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend
+++ b/meta-sota-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend
@@ -11,13 +11,7 @@ do_deploy_append() {
 
     echo "avoid_warnings=2" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
     echo "mask_gpu_interrupt0=0x400" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-    echo "dtoverlay=vc4-kms-v3d-overlay,cma-256" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-    echo "dtoverlay=rpi-ft5406-overlay" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
     echo "dtparam=audio=on" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
 }
 
-do_deploy_append_sota() {
-    echo "device_tree_address=0x0c800000" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-}
-
 ENABLE_UART_raspberrypi3 = "1"
diff --git a/meta-sota-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript/uEnv.txt b/meta-sota-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript/uEnv.txt
index f6c0570..ede4234 100644
--- a/meta-sota-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript/uEnv.txt
+++ b/meta-sota-raspberrypi/recipes-bsp/u-boot-otascript/u-boot-otascript/uEnv.txt
@@ -3,5 +3,5 @@ bootcmd_dtb=fdt addr $fdt_addr_r; fdt get value bootargs_fdt /chosen bootargs
 bootcmd_otenv=ext2load mmc 0:2 $loadaddr /boot/loader/uEnv.txt; env import -t $loadaddr $filesize
 bootcmd_args=setenv bootargs "$bootargs $bootargs_fdt ostree_root=/dev/mmcblk0p2 root=/dev/ram0 rw rootwait rootdelay=2 ramdisk_size=8192"
 bootcmd_load=ext2load mmc 0:2 $kernel_addr_r "/boot"$kernel_image; ext2load mmc 0:2 $ramdisk_addr_r "/boot"$ramdisk_image
-bootcmd_run=bootm $kernel_addr_r $ramdisk_addr_r $fdt_addr_r
-bootcmd=run bootcmd_dtb; run bootcmd_otenv; run bootcmd_args; run bootcmd_load; run bootcmd_run
+bootcmd_run=bootm $kernel_addr_r $ramdisk_addr_r
+bootcmd=run bootcmd_otenv; run bootcmd_args; run bootcmd_load; run bootcmd_run
diff --git a/meta-sota-raspberrypi/recipes-bsp/u-boot/files/0001-Enable-FIT.patch b/meta-sota-raspberrypi/recipes-bsp/u-boot/files/0001-Enable-FIT.patch
new file mode 100644
index 0000000..fb8fa09
--- /dev/null
+++ b/meta-sota-raspberrypi/recipes-bsp/u-boot/files/0001-Enable-FIT.patch
@@ -0,0 +1,23 @@
+From d6323c4aacff2922051cf801eb7c2661b437baf6 Mon Sep 17 00:00:00 2001
+From: Anton Gerasimov <anton@advancedtelematic.com>
+Date: Tue, 13 Feb 2018 15:16:00 +0100
+Subject: [PATCH] Enable FIT
+
+---
+ configs/rpi_3_32b_defconfig | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
+index bb56a9e4e1..b366a3a061 100644
+--- a/configs/rpi_3_32b_defconfig
++++ b/configs/rpi_3_32b_defconfig
+@@ -36,3 +36,6 @@ CONFIG_SYS_WHITE_ON_BLACK=y
+ CONFIG_CONSOLE_SCROLL_LINES=10
+ CONFIG_PHYS_TO_BUS=y
+ CONFIG_OF_LIBFDT_OVERLAY=y
++
++CONFIG_FIT=y
++CONFIG_FIT_VERBOSE=y
+-- 
+2.15.1
+
diff --git a/meta-sota-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-sota-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend
new file mode 100644
index 0000000..b99397b
--- /dev/null
+++ b/meta-sota-raspberrypi/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI_append = " file://0001-Enable-FIT.patch "
diff --git a/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi/0001-Smack-File-receive-for-sockets.patch b/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi/0001-Smack-File-receive-for-sockets.patch
deleted file mode 100644
index 4021e5d..0000000
--- a/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi/0001-Smack-File-receive-for-sockets.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 2b206c36b16e72cfe41cd22448d8527359ffd962 Mon Sep 17 00:00:00 2001
-From: Casey Schaufler <casey@schaufler-ca.com>
-Date: Mon, 7 Dec 2015 14:34:32 -0800
-Subject: [PATCH 1/4] Smack: File receive for sockets
-
-The existing file receive hook checks for access on
-the file inode even for UDS. This is not right, as
-the inode is not used by Smack to make access checks
-for sockets. This change checks for an appropriate
-access relationship between the receiving (current)
-process and the socket. If the process can't write
-to the socket's send label or the socket's receive
-label can't write to the process fail.
-
-This will allow the legitimate cases, where the
-socket sender and socket receiver can freely communicate.
-Only strangly set socket labels should cause a problem.
-
-Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
----
- security/smack/smack_lsm.c | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
-index ff81026..b20ef06 100644
---- a/security/smack/smack_lsm.c
-+++ b/security/smack/smack_lsm.c
-@@ -1860,12 +1860,34 @@ static int smack_file_receive(struct file *file)
-        int may = 0;
-        struct smk_audit_info ad;
-        struct inode *inode = file_inode(file);
-+       struct socket *sock;
-+       struct task_smack *tsp;
-+       struct socket_smack *ssp;
- 
-        if (unlikely(IS_PRIVATE(inode)))
-                return 0;
- 
-        smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_PATH);
-        smk_ad_setfield_u_fs_path(&ad, file->f_path);
-+
-+       if (S_ISSOCK(inode->i_mode)) {
-+               sock = SOCKET_I(inode);
-+               ssp = sock->sk->sk_security;
-+               tsp = current_security();
-+               /*
-+                * If the receiving process can't write to the
-+                * passed socket or if the passed socket can't
-+                * write to the receiving process don't accept
-+                * the passed socket.
-+                */
-+               rc = smk_access(tsp->smk_task, ssp->smk_out, MAY_WRITE, &ad);
-+               rc = smk_bu_file(file, may, rc);
-+               if (rc < 0)
-+                       return rc;
-+               rc = smk_access(ssp->smk_in, tsp->smk_task, MAY_WRITE, &ad);
-+               rc = smk_bu_file(file, may, rc);
-+               return rc;
-+       }
-        /*
-         * This code relies on bitmasks.
-         */
--- 
-2.7.4
-
diff --git a/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi/0002-faytech-fix-rpi.patch b/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi/0002-faytech-fix-rpi.patch
deleted file mode 100644
index 00e3692..0000000
--- a/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi/0002-faytech-fix-rpi.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f9fefc63456dd50eeec727ae2fbc13b0d84eb44e Mon Sep 17 00:00:00 2001
-From: Tom Pollard <tom.pollard@codethink.co.uk>
-Date: Wed, 6 Apr 2016 07:47:25 +0000
-Subject: [PATCH 1/1] Fix lack of touch up for Faytech 10" Touchscreen MonitorV2
-
-NOTE: This is a very temporary hack that is not in a state to be upstreamed yet.
----
-Index: a/drivers/hid/hid-multitouch.c
-===================================================================
---- a/drivers/hid/hid-multitouch.c      2016-07-05 08:45:06.006466000 +0000
-+++ b/drivers/hid/hid-multitouch.c      2016-07-05 08:48:44.574466000 +0000
-@@ -205,7 +205,6 @@
-        { .name = MT_CLS_WIN_8,
-                .quirks = MT_QUIRK_ALWAYS_VALID |
-                        MT_QUIRK_IGNORE_DUPLICATES |
--                       MT_QUIRK_HOVERING |
-                        MT_QUIRK_CONTACT_CNT_ACCURATE },
-        { .name = MT_CLS_EXPORT_ALL_INPUTS,
-                .quirks = MT_QUIRK_ALWAYS_VALID |
-@@ -396,11 +395,6 @@
-                        td->is_buttonpad = true;
- 
-                break;
--       case 0xff0000c5:
--               /* Retrieve the Win8 blob once to enable some devices */
--               if (usage->usage_index == 0)
--                       mt_get_feature(hdev, field->report);
--               break;
-        }
- }
- 
--- 
-1.9.1
diff --git a/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi/0002-smack-fix-cache-of-access-labels.patch b/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi/0002-smack-fix-cache-of-access-labels.patch
deleted file mode 100644
index c516f3a..0000000
--- a/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi/0002-smack-fix-cache-of-access-labels.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 99267706991ab84bd44ceaea9a7ec886bbdd58e0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jobol@nonadev.net>
-Date: Tue, 12 Jan 2016 21:23:40 +0100
-Subject: [PATCH 2/4] smack: fix cache of access labels
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Before this commit, removing the access property of
-a file, aka, the extended attribute security.SMACK64
-was not effictive until the cache had been cleaned.
-
-This patch fixes that problem.
-
-Signed-off-by: José Bollo <jobol@nonadev.net>
-Acked-by: Casey Schaufler <casey@schaufler-ca.com>
----
- security/smack/smack_lsm.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
-index b20ef06..b2bcb14 100644
---- a/security/smack/smack_lsm.c
-+++ b/security/smack/smack_lsm.c
-@@ -1444,9 +1444,13 @@ static int smack_inode_removexattr(struct dentry *dentry, const char *name)
-         * Don't do anything special for these.
-         *      XATTR_NAME_SMACKIPIN
-         *      XATTR_NAME_SMACKIPOUT
--        *      XATTR_NAME_SMACKEXEC
-         */
--       if (strcmp(name, XATTR_NAME_SMACK) == 0)
-+       if (strcmp(name, XATTR_NAME_SMACK) == 0) {
-+               struct super_block *sbp = d_backing_inode(dentry)->i_sb;
-+               struct superblock_smack *sbsp = sbp->s_security;
-+
-+               isp->smk_inode = sbsp->smk_default;
-+       } else if (strcmp(name, XATTR_NAME_SMACKEXEC) == 0)
-                isp->smk_task = NULL;
-        else if (strcmp(name, XATTR_NAME_SMACKMMAP) == 0)
-                isp->smk_mmap = NULL;
--- 
-2.7.4
-
diff --git a/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi/0003-Smack-ignore-null-signal-in-smack_task_kill.patch b/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi/0003-Smack-ignore-null-signal-in-smack_task_kill.patch
deleted file mode 100644
index c9180bb..0000000
--- a/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi/0003-Smack-ignore-null-signal-in-smack_task_kill.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ec4eb03af07b0fbc330aecca6ac4ebd6accd8825 Mon Sep 17 00:00:00 2001
-From: Rafal Krypa <r.krypa@samsung.com>
-Date: Mon, 4 Apr 2016 11:14:53 +0200
-Subject: [PATCH 3/4] Smack: ignore null signal in smack_task_kill
-
-Kill with signal number 0 is commonly used for checking PID existence.
-Smack treated such cases like any other kills, although no signal is
-actually delivered when sig == 0.
-
-Checking permissions when sig == 0 didn't prevent an unprivileged caller
-from learning whether PID exists or not. When it existed, kernel returned
-EPERM, when it didn't - ESRCH. The only effect of policy check in such
-case is noise in audit logs.
-
-This change lets Smack silently ignore kill() invocations with sig == 0.
-
-Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
-Acked-by: Casey Schaufler <casey@schaufler-ca.com>
----
- security/smack/smack_lsm.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
-index b2bcb14..cf8a93f 100644
---- a/security/smack/smack_lsm.c
-+++ b/security/smack/smack_lsm.c
-@@ -2239,6 +2239,9 @@ static int smack_task_kill(struct task_struct *p, struct siginfo *info,
-        struct smack_known *tkp = smk_of_task_struct(p);
-        int rc;
- 
-+       if (!sig)
-+               return 0; /* null signal; existence test */
-+
-        smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_TASK);
-        smk_ad_setfield_u_tsk(&ad, p);
-        /*
--- 
-2.7.4
-
diff --git a/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi/0004-Smack-Assign-smack_known_web-label-for-kernel-thread.patch b/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi/0004-Smack-Assign-smack_known_web-label-for-kernel-thread.patch
deleted file mode 100644
index a1eeac3..0000000
--- a/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi/0004-Smack-Assign-smack_known_web-label-for-kernel-thread.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From c8bbb0f916de54610513e376070aea531af19dd6 Mon Sep 17 00:00:00 2001
-From: jooseong lee <jooseong.lee@samsung.com>
-Date: Thu, 3 Nov 2016 10:55:43 +0100
-Subject: [PATCH 4/4] Smack: Assign smack_known_web label for kernel thread's
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Assign smack_known_web label for kernel thread's socket in the sk_alloc_security hook
-
-Creating struct sock by sk_alloc function in various kernel subsystems
-like bluetooth dosen't call smack_socket_post_create(). In such case,
-received sock label is the floor('_') label and makes access deny.
-
-Refers-to: https://review.tizen.org/gerrit/#/c/80717/4
-
-Change-Id: I2e5c9359bfede84a988fd4d4d74cdb9dfdfc52d8
-Signed-off-by: jooseong lee <jooseong.lee@samsung.com>
-Signed-off-by: José Bollo <jose.bollo@iot.bzh>
----
- security/smack/smack_lsm.c | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
-index cf8a93f..21651bc 100644
---- a/security/smack/smack_lsm.c
-+++ b/security/smack/smack_lsm.c
-@@ -2321,8 +2321,16 @@ static int smack_sk_alloc_security(struct sock *sk, int family, gfp_t gfp_flags)
-        if (ssp == NULL)
-                return -ENOMEM;
- 
--       ssp->smk_in = skp;
--       ssp->smk_out = skp;
-+       /*
-+        * Sockets created by kernel threads receive web label.
-+        */
-+       if (unlikely(current->flags & PF_KTHREAD)) {
-+               ssp->smk_in = &smack_known_web;
-+               ssp->smk_out = &smack_known_web;
-+       } else {
-+               ssp->smk_in = skp;
-+               ssp->smk_out = skp;
-+       }
-        ssp->smk_packet = NULL;
- 
-        sk->sk_security = ssp;
--- 
-2.7.4
-
diff --git a/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend b/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend
index 451aa94..e2e7e60 100644
--- a/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend
+++ b/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend
@@ -1,72 +1,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
-SRC_URI_append = "\
-        ${@oe.utils.conditional('USE_FAYTECH_MONITOR', '1', 'file://0002-faytech-fix-rpi.patch', '', d)} \
-"
-
-do_configure_append_smack() {
-    # SMACK and Co
-    kernel_configure_variable IP_NF_SECURITY m
-    kernel_configure_variable IP6_NF_SECURITY m
-    kernel_configure_variable EXT2_FS_SECURITY y
-    kernel_configure_variable EXT3_FS_SECURITY y
-    kernel_configure_variable EXT4_FS_SECURITY y
-    kernel_configure_variable SECURITY y
-    kernel_configure_variable SECURITY_SMACK y
-    kernel_configure_variable TMPFS_XATTR y
-    kernel_configure_variable DEFAULT_SECURITY "smack"
-    kernel_configure_variable DEFAULT_SECURITY_SMACK y
-    kernel_configure_variable FANOTIFY_ACCESS_PERMISSIONS y
-}
-
-do_configure_append_netboot() {
-    # NBD for netboot
-    kernel_configure_variable BLK_DEV_NBD y
-    # ramblk for inird
-    kernel_configure_variable BLK_DEV_RAM y
-}
-
 do_configure_append_sota() {
     # ramblk for inird
     kernel_configure_variable BLK_DEV_RAM y
 }
 
-do_configure_append() {
-
-    # VC4 Wayland/Weston
-    kernel_configure_variable I2C_BCM2835 y
-    kernel_configure_variable DRM y
-    kernel_configure_variable DRM_PANEL_RASPBERRYPI_TOUCHSCREEN y
-    kernel_configure_variable DRM_VC4 y
-    kernel_configure_variable FB_BCM2708 n
-
-    # Enable support for TP-Link TL-W722N USB Wifi adapter
-    kernel_configure_variable CONFIG_ATH_CARDS m
-    kernel_configure_variable CONFIG_ATH9K_HTC m
-
-    # Enable support for RTLSDR
-    kernel_configure_variable CONFIG_MEDIA_USB_SUPPORT y
-    kernel_configure_variable CONFIG_MEDIA_DIGITAL_TV_SUPPORT y
-    kernel_configure_variable CONFIG_DVB_USB_V2 m
-    kernel_configure_variable CONFIG_DVB_USB_RTL28XXU m
-
-    # KEEP until fixed upstream:
-      # Keep this the last line
-      # Remove all modified configs and add the rest to .config
-      sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${B}/.config'
-
-      yes '' | oe_runmake oldconfig
-      kernel_do_configure
-}
-
-CMDLINE_DEBUG = ""
-CMDLINE_append = " usbhid.mousepoll=0"
-
-# Add options to allow CMA to operate
-CMDLINE_append = ' ${@oe.utils.conditional("ENABLE_CMA", "1", "coherent_pool=6M smsc95xx.turbo_mode=N", "", d)}'
-
-KERNEL_MODULE_AUTOLOAD += "snd-bcm2835"
-KERNEL_MODULE_AUTOLOAD += "hid-multitouch"
-
-RDEPENDS_${PN} += "kernel-module-snd-bcm2835"
-PACKAGES += "kernel-module-snd-bcm2835"
diff --git a/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.9.bbappend b/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.9.bbappend
deleted file mode 100644
index 206a8d0..0000000
--- a/meta-sota-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.9.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-#-------------------------------------------------------------------------
-# smack patches for handling bluetooth
-
-SRC_URI_append_smack = "\
-       file://0004-Smack-Assign-smack_known_web-label-for-kernel-thread.patch \
-"
diff --git a/meta-sota-raspberrypi/scripts/flash-image.sh b/meta-sota-raspberrypi/scripts/flash-image.sh
index 74707bc..9692137 100755
--- a/meta-sota-raspberrypi/scripts/flash-image.sh
+++ b/meta-sota-raspberrypi/scripts/flash-image.sh
@@ -55,7 +55,7 @@ if [ -z "$1" ]; then
   echo "      Example: sdb"
   echo ""
   echo "    imagefile  : An image file generated by bitbake (optional)."
-  echo "      Default: ./tmp/deploy/images/raspberrypi3/rpi-basic-image-raspberrypi3.rpi-sdimg-ota"
+  echo "      Default: ./tmp/deploy/images/raspberrypi3/rpi-basic-image-raspberrypi3.wic"
   echo ""
   echo "   The following utilities are prerequisites:"
   echo ""
@@ -71,7 +71,7 @@ fi
 set -euo pipefail
 
 DEVICE_TO_FLASH=$1
-IMAGE_TO_FLASH="${2-tmp/deploy/images/raspberrypi3/rpi-basic-image-raspberrypi3.rpi-sdimg-ota}"
+IMAGE_TO_FLASH="${2-tmp/deploy/images/raspberrypi3/rpi-basic-image-raspberrypi3.wic}"
 DEVICE_IS_REMOVABLE=$(cat /sys/block/$DEVICE_TO_FLASH/removable)
 
 if [[ $DEVICE_IS_REMOVABLE != "1" ]]; then