[DistroKit] [PATCH 1/4] platform-v7a: disable CONFIG_BPFILTER_UMH

[DistroKit] [PATCH 1/4] platform-v7a: disable CONFIG_BPFILTER_UMH

[Rouven Czerwinski]

From: Rouven Czerwinski <r.czerwinski@pengutronix.de>

This tries to use the host compiler directly. Disable it until we either have a
patch for the compiler selection or a fix is merged upstream.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
 configs/platform-v7a/kernelconfig | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/configs/platform-v7a/kernelconfig b/configs/platform-v7a/kernelconfig
index 26ac9ff..d67a748 100644
--- a/configs/platform-v7a/kernelconfig
+++ b/configs/platform-v7a/kernelconfig
@@ -672,8 +672,9 @@ CONFIG_REFCOUNT_FULL=y
 #
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-CONFIG_PLUGIN_HOSTCC=""
+CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_HAVE_GCC_PLUGINS=y
+# CONFIG_GCC_PLUGINS is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -874,7 +875,7 @@ CONFIG_NETFILTER_INGRESS=y
 # CONFIG_NF_LOG_IPV6 is not set
 # CONFIG_IP6_NF_IPTABLES is not set
 CONFIG_BPFILTER=y
-CONFIG_BPFILTER_UMH=y
+# CONFIG_BPFILTER_UMH is not set
 # CONFIG_IP_DCCP is not set
 # CONFIG_IP_SCTP is not set
 # CONFIG_RDS is not set
-- 
2.19.1


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

[DistroKit] [PATCH 2/4] barebox-am335x-defaultenv: fix bootsource selection

[Rouven Czerwinski]

From: Rouven Czerwinski <r.czerwinski@pengutronix.de>

According to the board.c file from barebox, the bootsource can either be "mmc0"
or "mmc1". Adjust the bootsource init file for barebox to automatically start a
newly installed DistroKit.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
 .../barebox-am335x-defaultenv/init/bootsource          | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/configs/platform-v7a/barebox-am335x-defaultenv/init/bootsource b/configs/platform-v7a/barebox-am335x-defaultenv/init/bootsource
index 4de7163..ec153ce 100644
--- a/configs/platform-v7a/barebox-am335x-defaultenv/init/bootsource
+++ b/configs/platform-v7a/barebox-am335x-defaultenv/init/bootsource
@@ -5,9 +5,11 @@ if [ -n "$nv.boot.default" ]; then
 fi
 
 if [ $bootsource = mmc ]; then
-	global.boot.default="bootchooser net"
-elif [ $bootsource = net ]; then
-	global.boot.default="net bootchooser"
+	if [ $bootsource_instance = 0 ]; then
+		global.boot.default="mmc0 net"
+	elif [ $bootsource_instance = 1 ]; then
+		global.boot.default="mmc1 net"
+	fi
 else
-	global.boot.default="disk0.1 net"
+	global.boot.default="net mmc0 mmc1"
 fi
-- 
2.19.1


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

[DistroKit] [PATCH 3/4] barebox-am335x-defaultenv: add usb limit script from upstream

[Rouven Czerwinski]

From: Rouven Czerwinski <r.czerwinski@pengutronix.de>

The barebox beaglebone defaultenv contains an init script to adjust the
usb-limit to 1300mA. Import from upstream to be consistent with the barebox
defaultenv.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
 .../barebox-am335x-defaultenv/init/usb-limit-1300            | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 configs/platform-v7a/barebox-am335x-defaultenv/init/usb-limit-1300

diff --git a/configs/platform-v7a/barebox-am335x-defaultenv/init/usb-limit-1300 b/configs/platform-v7a/barebox-am335x-defaultenv/init/usb-limit-1300
new file mode 100644
index 0000000..56313bf
--- /dev/null
+++ b/configs/platform-v7a/barebox-am335x-defaultenv/init/usb-limit-1300
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo -n "changing USB current limit to 1300 mA... "
+i2c_write -b 0 -a 0x24 -r 0x01 0x3e
+echo "done"
-- 
2.19.1


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

[DistroKit] [PATCH 4/4] barebox-am335x-defaultenv: remove state entries

[Rouven Czerwinski]

From: Rouven Czerwinski <r.czerwinski@pengutronix.de>

These will be moved into a redundant update layer.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
 .../barebox-am335x-defaultenv/nv/bootstate.system0.priority      | 1 -
 .../barebox-am335x-defaultenv/nv/bootstate.system1.priority      | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 configs/platform-v7a/barebox-am335x-defaultenv/nv/bootstate.system0.priority
 delete mode 100644 configs/platform-v7a/barebox-am335x-defaultenv/nv/bootstate.system1.priority

