* [DistroKit] [PATCH 2/3] barebox-mx6: disable state and remove boostate entries
2018-12-05 7:58 [DistroKit] [PATCH 1/3] barebox-mx6: fix bootsource selection Rouven Czerwinski
@ 2018-12-05 7:58 ` Rouven Czerwinski
2018-12-05 13:20 ` Roland Hieber
2018-12-05 7:58 ` [DistroKit] [PATCH 3/3] barebox-vexpress: disable state and bootchooser and remove files Rouven Czerwinski
2018-12-05 8:07 ` [DistroKit] [PATCH 1/3] barebox-mx6: fix bootsource selection Rouven Czerwinski
2 siblings, 1 reply; 6+ messages in thread
From: Rouven Czerwinski @ 2018-12-05 7:58 UTC (permalink / raw)
To: distrokit; +Cc: Rouven Czerwinski
Signed-off-by: Rouven Czerwinski <rouven@czerwinskis.de>
---
.../barebox-mx6-defaultenv/nv/bootstate.system0.priority | 1 -
.../barebox-mx6-defaultenv/nv/bootstate.system1.priority | 1 -
configs/platform-v7a/barebox-mx6.config | 6 +-----
3 files changed, 1 insertion(+), 7 deletions(-)
delete mode 100644 configs/platform-v7a/barebox-mx6-defaultenv/nv/bootstate.system0.priority
delete mode 100644 configs/platform-v7a/barebox-mx6-defaultenv/nv/bootstate.system1.priority
diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootstate.system0.priority b/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootstate.system0.priority
deleted file mode 100644
index f599e28..0000000
--- a/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootstate.system0.priority
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootstate.system1.priority b/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootstate.system1.priority
deleted file mode 100644
index 209e3ef..0000000
--- a/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootstate.system1.priority
+++ /dev/null
@@ -1 +0,0 @@
-20
diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
index 8bc8d3f..4acde8d 100644
--- a/configs/platform-v7a/barebox-mx6.config
+++ b/configs/platform-v7a/barebox-mx6.config
@@ -246,9 +246,7 @@ 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=y
-# CONFIG_STATE_BACKWARD_COMPATIBLE is not set
+# CONFIG_STATE is not set
# CONFIG_BOOTCHOOSER is not set
CONFIG_RESET_SOURCE=y
@@ -436,7 +434,6 @@ CONFIG_CMD_OF_PROPERTY=y
# CONFIG_CMD_OF_FIXUP_STATUS is not set
CONFIG_CMD_OFTREE=y
CONFIG_CMD_TIME=y
-CONFIG_CMD_STATE=y
# CONFIG_CMD_DHRYSTONE is not set
# CONFIG_CMD_SPD_DECODE is not set
# CONFIG_CMD_SEED is not set
@@ -675,7 +672,6 @@ CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
#
# CONFIG_JTAG is not set
# CONFIG_SRAM is not set
-CONFIG_STATE_DRV=y
CONFIG_LED=y
CONFIG_LED_GPIO=y
# CONFIG_LED_PWM is not set
--
2.19.1
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [DistroKit] [PATCH 2/3] barebox-mx6: disable state and remove boostate entries
2018-12-05 7:58 ` [DistroKit] [PATCH 2/3] barebox-mx6: disable state and remove boostate entries Rouven Czerwinski
@ 2018-12-05 13:20 ` Roland Hieber
0 siblings, 0 replies; 6+ messages in thread
From: Roland Hieber @ 2018-12-05 13:20 UTC (permalink / raw)
To: Rouven Czerwinski; +Cc: distrokit
The commit message should give a reason why this was done so we will
need to do less software archeaology in the future. (You can probably
copy it from the other commits :))
- Roland
On Wed, Dec 05, 2018 at 08:58:56AM +0100, Rouven Czerwinski wrote:
> Signed-off-by: Rouven Czerwinski <rouven@czerwinskis.de>
> ---
> .../barebox-mx6-defaultenv/nv/bootstate.system0.priority | 1 -
> .../barebox-mx6-defaultenv/nv/bootstate.system1.priority | 1 -
> configs/platform-v7a/barebox-mx6.config | 6 +-----
> 3 files changed, 1 insertion(+), 7 deletions(-)
> delete mode 100644 configs/platform-v7a/barebox-mx6-defaultenv/nv/bootstate.system0.priority
> delete mode 100644 configs/platform-v7a/barebox-mx6-defaultenv/nv/bootstate.system1.priority
>
> diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootstate.system0.priority b/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootstate.system0.priority
> deleted file mode 100644
> index f599e28..0000000
> --- a/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootstate.system0.priority
> +++ /dev/null
> @@ -1 +0,0 @@
> -10
> diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootstate.system1.priority b/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootstate.system1.priority
> deleted file mode 100644
> index 209e3ef..0000000
> --- a/configs/platform-v7a/barebox-mx6-defaultenv/nv/bootstate.system1.priority
> +++ /dev/null
> @@ -1 +0,0 @@
> -20
> diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
> index 8bc8d3f..4acde8d 100644
> --- a/configs/platform-v7a/barebox-mx6.config
> +++ b/configs/platform-v7a/barebox-mx6.config
> @@ -246,9 +246,7 @@ 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=y
> -# CONFIG_STATE_BACKWARD_COMPATIBLE is not set
> +# CONFIG_STATE is not set
> # CONFIG_BOOTCHOOSER is not set
> CONFIG_RESET_SOURCE=y
>
> @@ -436,7 +434,6 @@ CONFIG_CMD_OF_PROPERTY=y
> # CONFIG_CMD_OF_FIXUP_STATUS is not set
> CONFIG_CMD_OFTREE=y
> CONFIG_CMD_TIME=y
> -CONFIG_CMD_STATE=y
> # CONFIG_CMD_DHRYSTONE is not set
> # CONFIG_CMD_SPD_DECODE is not set
> # CONFIG_CMD_SEED is not set
> @@ -675,7 +672,6 @@ CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
> #
> # CONFIG_JTAG is not set
> # CONFIG_SRAM is not set
> -CONFIG_STATE_DRV=y
> CONFIG_LED=y
> CONFIG_LED_GPIO=y
> # CONFIG_LED_PWM is not set
> --
> 2.19.1
>
>
> _______________________________________________
> DistroKit mailing list
> DistroKit@pengutronix.de
--
Roland Hieber | r.hieber@pengutronix.de |
Pengutronix e.K. | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* [DistroKit] [PATCH 3/3] barebox-vexpress: disable state and bootchooser and remove files
2018-12-05 7:58 [DistroKit] [PATCH 1/3] barebox-mx6: fix bootsource selection Rouven Czerwinski
2018-12-05 7:58 ` [DistroKit] [PATCH 2/3] barebox-mx6: disable state and remove boostate entries Rouven Czerwinski
@ 2018-12-05 7:58 ` Rouven Czerwinski
2018-12-05 8:07 ` [DistroKit] [PATCH 1/3] barebox-mx6: fix bootsource selection Rouven Czerwinski
2 siblings, 0 replies; 6+ messages in thread
From: Rouven Czerwinski @ 2018-12-05 7:58 UTC (permalink / raw)
To: distrokit; +Cc: Rouven Czerwinski
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 <rouven@czerwinskis.de>
---
.../barebox-vexpress-defaultenv/init/bootsource | 13 -------------
.../nv/bootchooser.retry | 1 -
.../nv/bootchooser.state_prefix | 1 -
.../nv/bootchooser.system0.boot | 1 -
.../nv/bootchooser.system0.default_attempts | 1 -
.../nv/bootchooser.system0.default_priority | 1 -
.../nv/bootchooser.system1.boot | 1 -
.../nv/bootchooser.system1.default_attempts | 1 -
.../nv/bootchooser.system1.default_priority | 1 -
.../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
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 72d5421..aa7877a 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
@@ -482,7 +478,6 @@ CONFIG_CLOCKSOURCE_DUMMY_RATE=1000
# Misc devices
#
CONFIG_SRAM=y
-CONFIG_STATE_DRV=y
# CONFIG_LED is not set
#
--
2.19.1
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [DistroKit] [PATCH 1/3] barebox-mx6: fix bootsource selection
2018-12-05 7:58 [DistroKit] [PATCH 1/3] barebox-mx6: fix bootsource selection Rouven Czerwinski
2018-12-05 7:58 ` [DistroKit] [PATCH 2/3] barebox-mx6: disable state and remove boostate entries Rouven Czerwinski
2018-12-05 7:58 ` [DistroKit] [PATCH 3/3] barebox-vexpress: disable state and bootchooser and remove files Rouven Czerwinski
@ 2018-12-05 8:07 ` Rouven Czerwinski
2018-12-05 13:22 ` Roland Hieber
2 siblings, 1 reply; 6+ messages in thread
From: Rouven Czerwinski @ 2018-12-05 8:07 UTC (permalink / raw)
To: distrokit; +Cc: Rouven Czerwinski
For these patches the author E-Mail is wrong.
I'll resend with the correct author.
Rouven Czerwinski <rouven@czerwinskis.de> writes:
> Also disable the bootchooser which is no longer used.
>
> Signed-off-by: Rouven Czerwinski <rouven@czerwinskis.de>
> ---
> .../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 536cbfe..8bc8d3f 100644
> --- a/configs/platform-v7a/barebox-mx6.config
> +++ b/configs/platform-v7a/barebox-mx6.config
> @@ -249,7 +249,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
>
> #
> @@ -437,7 +437,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
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread