mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/4] ARM: rdu2: extend environment for netboot
@ 2019-05-31 10:31 Lucas Stach
  2019-05-31 10:31 ` [PATCH 2/4] ARM: rdu2: disable i210 network interface Lucas Stach
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Lucas Stach @ 2019-05-31 10:31 UTC (permalink / raw)
  To: barebox

This adds the necessary scripts to clear the seat network
configuration and reset the switch in the development case.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 .../zii-imx6q-rdu2/defaultenv-rdu2/boot/net   | 24 +++++++++++++++++++
 .../zii-imx6q-rdu2/defaultenv-rdu2/boot/nfs   |  7 ++++++
 .../defaultenv-rdu2/boot/rdu-default          |  4 ++++
 .../defaultenv-rdu2/network/eth0-discover     |  4 ++++
 .../defaultenv-rdu2/nv/autoboot_abort_key     |  1 +
 .../defaultenv-rdu2/nv/boot.default           |  2 +-
 6 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/net
 create mode 100644 arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/nfs
 create mode 100644 arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/rdu-default
 create mode 100644 arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/network/eth0-discover
 create mode 100644 arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/nv/autoboot_abort_key

diff --git a/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/net b/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/net
new file mode 100644
index 000000000000..4090c2f4a9ae
--- /dev/null
+++ b/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/net
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+path="/mnt/tftp"
+
+# clear seat network config
+global.linux.bootargs.rdu_network=
+
+global.bootm.image="${path}/${global.user}-linux-${global.hostname}"
+
+oftree="${path}/${global.user}-oftree-${global.hostname}"
+if [ -f "${oftree}" ]; then
+	global.bootm.oftree="$oftree"
+fi
+
+nfsroot="/home/${global.user}/nfsroot/${global.hostname}"
+
+ip_route_get -b ${global.net.server} global.linux.bootargs.dyn.ip
+
+initramfs="${path}/${global.user}-initramfs-${global.hostname}"
+if [ -f "${initramfs}" ]; then
+	global.bootm.initrd="$initramfs"
+else
+	global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp"
+fi
\ No newline at end of file
diff --git a/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/nfs b/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/nfs
new file mode 100644
index 000000000000..4f9671f9cd20
--- /dev/null
+++ b/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/nfs
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# clear seat network config
+global.linux.bootargs.rdu_network=
+
+backlight0.brightness=0
+boot /mnt/nfs
diff --git a/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/rdu-default b/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/rdu-default
new file mode 100644
index 000000000000..40346f69f4d9
--- /dev/null
+++ b/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/rdu-default
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+backlight0.brightness=0
+boot mmc1
\ No newline at end of file
diff --git a/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/network/eth0-discover b/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/network/eth0-discover
new file mode 100644
index 000000000000..00f312011549
--- /dev/null
+++ b/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/network/eth0-discover
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# reset switch to clear DSA config
+rave_reset_switch
diff --git a/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/nv/autoboot_abort_key b/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/nv/autoboot_abort_key
new file mode 100644
index 000000000000..55920c9a58ca
--- /dev/null
+++ b/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/nv/autoboot_abort_key
@@ -0,0 +1 @@
+ctrl-c
\ No newline at end of file
diff --git a/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/nv/boot.default b/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/nv/boot.default
index 3cfe9bafdca5..9076a1e64eb5 100644
--- a/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/nv/boot.default
+++ b/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/nv/boot.default
@@ -1 +1 @@
-mmc1
\ No newline at end of file
+rdu-default
\ No newline at end of file
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH 2/4] ARM: rdu2: disable i210 network interface
  2019-05-31 10:31 [PATCH 1/4] ARM: rdu2: extend environment for netboot Lucas Stach
@ 2019-05-31 10:31 ` Lucas Stach
  2019-05-31 10:31 ` [PATCH 3/4] ARM: rdu2: extend boot script for eMMC boot Lucas Stach
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Lucas Stach @ 2019-05-31 10:31 UTC (permalink / raw)
  To: barebox

This causes large timeouts when trying to bring it up. The FEC interface
is good enough for NFS booting.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/nv/dev.eth1.mode | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/nv/dev.eth1.mode

diff --git a/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/nv/dev.eth1.mode b/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/nv/dev.eth1.mode
new file mode 100644
index 000000000000..87e7bdaaecfc
--- /dev/null
+++ b/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/nv/dev.eth1.mode
@@ -0,0 +1 @@
+disabled
\ No newline at end of file
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH 3/4] ARM: rdu2: extend boot script for eMMC boot
  2019-05-31 10:31 [PATCH 1/4] ARM: rdu2: extend environment for netboot Lucas Stach
  2019-05-31 10:31 ` [PATCH 2/4] ARM: rdu2: disable i210 network interface Lucas Stach
