[DistroKit] [PATCH 1/7] platform-v7a: barebox: don't break the console autodetection

[DistroKit] [PATCH 1/7] platform-v7a: barebox: don't break the console autodetection

[Roland Hieber]

The global variable linux.bootargs.console is set by barebox on startup
to the chosen stdout path from the Device Tree. Rename the variable in
our barebox defaultenvs to prevent shadowing this automatic variable,
so that the stdout path is passed on to the Linux kernel.

Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
---
 .../nv/{linux.bootargs.console => linux.bootargs.loglevel}                | 0
 .../nv/{linux.bootargs.console => linux.bootargs.loglevel}                | 0
 .../nv/{linux.bootargs.console => linux.bootargs.loglevel}                | 0
 .../nv/{linux.bootargs.console => linux.bootargs.loglevel}                | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename configs/platform-v7a/barebox-am335x-defaultenv/nv/{linux.bootargs.console => linux.bootargs.loglevel} (100%)
 rename configs/platform-v7a/barebox-mx6-defaultenv/nv/{linux.bootargs.console => linux.bootargs.loglevel} (100%)
 rename configs/platform-v7a/barebox-rpi2-defaultenv/nv/{linux.bootargs.console => linux.bootargs.loglevel} (100%)
 rename configs/platform-v7a/barebox-vexpress-defaultenv/nv/{linux.bootargs.console => linux.bootargs.loglevel} (100%)

diff --git a/configs/platform-v7a/barebox-am335x-defaultenv/nv/linux.bootargs.console b/configs/platform-v7a/barebox-am335x-defaultenv/nv/linux.bootargs.loglevel
similarity index 100%
rename from configs/platform-v7a/barebox-am335x-defaultenv/nv/linux.bootargs.console
rename to configs/platform-v7a/barebox-am335x-defaultenv/nv/linux.bootargs.loglevel
diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/nv/linux.bootargs.console b/configs/platform-v7a/barebox-mx6-defaultenv/nv/linux.bootargs.loglevel
similarity index 100%
rename from configs/platform-v7a/barebox-mx6-defaultenv/nv/linux.bootargs.console
rename to configs/platform-v7a/barebox-mx6-defaultenv/nv/linux.bootargs.loglevel
diff --git a/configs/platform-v7a/barebox-rpi2-defaultenv/nv/linux.bootargs.console b/configs/platform-v7a/barebox-rpi2-defaultenv/nv/linux.bootargs.loglevel
similarity index 100%
rename from configs/platform-v7a/barebox-rpi2-defaultenv/nv/linux.bootargs.console
rename to configs/platform-v7a/barebox-rpi2-defaultenv/nv/linux.bootargs.loglevel
diff --git a/configs/platform-v7a/barebox-vexpress-defaultenv/nv/linux.bootargs.console b/configs/platform-v7a/barebox-vexpress-defaultenv/nv/linux.bootargs.loglevel
similarity index 100%
rename from configs/platform-v7a/barebox-vexpress-defaultenv/nv/linux.bootargs.console
rename to configs/platform-v7a/barebox-vexpress-defaultenv/nv/linux.bootargs.loglevel
-- 
2.11.0


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

[DistroKit] [PATCH 2/7] platform-v7a: image-hd: fork locally from PTXdist 2018.02.0

[Roland Hieber]

Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
---
 configs/platform-v7a/config/images/hd.config | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 configs/platform-v7a/config/images/hd.config

diff --git a/configs/platform-v7a/config/images/hd.config b/configs/platform-v7a/config/images/hd.config
new file mode 100644
index 0000000..6d1fd38
--- /dev/null
+++ b/configs/platform-v7a/config/images/hd.config
@@ -0,0 +1,13 @@
+
+@BOOTLOADER_IMAGES@
+
+image @IMAGE@ {
+	hdimage {
+		align = 1M
+	}
+	@BOOTLOADER_PARTITIONS@
+	partition root {
+		image = root.ext2
+		partition-type = 0x83
+	}
+}
-- 
2.11.0


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

[DistroKit] [PATCH 3/7] platform-v7a: image-hd: generate a disk signature for the image

[Roland Hieber]

The disk signature is necessary so that barebox can auto-detect the boot
source and append it to the Linux command line in the 'root=' parameter.
A random but fixed value will suffice for this purpose.

Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
---
 configs/platform-v7a/config/images/hd.config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configs/platform-v7a/config/images/hd.config b/configs/platform-v7a/config/images/hd.config
index 6d1fd38..03cf37a 100644
--- a/configs/platform-v7a/config/images/hd.config
+++ b/configs/platform-v7a/config/images/hd.config
@@ -4,6 +4,7 @@
 image @IMAGE@ {
 	hdimage {
 		align = 1M
+		disk-signature = 0xdfb978e3
 	}
 	@BOOTLOADER_PARTITIONS@
 	partition root {
-- 
2.11.0


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

[DistroKit] [PATCH 4/7] platform-v7a: blspec-nitrogen6x: barebox can auto-detect the root partition

[Roland Hieber]

Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
---
 configs/platform-v7a/projectroot/loader/entries/nitrogen6x.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configs/platform-v7a/projectroot/loader/entries/nitrogen6x.conf b/configs/platform-v7a/projectroot/loader/entries/nitrogen6x.conf
index eee0142..5dca3f1 100644
--- a/configs/platform-v7a/projectroot/loader/entries/nitrogen6x.conf
+++ b/configs/platform-v7a/projectroot/loader/entries/nitrogen6x.conf
@@ -1,5 +1,6 @@
 title		Nitrogen6x - Pengutronix-DistroKit
 version		4.12
-options		loglevel=5 systemd.log_level=warning systemd.show_status=auto root=/dev/mmcblk0p2 rootfstype=ext4 rootwait rw
+options		loglevel=5 systemd.log_level=warning systemd.show_status=auto rootwait rw
 linux		/boot/zImage
 devicetree	/boot/imx6q-nitrogen6x.dtb
+linux-appendroot true
-- 
2.11.0


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

[DistroKit] [PATCH 5/7] platform-v7a: blspec: remove options already added by barebox-defaultenv

[Roland Hieber]

Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
---
 configs/platform-v7a/projectroot/loader/entries/gf.conf         | 2 +-
 configs/platform-v7a/projectroot/loader/entries/nitrogen6x.conf | 2 +-
 configs/platform-v7a/projectroot/loader/entries/rpi2.conf       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configs/platform-v7a/projectroot/loader/entries/gf.conf b/configs/platform-v7a/projectroot/loader/entries/gf.conf
index 7c5fbb2..b114645 100644
--- a/configs/platform-v7a/projectroot/loader/entries/gf.conf
+++ b/configs/platform-v7a/projectroot/loader/entries/gf.conf
@@ -1,6 +1,6 @@
 title		Gute Fee - Pengutronix-DistroKit
 version		4.6
-options		loglevel=5 systemd.log_level=warning systemd.show_status=auto rootwait rw
+options		rootwait rw
 linux		/boot/zImage
 devicetree	/boot/am335x-afi-gf.dtb
 linux-appendroot true
diff --git a/configs/platform-v7a/projectroot/loader/entries/nitrogen6x.conf b/configs/platform-v7a/projectroot/loader/entries/nitrogen6x.conf
index 5dca3f1..b9528a2 100644
--- a/configs/platform-v7a/projectroot/loader/entries/nitrogen6x.conf
+++ b/configs/platform-v7a/projectroot/loader/entries/nitrogen6x.conf
@@ -1,6 +1,6 @@
 title		Nitrogen6x - Pengutronix-DistroKit
 version		4.12
-options		loglevel=5 systemd.log_level=warning systemd.show_status=auto rootwait rw
+options		rootwait rw
 linux		/boot/zImage
 devicetree	/boot/imx6q-nitrogen6x.dtb
 linux-appendroot true
diff --git a/configs/platform-v7a/projectroot/loader/entries/rpi2.conf b/configs/platform-v7a/projectroot/loader/entries/rpi2.conf
index a4b77bc..2cbd457 100644
--- a/configs/platform-v7a/projectroot/loader/entries/rpi2.conf
+++ b/configs/platform-v7a/projectroot/loader/entries/rpi2.conf
@@ -1,6 +1,6 @@
 title		Raspberry Pi 2 - Pengutronix-DistroKit
 version		4.6
-options		loglevel=5 systemd.log_level=warning systemd.show_status=auto rootwait rw
+options		rootwait rw
 linux		/boot/zImage
 devicetree	/boot/bcm2836-rpi-2-b.dtb
 linux-appendroot true
-- 
2.11.0


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

[DistroKit] [PATCH 6/7] platform-v7a: platformconfig: build a generic hd.img without bootloader

[Roland Hieber]

For those boards which boot their bootloader from SPI flash, only the
userland is needed on the SD card.

Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
---
 configs/platform-v7a/platformconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index 711d550..6840750 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -238,7 +238,10 @@ PTXCONF_IMAGE_KERNEL_INSTALL_EARLY=y
 #
 # PTXCONF_IMAGE_BOOT_MLO is not set
 # PTXCONF_IMAGE_BOOT_VFAT is not set
-# PTXCONF_IMAGE_HDIMG is not set
+PTXCONF_IMAGE_HDIMG=y
+PTXCONF_IMAGE_HDIMG_NONE=y
+# PTXCONF_IMAGE_HDIMG_BAREBOX is not set
+# PTXCONF_IMAGE_HDIMG_VFAT is not set
 # PTXCONF_IMAGE_RAUC is not set
 # PTXCONF_IMAGE_ROOT_CPIO_GZ is not set
 # PTXCONF_IMAGE_ROOT_CPIO is not set
-- 
2.11.0


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

[DistroKit] [PATCH 7/7] doc: v7a: document Nitrogen6X board

[Roland Hieber]

Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
---
 doc/hardware.rst                |  1 +
 doc/hardware_v7a_nitrogen6x.rst | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 doc/hardware_v7a_nitrogen6x.rst

diff --git a/doc/hardware.rst b/doc/hardware.rst
index ec64b00..b3ff230 100644
--- a/doc/hardware.rst
+++ b/doc/hardware.rst
@@ -45,6 +45,7 @@ For the following boards there is separate documentation:
    hardware_v7a_qemu
    hardware_v7a_beaglebone_white
    hardware_v7a_beaglebone_black
+   hardware_v7a_nitrogen6x
    hardware_v7a_riot
    hardware_v7a_raspi2
    hardware_v7a_raspi3
diff --git a/doc/hardware_v7a_nitrogen6x.rst b/doc/hardware_v7a_nitrogen6x.rst
new file mode 100644
index 0000000..0c7ee57
--- /dev/null
+++ b/doc/hardware_v7a_nitrogen6x.rst
@@ -0,0 +1,22 @@
+Boundary Devices Nitrogen6X
+===========================
+
+Bootloader
+----------
+
+Use one of the following Barebox images that fits your hardware:
+
+  * ``../platform-v7a/images/barebox-boundarydevices-imx6q-nitrogen6x-1g.img`` (Nitrogen6X board with 1 GB of RAM)
+  * ``../platform-v7a/images/barebox-boundarydevices-imx6q-nitrogen6x-2g.img`` (Nitrogen6X board with 2 GB of RAM)
+
+Boot Media
+----------
+Use the generic userland image ``platform-v7a/images/hd.img`` and write it onto your microSD card.
+
+Serial Console
+--------------
+The serial boot console is available via the COM1/COM2 connector J17 at 115200 Baud and 8N1. The pinout is:
+
+* J17.3: GND
+* J17.4: TxD
+* J17.5: RxD
-- 
2.11.0


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

Re: [DistroKit] [PATCH 1/7] platform-v7a: barebox: don't break the console autodetection

[Robert Schwebel]

On Mon, Feb 19, 2018 at 04:37:13PM +0100, Roland Hieber wrote:
> The global variable linux.bootargs.console is set by barebox on startup
> to the chosen stdout path from the Device Tree. Rename the variable in
> our barebox defaultenvs to prevent shadowing this automatic variable,
> so that the stdout path is passed on to the Linux kernel.
> 
> Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>

Series pulled, thx.

rsc
-- 
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/7] platform-v7a: barebox: don't break the console autodetection

[Roland Hieber]

On 19.02.2018 21:52, Robert Schwebel wrote:
> On Mon, Feb 19, 2018 at 04:37:13PM +0100, Roland Hieber wrote:
>> The global variable linux.bootargs.console is set by barebox on startup
>> to the chosen stdout path from the Device Tree. Rename the variable in
>> our barebox defaultenvs to prevent shadowing this automatic variable,
>> so that the stdout path is passed on to the Linux kernel.
>>
>> Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
> 
> Series pulled, thx.

I don't see them upstream yet. Did you also push it? :-)

  - Roland

_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

Re: [DistroKit] [PATCH 1/7] platform-v7a: barebox: don't break the console autodetection

[Robert Schwebel]

On Thu, Feb 22, 2018 at 04:14:04PM +0100, Roland Hieber wrote:
> On 19.02.2018 21:52, Robert Schwebel wrote:
> > On Mon, Feb 19, 2018 at 04:37:13PM +0100, Roland Hieber wrote:
> > > The global variable linux.bootargs.console is set by barebox on startup
> > > to the chosen stdout path from the Device Tree. Rename the variable in
> > > our barebox defaultenvs to prevent shadowing this automatic variable,
> > > so that the stdout path is passed on to the Linux kernel.
> > > 
> > > Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
> > 
> > Series pulled, thx.
> 
> I don't see them upstream yet. Did you also push it? :-)

Now.

rsc
-- 
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