From 1859290b6a8051119d0edd34bacc9af89e7f7a51 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Thu, 29 Nov 2018 11:01:58 +0100 Subject: barebox-mx6: fix bootsource selection Also disable the bootchooser which is no longer used. Signed-off-by: Rouven Czerwinski --- configs/platform-v7a/barebox-mx6-defaultenv/init/bootsource | 8 ++++---- configs/platform-v7a/barebox-mx6.config | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/init/bootsource b/configs/platform-v7a/barebox-mx6-defaultenv/init/bootsource index 4de7163..ba04809 100644 --- a/configs/platform-v7a/barebox-mx6-defaultenv/init/bootsource +++ b/configs/platform-v7a/barebox-mx6-defaultenv/init/bootsource @@ -4,10 +4,10 @@ if [ -n "$nv.boot.default" ]; then exit fi + if [ $bootsource = mmc ]; then - global.boot.default="bootchooser net" -elif [ $bootsource = net ]; then - global.boot.default="net bootchooser" + detect mmc$bootsource_instance + global.boot.default="mmc$bootsource_instance net" else - global.boot.default="disk0.1 net" + global.boot.default="net mmc1 mmc2 mmc3" fi diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config index b792744..d8147c2 100644 --- a/configs/platform-v7a/barebox-mx6.config +++ b/configs/platform-v7a/barebox-mx6.config @@ -251,7 +251,7 @@ CONFIG_POLLER=y CONFIG_STATE=y CONFIG_STATE_CRYPTO=y # CONFIG_STATE_BACKWARD_COMPATIBLE is not set -CONFIG_BOOTCHOOSER=y +# CONFIG_BOOTCHOOSER is not set CONFIG_RESET_SOURCE=y # @@ -439,7 +439,6 @@ CONFIG_CMD_OF_PROPERTY=y CONFIG_CMD_OFTREE=y CONFIG_CMD_TIME=y CONFIG_CMD_STATE=y -CONFIG_CMD_BOOTCHOOSER=y # CONFIG_CMD_DHRYSTONE is not set # CONFIG_CMD_SPD_DECODE is not set # CONFIG_CMD_SEED is not set -- cgit v1.2.3