summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorOleksandr Suvorov <oleksandr.suvorov@toradex.com>2021-06-15 18:02:21 +0300
committerAndrejs Cainikovs <andrejs.cainikovs@toradex.com>2022-12-23 15:22:11 +0100
commitc05fa5bbffbbd6297d29e427221bb42f48f7e46a (patch)
treec7a930fc7868608bbc70ad611a80377c2cca76f4 /include
parent74aa44d4d551d430f4e8a7a15953f309d5739f60 (diff)
apalis/colibri-imx8/8x: remove global variable script
The distroboot script system scans boot_scripts variable and try to find and use to boot each script name mentioned there. Setting global variable "script" breaks this general mechanism of searching and running a distro boot script. Remove global variables "script" to fix working the general distro boot script mechanism. Upstream-Status: Submitted [https://lore.kernel.org/all/20221212000930.45505-9-marcel@ziswiler.com/] Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/apalis-imx8.h1
-rw-r--r--include/configs/colibri-imx8x.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index 4fc06ceba0..3488060f55 100644
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -50,7 +50,6 @@
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
"mmcpart=1\0" \
"panel=NULL\0" \
- "script=boot.scr\0" \
"update_uboot=askenv confirm Did you load u-boot-dtb.imx (y/N)?; " \
"if test \"$confirm\" = \"y\"; then " \
"setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt " \
diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index ae5a8ff6a9..2da7edc773 100644
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -81,7 +81,6 @@
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
"mmcpart=1\0" \
"panel=NULL\0" \
- "script=boot.scr\0" \
"update_uboot=askenv confirm Did you load u-boot-dtb.imx (y/N)?; " \
"if test \"$confirm\" = \"y\"; then " \
"setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt " \