From 284e4dcaf39f7ba08af5938f0e20d4e6b5862c31 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan.agner@toradex.com>
Date: Fri, 27 Sep 2019 10:28:24 +0200
Subject: Revert "u-boot-distro-boot: run setup for torizon"

This reverts commit 3ad48d3c8a8fa5a1364450ea101b839140656279.

Running the machine specific setup is not how distro boot should
be used. Also this breaks Colibri iMX7s (and probably Colibri
iMX6ULL) PSCI support. Revert this and fix the firmware loading
issue separately.

Related-to: #52562
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
---
 recipes-bsp/u-boot/u-boot-distro-boot/sota/boot.cmd.in | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-distro-boot/sota/boot.cmd.in b/recipes-bsp/u-boot/u-boot-distro-boot/sota/boot.cmd.in
index cc02599..ca06f1d 100644
--- a/recipes-bsp/u-boot/u-boot-distro-boot/sota/boot.cmd.in
+++ b/recipes-bsp/u-boot/u-boot-distro-boot/sota/boot.cmd.in
@@ -4,16 +4,12 @@ then
     exit
 fi
 
-if test -n ${setup}
-then
-    run setup
-fi
-
 env set overlays_file "overlays.txt"
 env set load_overlay 'load ${devtype} ${devnum}:1 ${loadaddr} ${overlays_file}; env import -t ${loadaddr} ${filesize}'
 env set apply_overlays 'fdt addr ${fdt_addr_r} && fdt resize 0x20000 && for overlay_file in ${fdt_overlays}; do echo "Applying Overlay: ${overlay_file}"
 && load ${devtype} ${devnum}:1 ${loadaddr} ${overlay_file} && fdt apply ${loadaddr}; done;'
 
+
 env set bootcmd_load_k 'load ${devtype} ${devnum}:2 ${kernel_addr_r} "/boot"${kernel_image}'
 env set bootcmd_load_r 'load ${devtype} ${devnum}:2 ${ramdisk_addr_r} "/boot"${ramdisk_image}; env set ramdisk_size ${filesize}'
 
-- 
cgit v1.2.3