diff options
| author | Rouven Czerwinski <rouven@czerwinskis.de> | 2018-11-29 11:01:58 +0100 |
|---|---|---|
| committer | Rouven Czerwinski <r.czerwinski@pengutronix.de> | 2018-12-07 15:52:29 +0100 |
| commit | 1859290b6a8051119d0edd34bacc9af89e7f7a51 (patch) | |
| tree | ff1e14bce0eebc560f6db8c76605494bd82017e5 | |
| parent | 85b9375a851def2659f27aaaad6dd0832179f08d (diff) | |
| download | DistroKit-1859290b6a8051119d0edd34bacc9af89e7f7a51.tar.gz DistroKit-1859290b6a8051119d0edd34bacc9af89e7f7a51.tar.xz | |
barebox-mx6: fix bootsource selection
Also disable the bootchooser which is no longer used.
Signed-off-by: Rouven Czerwinski <rouven@czerwinskis.de>
| -rw-r--r-- | configs/platform-v7a/barebox-mx6-defaultenv/init/bootsource | 8 | ||||
| -rw-r--r-- | 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 |