diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2019-06-07 21:27:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2019-06-07 21:27:59 +0000 |
| commit | c38284c5452f8475a81593bf930064d10fc58b42 (patch) | |
| tree | 87f85dd903e604409ff287a1dbaef54105f9f376 | |
| parent | a039cce0977ca33e4532de87fd4a1867cc7b21a7 (diff) | |
| parent | 9e3e2903101b30e923a3d0bae86f8c36028fdc6b (diff) | |
Merge changes If80c4e71,Ic0cf9128
* changes:
Fix : do_patch waring weston 6.0.0
[RCAR] Remove unnecessary device tree file
| -rw-r--r-- | meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappend | 20 | ||||
| -rw-r--r-- | meta-agl-bsp/recipes-graphics/wayland/weston/0001-make-error-portable.patch | 10 |
2 files changed, 25 insertions, 5 deletions
diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappend b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappend index b32523f77..72a4a78ef 100644 --- a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappend @@ -8,3 +8,23 @@ SRC_URI_append_ulcb = " \ SRC_URI_remove_ulcb = " \ file://0113-arm64-dts-ulcb-kf-increase-SDIO-frequency-for-WLAN-c.patch \ " + +KERNEL_DEVICETREE_remove_h3ulcb = " \ + renesas/r8a7795-es1-h3ulcb-view.dtb \ + renesas/r8a7795-es1-h3ulcb-had-alfa.dtb \ + renesas/r8a7795-es1-h3ulcb-had-beta.dtb \ + renesas/r8a7795-es1-h3ulcb-vb.dtb \ + renesas/r8a7795-es1-h3ulcb-vb2.dtb \ + renesas/r8a7795-es1-h3ulcb-vbm.dtb \ + renesas/r8a7795-h3ulcb-view.dtb \ + renesas/r8a7795-h3ulcb-had-alfa.dtb \ + renesas/r8a7795-h3ulcb-had-beta.dtb \ + renesas/r8a7795-h3ulcb-vb.dtb \ + renesas/r8a7795-h3ulcb-vb2.dtb \ + renesas/r8a7795-h3ulcb-vb2.1.dtb \ + renesas/r8a7795-h3ulcb-vbm.dtb \ + renesas/r8a7795-h3ulcb-4x2g-vb.dtb \ + renesas/r8a7795-h3ulcb-4x2g-vb2.dtb \ + renesas/r8a7795-h3ulcb-4x2g-vb2.1.dtb \ + renesas/r8a7795-h3ulcb-4x2g-vbm.dtb \ +" diff --git a/meta-agl-bsp/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/meta-agl-bsp/recipes-graphics/wayland/weston/0001-make-error-portable.patch index 09ec1559e..0eb3d95a6 100644 --- a/meta-agl-bsp/recipes-graphics/wayland/weston/0001-make-error-portable.patch +++ b/meta-agl-bsp/recipes-graphics/wayland/weston/0001-make-error-portable.patch @@ -1,4 +1,4 @@ -From ad1d2161c811cff25d1684c33611f300adb753bc Mon Sep 17 00:00:00 2001 +From c4677e155736062e75687f1a655732c8902e912b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 29 May 2015 20:56:00 -0700 Subject: [PATCH] make error() portable @@ -18,12 +18,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> create mode 100644 libweston/weston-error.h diff --git a/configure.ac b/configure.ac -index 7aebbdb..dc9c802 100644 +index c05ad01..6da6e04 100644 --- a/configure.ac +++ b/configure.ac -@@ -109,6 +109,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], +@@ -126,6 +126,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], + [AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile weston")], [[#include <time.h>]]) - AC_CHECK_HEADERS([execinfo.h]) +AC_CHECK_HEADERS([error.h]) + @@ -57,7 +57,7 @@ index 0000000..2089d02 +#endif + diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c -index 1adcf21..166bf3b 100644 +index bf73e0d..9064439 100644 --- a/libweston/weston-launch.c +++ b/libweston/weston-launch.c @@ -33,7 +33,6 @@ |