9 files changed, 13 insertions, 120 deletions

diff --git a/classes/imx-boot-container.bbclass b/classes/imx-boot-container.bbclass
index 19b433128..a3496e8b4 100644
--- a/classes/imx-boot-container.bbclass
+++ b/classes/imx-boot-container.bbclass
@@ -33,16 +33,9 @@ do_resolve_and_populate_binaries[depends] += " \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'optee-os:do_deploy', '', d)} \
 "
 
-# Append make flags to include ATF load address
-EXTRA_OEMAKE += "ATF_LOAD_ADDR=${ATF_LOAD_ADDR}"
-
 # Define an additional task that collects binary output from dependent packages
 # and deploys them into the U-Boot build folder
 do_resolve_and_populate_binaries() {
-    if [ ! -n "${ATF_LOAD_ADDR}" ]; then
-        bberror "ATF_LOAD_ADDR is undefined, result binary would be unusable!"
-    fi
-
     if [ -n "${UBOOT_CONFIG}" ]; then
         for config in ${UBOOT_MACHINE}; do
             i=$(expr $i + 1);
diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf
index e20d3f2a5..1e8146a87 100644
--- a/conf/machine/imx8mq-evk.conf
+++ b/conf/machine/imx8mq-evk.conf
@@ -67,7 +67,6 @@ UBOOT_DTB_NAME = "imx8mq-evk.dtb"
 
 # Set ATF platform name
 ATF_PLATFORM = "imx8mq"
-ATF_LOAD_ADDR = "0x910000"
 
 # Extra firmware package name, that is required to build boot container for fslc bsp
 IMX_EXTRA_FIRMWARE = "firmware-imx-8m"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index c32402daa..9a8d9ad2f 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -165,10 +165,11 @@ MACHINEOVERRIDES_EXTENDER:mx8dxl:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:mx8-
 ### Mainline BSP specific overrides
 #######
 
-MACHINEOVERRIDES_EXTENDER:mx27:use-mainline-bsp   = "imx-generic-bsp:imx-mainline-bsp:mx27-generic-bsp:mx27-mainline-bsp"
-
+MACHINEOVERRIDES_EXTENDER:mx23:use-mainline-bsp   = "imx-generic-bsp:imx-mainline-bsp:mxs-generic-bsp:mxs-mainline-bsp:mx23-generic-bsp:mx23-mainline-bsp"
 MACHINEOVERRIDES_EXTENDER:mx28:use-mainline-bsp   = "imx-generic-bsp:imx-mainline-bsp:mxs-generic-bsp:mxs-mainline-bsp:mx28-generic-bsp:mx28-mainline-bsp"
 
+MACHINEOVERRIDES_EXTENDER:mx27:use-mainline-bsp   = "imx-generic-bsp:imx-mainline-bsp:mx27-generic-bsp:mx27-mainline-bsp"
+
 MACHINEOVERRIDES_EXTENDER:mx51:use-mainline-bsp   = "imx-generic-bsp:imx-mainline-bsp:mx5-generic-bsp:mx5-mainline-bsp:mx51-generic-bsp:mx51-mainline-bsp"
 MACHINEOVERRIDES_EXTENDER:mx53:use-mainline-bsp   = "imx-generic-bsp:imx-mainline-bsp:mx5-generic-bsp:mx5-mainline-bsp:mx53-generic-bsp:mx53-mainline-bsp"
 
diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc
index d6778caaa..eba4ac9f3 100644
--- a/conf/machine/include/imx8mm-evk.inc
+++ b/conf/machine/include/imx8mm-evk.inc
@@ -39,7 +39,6 @@ UBOOT_CONFIG[mfgtool]  = "${UBOOT_CONFIG_BASENAME}_defconfig"
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 ATF_PLATFORM = "imx8mm"
-ATF_LOAD_ADDR = "0x920000"
 
 # Extra firmware package name, that is required to build boot container for fslc bsp
 IMX_EXTRA_FIRMWARE = "firmware-imx-8m"
diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc
index 0f886c007..1404abd2d 100644
--- a/conf/machine/include/imx8mn-evk.inc
+++ b/conf/machine/include/imx8mn-evk.inc
@@ -40,7 +40,6 @@ UBOOT_CONFIG[mfgtool] = "${UBOOT_CONFIG_BASENAME}_defconfig"
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 ATF_PLATFORM = "imx8mn"
-ATF_LOAD_ADDR = "0x960000"
 
 # Extra firmware package name, that is required to build boot container for fslc bsp
 IMX_EXTRA_FIRMWARE = "firmware-imx-8m"
diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc
index fccfe0aa4..3e98d3c17 100644
--- a/conf/machine/include/imx8mp-evk.inc
+++ b/conf/machine/include/imx8mp-evk.inc
@@ -36,7 +36,6 @@ UBOOT_CONFIG[mfgtool] = "${UBOOT_CONFIG_BASENAME}_defconfig"
 SPL_BINARY = "spl/u-boot-spl.bin"
 
 ATF_PLATFORM = "imx8mp"
-ATF_LOAD_ADDR = "0x970000"
 
 # Extra firmware package name, that is required to build boot container for fslc bsp
 IMX_EXTRA_FIRMWARE = "firmware-imx-8m"
diff --git a/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch b/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch
deleted file mode 100644
index c3ee088fc..000000000
--- a/recipes-bsp/isp-imx/isp-imx/0001-isp-imx-drop-use-of-__TIME__-__DATE__.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From ea5ce303fa5bc7b6a17c522b4caf49d349adb12b Mon Sep 17 00:00:00 2001
-From: Max Krummenacher <max.krummenacher@toradex.com>
-Date: Sat, 30 Oct 2021 17:26:42 +0200
-Subject: [PATCH] isp-imx: drop use of __TIME__, __DATE__
-
-With reproducible build enabled the compiler is configured to throw
-an error if __TIME__, __DATE__ preprocessor macros are used.
-
-| isp-imx-4.2.2.11.0/mediacontrol/daemon/main_v4l2.cpp:99:44: error: macro "__DATE__" might prevent reproducible builds [-Werror=date-time]
-|    99 |              std::cout << "Build Time : "<<__DATE__<<", "<<__TIME__<<std::endl;
-|       |                                            ^~~~~~~~
-
-Fix this by replacing __DATE__, __TIME__ with BUILD_DATE and setting
-BUILD_DATE from CMakeLists.txt to either SOURCE_DATE_EPOCH if present
-or the local time otherwise.
-
-Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
----
- mediacontrol/CMakeLists.txt       | 3 +++
- mediacontrol/daemon/main_v4l2.cpp | 8 ++++----
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/mediacontrol/CMakeLists.txt b/mediacontrol/CMakeLists.txt
-index 5849c163e..8a8e1a4a0 100755
---- a/mediacontrol/CMakeLists.txt
-+++ b/mediacontrol/CMakeLists.txt
-@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.1.0)
- 
- project(ISP_MEDIA_CONTROL)
- 
-+string(TIMESTAMP BUILD_DATE "%b %d %Y" UTC)
-+add_compile_definitions(BUILD_DATE="${BUILD_DATE}")
-+
- if( NOT DEFINED APPSHELL_TOP_COMPILE)
-     if(DEFINED PLATFORM)
-         if(${PLATFORM} STREQUAL ARM64)
-diff --git a/mediacontrol/daemon/main_v4l2.cpp b/mediacontrol/daemon/main_v4l2.cpp
-index d3d1c2423..dd0514358 100644
---- a/mediacontrol/daemon/main_v4l2.cpp
-+++ b/mediacontrol/daemon/main_v4l2.cpp
-@@ -105,7 +105,7 @@ int main(int argc, char* argv[]) {
-          if(!(string2Version.find(argv[1])==string2Version.end())){
-              std::cout << "Version : "<<MEDIA_SERVER_VERSION<<std::endl;
- #ifndef ANDROID
--             std::cout << "Build Time : "<<__DATE__<<", "<<__TIME__<<std::endl;
-+             std::cout << "Build Time : "<<BUILD_DATE<<std::endl;
- #endif
-              return 0;
-          }
-@@ -116,8 +116,8 @@ int main(int argc, char* argv[]) {
-     {
-         ALOGI("******************************************************************");
- #ifndef ANDROID
--        ALOGI("VIV ISP Media Control Framework V%s (%s, %s)",
--              MEDIA_SERVER_VERSION, __DATE__, __TIME__);
-+        ALOGI("VIV ISP Media Control Framework V%s (%s)",
-+              MEDIA_SERVER_VERSION, BUILD_DATE);
- #else
-         ALOGI("VIV ISP Media Control Framework V%s", MEDIA_SERVER_VERSION);
- #endif
-@@ -138,7 +138,7 @@ int main(int argc, char* argv[]) {
-                 if(!(string2Version.find(argv[i])==string2Version.end())){
-                     std::cout << "Version : "<<MEDIA_SERVER_VERSION<<std::endl;
- #ifndef ANDROID
--                    std::cout << "Build Time : "<<__DATE__<<", "<<__TIME__<<std::endl;
-+                    std::cout << "Build Time : "<<BUILD_DATE<<std::endl;
- #endif
-                     i++;
-                     continue;
--- 
-2.20.1
-
diff --git a/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch b/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch
index 950098cd7..bfea33a7b 100644
--- a/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch
+++ b/recipes-bsp/isp-imx/isp-imx/0001-start_isp.sh-fix-NR_DEVICE_TREE_BASLER-variable.patch
@@ -1,17 +1,17 @@
-From 9c65e20b82cfd9e82b849b3140eec7b8c18922dc Mon Sep 17 00:00:00 2001
-From: Chris Dimich <Chris.Dimich@boundarydevices.com>
-Date: Mon, 13 Sep 2021 17:56:02 -0700
+From a48c605b9f3860ee7abaca1a37add444a1b4001a Mon Sep 17 00:00:00 2001
+From: Chris Dimich <chris.dimich@boundarydevices.com>
+Date: Tue, 8 Mar 2022 14:45:28 -0800
 Subject: [PATCH 1/1] start_isp.sh: fix NR_DEVICE_TREE_BASLER variable
 
-Also remove uneeded -lm option from run.sh script.
+The NR_DEVICE_TREE_BASLER variable has the wrong path.
 
-Signed-off-by: Chris Dimich <Chris.Dimich@boundarydevices.com>
+Signed-off-by: Chris Dimich <chris.dimich@boundarydevices.com>
 ---
- imx/start_isp.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ imx/start_isp.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/imx/start_isp.sh b/imx/start_isp.sh
-index 6daabc59c..250226935 100755
+index 6daabc59c..8a07acfed 100755
 --- a/imx/start_isp.sh
 +++ b/imx/start_isp.sh
 @@ -7,7 +7,7 @@
@@ -23,31 +23,6 @@ index 6daabc59c..250226935 100755
  NR_DEVICE_TREE_OV5640=$(grep ov5640 /sys/firmware/devicetree/base/soc@0/*/i2c@*/*/compatible -l | wc -l 2> /dev/null)
  
  # check if the basler device has been enabled in the device tree
-@@ -21,13 +21,13 @@ if [ $NR_DEVICE_TREE_BASLER -eq 1 ]; then
- 
-                # Default configuration for Basler daA3840-30mc: basler_4k
-                # Available configurations: basler_4k, basler_1080p60, basler_4khdr, basler_1080p60hdr
--               exec ./run.sh -c basler_4k -lm
-+               exec ./run.sh -c basler_4k
- 
-        elif [ $NR_DEVICE_TREE_OV5640 -eq 1 ]; then
- 
-                # Default configuration for Basler daA3840-30mc: basler_1080p60
-                # Available configurations: basler_1080p60, basler_1080p60hdr
--               exec ./run.sh -c basler_1080p60 -lm
-+               exec ./run.sh -c basler_1080p60
- 
-        fi
- 
-@@ -38,7 +38,7 @@ elif [ $NR_DEVICE_TREE_BASLER -eq 2 ]; then
-        cd $RUNTIME_DIR
-        # Default configuration for Basler daA3840-30mc: dual_basler_1080p60
-        # Available configurations: dual_basler_1080p60, dual_basler_1080p60hdr, dual_basler_1080p25hdr
--       exec ./run.sh -c dual_basler_1080p60 -lm
-+       exec ./run.sh -c dual_basler_1080p60
- 
- else
-        # no device tree found exit with code no device or address
 -- 
 2.31.1
 
diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend
index 7aceb6b17..6a2aabec4 100644
--- a/recipes-graphics/wayland/weston-init.bbappend
+++ b/recipes-graphics/wayland/weston-init.bbappend
@@ -28,8 +28,8 @@ INI_UNCOMMENT_ASSIGNMENTS:append:mx8mq-nxp-bsp = " \
 # Ideally, this should be seamless and Vivante ought to handle it internally and take the fastest
 # rendering code.
 INI_UNCOMMENT_USE_G2D:imxgpu2d ?= "use-g2d=1"
-INI_UNCOMMENT_USE_G2D:mx8qm-nxp-bsp = ""
-INI_UNCOMMENT_USE_G2D:mx8qxp-nxp-bsp = ""
+INI_UNCOMMENT_USE_G2D:imxgpu2d:mx8qm-nxp-bsp = ""
+INI_UNCOMMENT_USE_G2D:imxgpu2d:mx8qxp-nxp-bsp = ""
 INI_UNCOMMENT_ASSIGNMENTS:append:imxgpu2d = " \
     ${INI_UNCOMMENT_USE_G2D} \
 "