From 121d0ca4a6d05dedca03ee7dad507be74142db6e Mon Sep 17 00:00:00 2001 From: Jan Luebbe Date: Tue, 15 Aug 2017 17:44:00 +0200 Subject: platform-v7a: barebox: fix bootchooser NV variables This fixes the bootchooser configuration to match the state layout in the devicetree. Signed-off-by: Jan Luebbe --- configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.retry | 1 + .../platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.state_prefix | 1 + .../platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system0.boot | 1 + .../barebox-vexpress-defaultenv/nv/bootchooser.system0.default_attempts | 1 + .../barebox-vexpress-defaultenv/nv/bootchooser.system0.default_priority | 1 + .../platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system1.boot | 1 + .../barebox-vexpress-defaultenv/nv/bootchooser.system1.default_attempts | 1 + .../barebox-vexpress-defaultenv/nv/bootchooser.system1.default_priority | 1 + configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.targets | 1 + .../barebox-vexpress-defaultenv/nv/bootstate.system0.priority | 1 - .../barebox-vexpress-defaultenv/nv/bootstate.system1.priority | 1 - 11 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.retry create mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.state_prefix create mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system0.boot create mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system0.default_attempts create mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system0.default_priority create mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system1.boot create mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system1.default_attempts create mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system1.default_priority create mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.targets delete mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootstate.system0.priority delete mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootstate.system1.priority (limited to 'configs/platform-v7a/barebox-vexpress-defaultenv/nv') diff --git a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.retry b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.retry new file mode 100644 index 0000000..27ba77d --- /dev/null +++ b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.retry @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000..6246412 --- /dev/null +++ b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.state_prefix @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000..961e29f --- /dev/null +++ b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system0.boot @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system0.default_attempts @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000..209e3ef --- /dev/null +++ b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system0.default_priority @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000..5676f86 --- /dev/null +++ b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system1.boot @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system1.default_attempts @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.system1.default_priority @@ -0,0 +1 @@ +10 diff --git a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.targets b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.targets new file mode 100644 index 0000000..f0fb14e --- /dev/null +++ b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootchooser.targets @@ -0,0 +1 @@ +system0 system1 diff --git a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootstate.system0.priority b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootstate.system0.priority deleted file mode 100644 index f599e28..0000000 --- a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootstate.system0.priority +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootstate.system1.priority b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootstate.system1.priority deleted file mode 100644 index 209e3ef..0000000 --- a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/bootstate.system1.priority +++ /dev/null @@ -1 +0,0 @@ -20 -- cgit v1.2.3