From b5abcc8af9bb4ace47e95479d89bc144ff2a8d91 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 7 May 2024 13:41:43 +0200 Subject: [PATCH] cn9130-crb: Add a small bootdelay in U-Boot This is not a production target, so we choose the more developer friendly option of allowing the boot process to be interrupted. Also, remove the old update cruft and rely on Marvell's `bubt` instead. --- .../cn9130-crb/uboot/cn9130-crb-env.dtsi | 31 +------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/board/aarch64/cn9130-crb/uboot/cn9130-crb-env.dtsi b/board/aarch64/cn9130-crb/uboot/cn9130-crb-env.dtsi index 7d1ba539..f892e75d 100644 --- a/board/aarch64/cn9130-crb/uboot/cn9130-crb-env.dtsi +++ b/board/aarch64/cn9130-crb/uboot/cn9130-crb-env.dtsi @@ -16,36 +16,7 @@ run ixboot "; boot_targets = "mmc1"; ethprime = "eth1"; - - /* Uncomment this if you're debugging U-Boot - * - * This will allow you to break out of the - * normal boot flow and into the interactive - * console. - * - * To upgrade U-Boot itself, simply set the - * `bootfile` variable to the path of - * `flash-image.bin` on your TFTP server, then - * issue `run ixupgradeboot`. - */ -/* bootdelay = "2"; */ -/* ixupgradeboot = " */ -/* dhcp */ -/* setexpr fileblks ${filesize} + 0x1ff */ -/* setexpr fileblks ${fileblks} / 0x200 */ - -/* mmc dev 1 */ -/* part start mmc 1 boot bootstart */ -/* part size mmc 1 boot bootsize */ - - -/* mmc erase ${bootstart} ${bootsize} */ -/* mmc write ${fileaddr} ${bootstart} ${fileblks} */ -/* "; */ + bootdelay = "1"; }; }; }; - -/* &cp0_eth0 { */ -/* phy-mode = "10gbase-r"; */ -/* }; */