From 41b92c8acd54e3d408cd196e4ab1b3dfcd9b9c1d Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Thu, 29 Nov 2018 14:49:05 +0100 Subject: barebox-vexpress: disable state and bootchooser and remove files This disables broken support for state and bootchooser for barebox-vexpress. We also remove the nv files and the bootsource file, the later is unsupported since the vexpress platform will always report the bootsource as unknown. Signed-off-by: Rouven Czerwinski --- .../barebox-vexpress-defaultenv/init/bootsource | 13 ------------- .../barebox-vexpress-defaultenv/nv/bootchooser.retry | 1 - .../barebox-vexpress-defaultenv/nv/bootchooser.state_prefix | 1 - .../barebox-vexpress-defaultenv/nv/bootchooser.system0.boot | 1 - .../nv/bootchooser.system0.default_attempts | 1 - .../nv/bootchooser.system0.default_priority | 1 - .../barebox-vexpress-defaultenv/nv/bootchooser.system1.boot | 1 - .../nv/bootchooser.system1.default_attempts | 1 - .../nv/bootchooser.system1.default_priority | 1 - .../barebox-vexpress-defaultenv/nv/bootchooser.targets | 1 - configs/platform-v7a/barebox-vexpress.config | 9 ++------- 11 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/init/bootsource delete mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.retry delete mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.state_prefix delete mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system0.boot delete mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system0.default_attempts delete mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system0.default_priority delete mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system1.boot delete mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system1.default_attempts delete mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system1.default_priority delete mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.targets (limited to 'configs/platform-v7a') diff --git a/configs/platform-v7a/barebox-vexpress-defaultenv/init/bootsource b/configs/platform-v7a/barebox-vexpress-defaultenv/init/bootsource deleted file mode 100644 index ed0692f..0000000 --- a/configs/platform-v7a/barebox-vexpress-defaultenv/init/bootsource +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -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" -else - global.boot.default="disk0.0 net" -fi diff --git a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.retry b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.retry deleted file mode 100644 index 27ba77d..0000000 --- a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.retry +++ /dev/null @@ -1 +0,0 @@ -true diff --git a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.state_prefix b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.state_prefix deleted file mode 100644 index 6246412..0000000 --- a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.state_prefix +++ /dev/null @@ -1 +0,0 @@ -state.bootstate diff --git a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system0.boot b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system0.boot deleted file mode 100644 index 961e29f..0000000 --- a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system0.boot +++ /dev/null @@ -1 +0,0 @@ -disk0.0 diff --git a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system0.default_attempts b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system0.default_attempts deleted file mode 100644 index 00750ed..0000000 --- a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system0.default_attempts +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system0.default_priority b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system0.default_priority deleted file mode 100644 index 209e3ef..0000000 --- a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system0.default_priority +++ /dev/null @@ -1 +0,0 @@ -20 diff --git a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system1.boot b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system1.boot deleted file mode 100644 index 5676f86..0000000 --- a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system1.boot +++ /dev/null @@ -1 +0,0 @@ -disk0.1 diff --git a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system1.default_attempts b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system1.default_attempts deleted file mode 100644 index 00750ed..0000000 --- a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system1.default_attempts +++ /dev/null @@ -1 +0,0 @@ -3 diff --git a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system1.default_priority b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system1.default_priority deleted file mode 100644 index f599e28..0000000 --- a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system1.default_priority +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.targets b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.targets deleted file mode 100644 index f0fb14e..0000000 --- a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.targets +++ /dev/null @@ -1 +0,0 @@ -system0 system1 diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config index 5abe71e..f9f50b3 100644 --- a/configs/platform-v7a/barebox-vexpress.config +++ b/configs/platform-v7a/barebox-vexpress.config @@ -167,10 +167,8 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH=".ptxdist-defaultenv" # CONFIG_BAREBOXENV_TARGET is not set # CONFIG_BAREBOXCRC32_TARGET is not set CONFIG_POLLER=y -CONFIG_STATE=y -# CONFIG_STATE_CRYPTO is not set -# CONFIG_STATE_BACKWARD_COMPATIBLE is not set -CONFIG_BOOTCHOOSER=y +# CONFIG_STATE is not set +# CONFIG_BOOTCHOOSER is not set CONFIG_RESET_SOURCE=y # @@ -335,8 +333,6 @@ CONFIG_CMD_OF_DUMP=y # CONFIG_CMD_OF_FIXUP_STATUS is not set CONFIG_CMD_OFTREE=y # CONFIG_CMD_TIME is not set -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 @@ -483,7 +479,6 @@ CONFIG_CLOCKSOURCE_DUMMY_RATE=1000 # Misc devices # CONFIG_SRAM=y -CONFIG_STATE_DRV=y # CONFIG_LED is not set # -- cgit v1.2.3