diff --git a/configs/platform-v7a/barebox-am335x-defaultenv/nv/bootstate.system0.priority b/configs/platform-v7a/barebox-am335x-defaultenv/nv/bootstate.system0.priority
deleted file mode 100644
index f599e28..0000000
--- a/configs/platform-v7a/barebox-am335x-defaultenv/nv/bootstate.system0.priority
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/configs/platform-v7a/barebox-am335x-defaultenv/nv/bootstate.system1.priority b/configs/platform-v7a/barebox-am335x-defaultenv/nv/bootstate.system1.priority
deleted file mode 100644
index 209e3ef..0000000
--- a/configs/platform-v7a/barebox-am335x-defaultenv/nv/bootstate.system1.priority
+++ /dev/null
@@ -1 +0,0 @@
-20
-- 
2.19.1


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

Re: [DistroKit] [PATCH 1/4] platform-v7a: disable CONFIG_BPFILTER_UMH

[Michael Olbrich]

On Wed, Dec 05, 2018 at 08:57:55AM +0100, Rouven Czerwinski wrote:
> From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> 
> This tries to use the host compiler directly. Disable it until we either have a
> patch for the compiler selection or a fix is merged upstream.
> 
> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> ---
>  configs/platform-v7a/kernelconfig | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/configs/platform-v7a/kernelconfig b/configs/platform-v7a/kernelconfig
> index 26ac9ff..d67a748 100644
> --- a/configs/platform-v7a/kernelconfig
> +++ b/configs/platform-v7a/kernelconfig
> @@ -672,8 +672,9 @@ CONFIG_REFCOUNT_FULL=y
>  #
>  # CONFIG_GCOV_KERNEL is not set
>  CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
> -CONFIG_PLUGIN_HOSTCC=""
> +CONFIG_PLUGIN_HOSTCC="g++"
>  CONFIG_HAVE_GCC_PLUGINS=y
> +# CONFIG_GCC_PLUGINS is not set

This is an unrelated change. This shows up when the host compiler is new
enough to compile the gcc plugins (or something like that).
I need to fix this in PTXdist in general, probably by disabling this in
(maybe optional?).

Michael

>  CONFIG_RT_MUTEXES=y
>  CONFIG_BASE_SMALL=0
>  CONFIG_MODULES=y
> @@ -874,7 +875,7 @@ CONFIG_NETFILTER_INGRESS=y
>  # CONFIG_NF_LOG_IPV6 is not set
>  # CONFIG_IP6_NF_IPTABLES is not set
>  CONFIG_BPFILTER=y
> -CONFIG_BPFILTER_UMH=y
> +# CONFIG_BPFILTER_UMH is not set
>  # CONFIG_IP_DCCP is not set
>  # CONFIG_IP_SCTP is not set
>  # CONFIG_RDS is not set
> -- 
> 2.19.1
> 
> 
> _______________________________________________
> DistroKit mailing list
> DistroKit@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

Re: [DistroKit] [PATCH 1/4] platform-v7a: disable CONFIG_BPFILTER_UMH

[Rouven Czerwinski]

Michael Olbrich <m.olbrich@pengutronix.de> writes:

> On Wed, Dec 05, 2018 at 08:57:55AM +0100, Rouven Czerwinski wrote:
>> From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
>> 
>> This tries to use the host compiler directly. Disable it until we either have a
>> patch for the compiler selection or a fix is merged upstream.
>> 
>> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
>> ---
>>  configs/platform-v7a/kernelconfig | 5 +++--
>>  1 file changed, 3 insertions(+), 2 deletions(-)
>> 
>> diff --git a/configs/platform-v7a/kernelconfig b/configs/platform-v7a/kernelconfig
>> index 26ac9ff..d67a748 100644
>> --- a/configs/platform-v7a/kernelconfig
>> +++ b/configs/platform-v7a/kernelconfig
>> @@ -672,8 +672,9 @@ CONFIG_REFCOUNT_FULL=y
>>  #
>>  # CONFIG_GCOV_KERNEL is not set
>>  CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
>> -CONFIG_PLUGIN_HOSTCC=""
>> +CONFIG_PLUGIN_HOSTCC="g++"
>>  CONFIG_HAVE_GCC_PLUGINS=y
>> +# CONFIG_GCC_PLUGINS is not set
>
> This is an unrelated change. This shows up when the host compiler is new
> enough to compile the gcc plugins (or something like that).
> I need to fix this in PTXdist in general, probably by disabling this in
> (maybe optional?).

I agree. I can drop it from the series and post it separately.
However this patch is needed for compilation on my laptop, so I'm
reluctant to drop it entirely.

- Rouven

>>  CONFIG_RT_MUTEXES=y
>>  CONFIG_BASE_SMALL=0
>>  CONFIG_MODULES=y
>> @@ -874,7 +875,7 @@ CONFIG_NETFILTER_INGRESS=y
>>  # CONFIG_NF_LOG_IPV6 is not set
>>  # CONFIG_IP6_NF_IPTABLES is not set
>>  CONFIG_BPFILTER=y
>> -CONFIG_BPFILTER_UMH=y
>> +# CONFIG_BPFILTER_UMH is not set
>>  # CONFIG_IP_DCCP is not set
>>  # CONFIG_IP_SCTP is not set
>>  # CONFIG_RDS is not set
>> -- 
>> 2.19.1
>> 
>> 
>> _______________________________________________
>> DistroKit mailing list
>> DistroKit@pengutronix.de


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

Re: [DistroKit] [PATCH 1/4] platform-v7a: disable CONFIG_BPFILTER_UMH

[Michael Olbrich]

On Wed, Dec 05, 2018 at 02:29:36PM +0100, Rouven Czerwinski wrote:
> 
> Michael Olbrich <m.olbrich@pengutronix.de> writes:
> 
> > On Wed, Dec 05, 2018 at 08:57:55AM +0100, Rouven Czerwinski wrote:
> >> From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> >> 
> >> This tries to use the host compiler directly. Disable it until we either have a
> >> patch for the compiler selection or a fix is merged upstream.
> >> 
> >> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> >> ---
> >>  configs/platform-v7a/kernelconfig | 5 +++--
> >>  1 file changed, 3 insertions(+), 2 deletions(-)
> >> 
> >> diff --git a/configs/platform-v7a/kernelconfig b/configs/platform-v7a/kernelconfig
> >> index 26ac9ff..d67a748 100644
> >> --- a/configs/platform-v7a/kernelconfig
> >> +++ b/configs/platform-v7a/kernelconfig
> >> @@ -672,8 +672,9 @@ CONFIG_REFCOUNT_FULL=y
> >>  #
> >>  # CONFIG_GCOV_KERNEL is not set
> >>  CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
> >> -CONFIG_PLUGIN_HOSTCC=""
> >> +CONFIG_PLUGIN_HOSTCC="g++"
> >>  CONFIG_HAVE_GCC_PLUGINS=y
> >> +# CONFIG_GCC_PLUGINS is not set
> >
> > This is an unrelated change. This shows up when the host compiler is new
> > enough to compile the gcc plugins (or something like that).
> > I need to fix this in PTXdist in general, probably by disabling this in
> > (maybe optional?).
> 
> I agree. I can drop it from the series and post it separately.
> However this patch is needed for compilation on my laptop, so I'm
> reluctant to drop it entirely.

And it will break building on older systems, so just applying it not not ok
either.

Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

Re: [DistroKit] [PATCH 1/4] platform-v7a: disable CONFIG_BPFILTER_UMH

[Rouven Czerwinski]

Michael Olbrich <m.olbrich@pengutronix.de> writes:

> On Wed, Dec 05, 2018 at 02:29:36PM +0100, Rouven Czerwinski wrote:
>> 
>> Michael Olbrich <m.olbrich@pengutronix.de> writes:
>> 
>> > On Wed, Dec 05, 2018 at 08:57:55AM +0100, Rouven Czerwinski wrote:
>> >> From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
>> >> 
>> >> This tries to use the host compiler directly. Disable it until we either have a
>> >> patch for the compiler selection or a fix is merged upstream.
>> >> 
>> >> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
>> >> ---
>> >>  configs/platform-v7a/kernelconfig | 5 +++--
>> >>  1 file changed, 3 insertions(+), 2 deletions(-)
>> >> 
>> >> diff --git a/configs/platform-v7a/kernelconfig b/configs/platform-v7a/kernelconfig
>> >> index 26ac9ff..d67a748 100644
>> >> --- a/configs/platform-v7a/kernelconfig
>> >> +++ b/configs/platform-v7a/kernelconfig
>> >> @@ -672,8 +672,9 @@ CONFIG_REFCOUNT_FULL=y
>> >>  #
>> >>  # CONFIG_GCOV_KERNEL is not set
>> >>  CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
>> >> -CONFIG_PLUGIN_HOSTCC=""
>> >> +CONFIG_PLUGIN_HOSTCC="g++"
>> >>  CONFIG_HAVE_GCC_PLUGINS=y
>> >> +# CONFIG_GCC_PLUGINS is not set
>> >
>> > This is an unrelated change. This shows up when the host compiler is new
>> > enough to compile the gcc plugins (or something like that).
>> > I need to fix this in PTXdist in general, probably by disabling this in
>> > (maybe optional?).
>> 
>> I agree. I can drop it from the series and post it separately.
>> However this patch is needed for compilation on my laptop, so I'm
>> reluctant to drop it entirely.
>
> And it will break building on older systems, so just applying it not not ok
> either.
>
> Michael

Rereading this thread I realised that you are refering to the PLUGINS
part. I can probably drop this, my main compilation problem is with the
UMH.

I'll check and report back.

- Rouven

_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

Re: [DistroKit] [PATCH 1/4] platform-v7a: disable CONFIG_BPFILTER_UMH

[Robert Schwebel]

On Wed, Dec 05, 2018 at 08:57:55AM +0100, Rouven Czerwinski wrote:
> From: Rouven Czerwinski <r.czerwinski@pengutronix.de>

FTR: I've now discarded this series and took your latest one (exchanged
off-list).

rsc
-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de