@ 2019-05-31 10:31 ` Lucas Stach
  2019-05-31 10:31 ` [PATCH 4/4] ARM: rdu2: reserve pstore memory region Lucas Stach
  2019-06-04  8:02 ` [PATCH 1/4] ARM: rdu2: extend environment for netboot Sascha Hauer
  3 siblings, 0 replies; 5+ messages in thread
From: Lucas Stach @ 2019-05-31 10:31 UTC (permalink / raw)
  To: barebox

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 .../zii-imx6q-rdu2/defaultenv-rdu2/boot/rdu-default   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/rdu-default b/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/rdu-default
index 40346f69f4d9..f391d91eba4c 100644
--- a/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/rdu-default
+++ b/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/rdu-default
@@ -1,4 +1,13 @@
 #!/bin/sh
 
 backlight0.brightness=0
-boot mmc1
\ No newline at end of file
+if [ "$bootsource" = "spi-nor" ]; then
+	boot mmc1
+else
+	detect mmc3
+	if [ "$mmc3.boot" = "boot0" ]; then
+		boot mmc3.0
+	else
+		boot mmc3.1
+	fi
+fi
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH 4/4] ARM: rdu2: reserve pstore memory region
  2019-05-31 10:31 [PATCH 1/4] ARM: rdu2: extend environment for netboot Lucas Stach
  2019-05-31 10:31 ` [PATCH 2/4] ARM: rdu2: disable i210 network interface Lucas Stach
  2019-05-31 10:31 ` [PATCH 3/4] ARM: rdu2: extend boot script for eMMC boot Lucas Stach
@ 2019-05-31 10:31 ` Lucas Stach
  2019-06-04  8:02 ` [PATCH 1/4] ARM: rdu2: extend environment for netboot Sascha Hauer
  3 siblings, 0 replies; 5+ messages in thread
From: Lucas Stach @ 2019-05-31 10:31 UTC (permalink / raw)
  To: barebox

From: Philipp Zabel <p.zabel@pengutronix.de>

Reserve a 2 MiB memory region (barebox may choose another address)
to serve as a pstore backend.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/dts/imx6qdl-zii-rdu2.dtsi | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/arch/arm/dts/imx6qdl-zii-rdu2.dtsi b/arch/arm/dts/imx6qdl-zii-rdu2.dtsi
index bfc75ba606d6..5d141fcb3450 100644
--- a/arch/arm/dts/imx6qdl-zii-rdu2.dtsi
+++ b/arch/arm/dts/imx6qdl-zii-rdu2.dtsi
@@ -65,6 +65,23 @@
 		switch-eeprom = &switch;
 	};
 
+	reserved-memory {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+
+		/* Address will be determined by the bootloader */
+		ramoops@2fe00000 {
+			compatible = "ramoops";
+			reg = <0x2fe00000 0x200000>;
+			ecc-size = <16>;
+			record-size = <0x20000>;
+			console-size = <0x20000>;
+			ftrace-size = <0x20000>;
+			pmsg-size = <0x20000>;
+		};
+	};
+
 	panel {
 		compatible = "simple-panel";
 		/* Timings for all supported panels, the correct one is enabled
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH 1/4] ARM: rdu2: extend environment for netboot
  2019-05-31 10:31 [PATCH 1/4] ARM: rdu2: extend environment for netboot Lucas Stach
                   ` (2 preceding siblings ...)
  2019-05-31 10:31 ` [PATCH 4/4] ARM: rdu2: reserve pstore memory region Lucas Stach
@ 2019-06-04  8:02 ` Sascha Hauer
  3 siblings, 0 replies; 5+ messages in thread
From: Sascha Hauer @ 2019-06-04  8:02 UTC (permalink / raw)
  To: Lucas Stach; +Cc: barebox

On Fri, May 31, 2019 at 12:31:13PM +0200, Lucas Stach wrote:
> This adds the necessary scripts to clear the seat network
> configuration and reset the switch in the development case.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  .../zii-imx6q-rdu2/defaultenv-rdu2/boot/net   | 24 +++++++++++++++++++
>  .../zii-imx6q-rdu2/defaultenv-rdu2/boot/nfs   |  7 ++++++
>  .../defaultenv-rdu2/boot/rdu-default          |  4 ++++
>  .../defaultenv-rdu2/network/eth0-discover     |  4 ++++
>  .../defaultenv-rdu2/nv/autoboot_abort_key     |  1 +
>  .../defaultenv-rdu2/nv/boot.default           |  2 +-
>  6 files changed, 41 insertions(+), 1 deletion(-)
>  create mode 100644 arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/net
>  create mode 100644 arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/nfs
>  create mode 100644 arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/rdu-default
>  create mode 100644 arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/network/eth0-discover
>  create mode 100644 arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/nv/autoboot_abort_key

Applied, thanks

Sascha

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

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-06-04  8:02 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-31 10:31 [PATCH 1/4] ARM: rdu2: extend environment for netboot Lucas Stach
2019-05-31 10:31 ` [PATCH 2/4] ARM: rdu2: disable i210 network interface Lucas Stach
2019-05-31 10:31 ` [PATCH 3/4] ARM: rdu2: extend boot script for eMMC boot Lucas Stach
2019-05-31 10:31 ` [PATCH 4/4] ARM: rdu2: reserve pstore memory region Lucas Stach
2019-06-04  8:02 ` [PATCH 1/4] ARM: rdu2: extend environment for netboot Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox