From nobody Mon May 31 05:27:31 2021 X-Original-To: arm@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E79CAD78DD3 for ; Mon, 31 May 2021 05:27:38 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic309-22.consmr.mail.gq1.yahoo.com (sonic309-22.consmr.mail.gq1.yahoo.com [98.137.65.148]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FtkMF465Cz3QPC for ; Mon, 31 May 2021 05:27:37 +0000 (UTC) (envelope-from marklmi@yahoo.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1622438855; bh=zRyduKlKK6C0w0Pjn3QFuyOLthSvk7FC7bUYclcKJu0=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=ZOdV6FZ6bZZekxjeLqwkh7VKg1v7HWl8n7kRAGmG8LeVljX/pbEAdFXbl/Uu2O4Us2lhHgUeVompK1o8LZvPNaDfR7mapfrBzYJZRLmVfjANI3np/vrvSED6SmsVS2TYYeXPeLAEEAJVpSsbrvP6jw3hy4ADR096GKwT3DjjQdijFMXvJUzOzkE6+ZMk/jjEqcl3PAdXue7yS6UEVb626NvdjbO3ZlSstGCK5yGl3CCQJEfw+V3WYZph7X39EaMzGC8dXGnYEOrjxtLgmRMTmt8yZ1huGTZfhFmre+fSqwwZx5l8FkJD+GC1wfHiiLRoSW9ARX25N9vIJ8UHwwzruA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1622438855; bh=yu3GUJ/YhJ0KqYfdIh6Mi+UhI+ttfS1I3W7381Dxfls=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=sNdMsTLK7OQpMBmW0hYYgu66EwfXkTLE1HhkRKKzGaLpwcCJMzqgRQ2T620YtJUo2LMJOkGBBk4V+B1K8iy8GocRJrIvy8LLc3E+8mdwbuQDxDXIOfJvzwavwNWzERZS1BXqRpB+iL8g3xkZN0g5yzPgjQeR0mzgz4Dm9rwyJIkOlMMjzViQGsriHnaLTL/J4UyWKwaHyBNSIqyLqFVELkrEpFnIReJs/IBsFWu1up75SkZHnJs3rRuxGF7C62E/owuL5V9zQjkOZSNW6d9WkVXr9ZQ203/dHPKLjrBixHGxA7UjYbhhE77ZAO/4GVdVLsHQF7bHuiI5Jyqs3lmvXw== X-YMail-OSG: 3TalKqMVM1nfUuaafoCvxUEL0DjTBxhpSPx9sahojNBBnD7E72iW044Py1p_oUK dv2bApOfWozGxvLM3_qqckZ.s99fFMyB9t5LBNLMnxtKM2JTAepMMH5i_KVg47ZSDlCHeNyUm5Lt Aa2ZadZonkGsgmyJNPxKW60WUjr4Z60ZgUx8xP.sO8J2HAkytIXFWlheIm.waDVWkk.QAxEbnB1M ospE.2W8kKR5EAg6jDfFXOuHp80DvNSO.mCh6rq4A00pSxLpzPmgJoICOYC73549RgLzCNd.kNjz W_Jc.54LnUwiqST5ZdQ.3gGgyqM7SnuwbMappvNbySUPeaJfW_ijZXvgnfH6BpOU1PpS9MbXdIAR hWl3e9G_wkGd1B35H8x3BaHNL5WswRsTE17msi2zv9jV59xqlv6QSi8OFN_HAEuhNr1qc1jwmm1e WIUQIxztJyk2qZ93l9t0bIVYJfIGTcOU7ckcpwWk1VLC1b475XkZ57Rno2ZufE.oIraq_MJdfm8D gaXzLutEeFJ9Fik6ptdWV2nQk_CBG5fvIZTjSPLefQtwgySy677eEsda13lbXAvjjraVyxQc8aI9 0Cjyq7MCUN0pssfJ_yf7SV1VwqXJez_Ag9Q_jKiMJc2osmktFj6M02J.pvRA8bQEnDM6zd1s3oz7 yudqjNQ0.bdkElrtlcV9.10PlJEBEM3Si5F91gzlvu1xfbrz_foAWcYpBagWQqIHBjaOJeIioeQC RRuazPDYHtUXprdsXDxQuaD7U3hAgvlInYGJ7zi69jSvvqtrreW8losRTWT1JPijdXwmTwYfBGqB lKmQzW3Krb4Yb9EM.jMDlMnhcwRYXCnZTMfpk.gVWSY6iK6_aNI_f2FaR48A4XsmFtpl1mLB4jSe 8YU3pZFXH4xbiNFBQMfgrQ73w8RQHpPV6yh6XE3Z0MgeGPoa8hwPEWZjs5.XFIqFsovcsU2.zUbU UVlSYOsYB7ZW.81qoLXtlx9sanZ8UOof9Z2ujYceSKJSphsNOQkaKFk1_5YqgPPRWe7USomq3.kj N9tHTcUegv_IwmeuMXCpr08C93vyggWJ3lpNV6iRZ1hgf7aoMUG4WGbFzdPxgUdJw34eIw4HVl.M 0upEDCnwCH5N9.dO5CANaf9N85ZQicFeiArmVK16IEQM3pi0S1eKYZ4qW_ARKR0A4KT5bAvEY2qY 62wXwkoC2AkcBW3LpNAQWVd43nC75akl5x.evmPTDbAKSAhISTXLzg53zmUYYA40ASv0I2yWWzA7 fFotaK05xVOaJHJuZ5VO0ebAXlc9__pLK1GvhF0pMLZy_8bh_aJwt0A_3.5OwxUTINADKKaAW4sJ uS6zMci6G4SSDJwMSsfratQLila98RlbjOt3InJljcMIN.eIKUfJQaY7oGt9c2CXwCzJJAgsU457 yshEwMWLLaqBxhmkMhv0LntxDcuHmU5Qzhl9a8Fi8egssfK1WlrOmoyT_TVuDRhwDUN5Ddx1WMcO PqCua97znwwGatiCar7q1AvZ1YPFqINDuupab7u7J.Jqkfy_p7HZbROLYxxyZHVVkPdR_kv4beJ6 C_qEHOVyqi6qgUW8WdozhtiAVVWUGsuT8WQzS7CpXH.t9JEdmubafmz4.UEcsS.nGPzvKAkCKsrZ 9ckrSmDaki.69Ccv.v1s8lyYZABhtp.rVy7JDchZ.njdPuqfxLxAvJAUGHcqq.5PLC_Fz0DOUbFo rwEcKUOHdS.IobwCzZWRUydTD5IYtUgBd_diEg0DP5oodAEa1ma07MIzqRkVXav.KwdosqCZyeqc o0qkJC.5m8nYmNlpzby94XoOpUgToxFbQGGEykiH2z0bdMmO6pEZFhCi7qiBe3_nO8d7031oLXmP xdtJdhOG71FgMKb8lB24HVTUZf5OW9xezs_24FP4y3rTtGfu9viNwt982mFxcouPofLOXDH91k7b ZV0yrWYvr2RvQ5NWNzWI0pJpM9C6ShOeugsRdCWVUdr571vCqQ7WvKQSN5EvQDbXHcsIuQviixXm _.cVRx06c_dFsQG9WGxD3Qc8N_O1.inx2DcyRdsyk_6PRTOfHtUVIlj9v3ZM8guKJEnpvq2jtKZt OFwyed2iESb8iVn.c6M_EC7ItwSz81Jju0I8ERUaVvr_E.1nam5UEyTfm3hyjgH_czogd18muKsp p6BaedEeTHr4VXmGpj3w3ksaTYYwGv4RzJ2YjzoYB7Wm6Tw.e0xwoWbia59V6HLc.3EUzp9lh5YZ n1e45M5UOQ2JPTXs.rg7oCVC6OP70mN0xrHQ_iGts4HhWd5AsOxgIa2eUjnZ3tTT9.qU6P0_voV1 WVJ1KzYaLXTNHiG0XcCLH2xHi6R16ClS9Fk.Ui9kPQ8Ola8WcJtSZJfjtNTcU7DpoOzDafiNntzL xP1NocwHya2zPXgpD5Ho7KLn1wcDz5QmoQMH4hbGqeS4awQ68TaBDE8v88zDUsJ.FbSVIUHqiMdF ovLLorczzyYYdj7p8QSPuXmWw6CQRM65wIt3GZCRU7cO4hvKi86VbzRBcgEdcXXHUL0WE8baRPhZ lFIK42_AZp4YLZNDEqcKRojPkUqn1ZMi3HkHqtmTsZ59eJ0d3bM7flyUm.uzwvHLrTCkTGCNZOhm yUoIZhicGo5bJEqjiHRSmmqmz56hBJ77AWj.R9miGxCyZLNcoHpb3yj2KqAQrK_H1ZDG1VntD1bH tM.U- X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic309.consmr.mail.gq1.yahoo.com with HTTP; Mon, 31 May 2021 05:27:35 +0000 Received: by kubenode563.mail-prod1.omega.gq1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 49aa2b701f17f3e1c310e4c171ffde94; Mon, 31 May 2021 05:27:32 +0000 (UTC) Content-Type: text/plain; charset=us-ascii List-Id: Porting FreeBSD to ARM processors List-Archive: https://lists.freebsd.org/archives/freebsd-arm List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-arm@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.80.0.2.43\)) Subject: Re: /usr/local/share/u-boot/u-boot-orangepi-plus-2e/README out of date ; orangepi-plus-2e and RPi2 v1.1 get "Kernel args: (null)" In-Reply-To: <0482F239-B137-42F5-8802-8883D08D5868@yahoo.com> Date: Sun, 30 May 2021 22:27:31 -0700 Cc: "freebsd-arm@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <5F226A9B-852D-4E72-9896-0509E56D3318@yahoo.com> References: <40298C05-5F50-4437-B15B-7A02EA070EAE.ref@yahoo.com> <40298C05-5F50-4437-B15B-7A02EA070EAE@yahoo.com> <20210513111517.86336633bae9568d8599f229@bidouilliste.com> <20210513124050.47714a83f876d67a80e28080@bidouilliste.com> <3C04FB55-4A26-48C8-833F-E4AC84DC4F78@yahoo.com> <99906599-273E-4216-A41E-DE642F33E392@yahoo.com> <0482F239-B137-42F5-8802-8883D08D5868@yahoo.com> To: Emmanuel Vadot X-Mailer: Apple Mail (2.3654.80.0.2.43) X-Rspamd-Queue-Id: 4FtkMF465Cz3QPC X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=ZOdV6FZ6; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.65.148 as permitted sender) smtp.mailfrom=marklmi@yahoo.com X-Spamd-Result: default: False [-3.50 / 15.00]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RBL_DBL_DONT_QUERY_IPS(0.00)[98.137.65.148:from]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_ZRD(0.00)[98.137.65.148:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.65.148:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.65.148:from]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[arm] Reply-To: marklmi@yahoo.com From: Mark Millard via arm X-Original-From: Mark Millard X-ThisMailContainsUnwantedMimeParts: N On 2021-May-24, at 20:10, Mark Millard wrote: > On 2021-May-24, at 15:53, Mark Millard wrote: >=20 >> On 2021-May-13, at 12:03, Mark Millard wrote: >>=20 >>>>>> . . . >>=20 >> I do not know if the FreeBSD kernel has been depending >> on some U-Boot initialization for root-on-USB and the >> two no longer match or what. >>=20 >> But I've used a release/13.0.0.0 microsd card based >> boot to get older U-Boot materials (Quarterly as it >> turns out). Installing such got me back to having a >> root-on-USB boot of the OPi+2e (other than the >> mircosd card having the older U-Boot (2020.10 as it >> turns out). Of course there is also the matching >> boot.scr involved --but it also is on the USB SSD. >> (Similarly reverted RPi2 U-Boot, other than needing >> to switch boot.scr to match.) >>=20 >> After booting with the reverted U-Boot related >> material: >>=20 >> # mount -onoatime -tmsdosfs /dev/mmcsd1s1 /mnt >> # mount -onoatime /dev/mmcsd1s2a /media >>=20 >> # ls -Tla /mnt/ >> total 20 >> drwxr-xr-x 1 root wheel 16384 Dec 31 16:00:00 1979 . >> drwxr-xr-x 25 root wheel 512 Dec 31 16:00:40 2009 .. >>=20 >> # ls -Tla /media/ >> total 60 >> drwxr-xr-x 2 root wheel 512 May 24 15:43:19 2021 . >> drwxr-xr-x 25 root wheel 512 Dec 31 16:00:40 2009 .. >> -rwxr-xr-x 1 root wheel 52456 Apr 24 19:48:36 2021 bootcode.bin >>=20 >> The media is also set up for booting an RPi2 via >> root-in-USB ( other than bootcode.bin ). >>=20 >> If FreeBSD and the more modern U-Boot were well matched >> for USB support, I'd expect that this sort of thing would >> work (no boot.scr needed). >>=20 >> For reference: >>=20 >> # ~/fbsd-based-on-what-freebsd-main.sh=20 >> FreeBSD OPiP2E_RPi2v11 14.0-CURRENT FreeBSD 14.0-CURRENT = mm-src-n245445-def0058cc690 GENERIC-NODBG arm armv7 1400005 1400005 >> def0058cc690 (HEAD -> mm-src) mm-src snapshot for mm's patched build = in git context. >> merge-base: 7381bbee29df959e88ec59866cf2878263e7f3b2 >> merge-base: CommitDate: 2021-03-12 20:29:42 +0000 >> 7381bbee29df (freebsd/main, freebsd/HEAD, pure-src, main) cam: Run = all XPT_ASYNC ccbs in a dedicated thread >> n245444 (--first-parent --count for merge-base) >=20 > Looks like 2021.04 (even before 2021.04_1) also has the > problem for root-on-USB handling. >=20 > I managed to find a 2021-Apr-09 u-boot-orangepi-plus-2e > directory copy that was 2021.04 (and its boot.scr) but > before the UEFI change. When I tried it for the > root-on-USB context I still got the hangup after "Kernel > args: (null)" in: >=20 > . . . > Hit [Enter] to boot immediately, or any other key for command prompt. > Booting [/boot/kernel/kernel]... =20 > Using DTB provided by EFI at 0x47eea000. > Kernel entry at 0xb2e00200... > Kernel args: (null) >=20 >=20 > So it does not appear to be the UEFI change so much as > 2021.04 in general for which the FreeBSD kernel and > the U-Boot are apparently(?) mismatched for root-on-USB. >=20 >=20 > Reverting again to 2020.10 U-Boot got back the root-on-USB > status. For this the boot looks like: >=20 > . . . > Hit [Enter] to boot immediately, or any other key for command prompt. > Booting [/boot/kernel/kernel]... =20 > Using DTB provided by EFI at 0x47ef5000. > Kernel entry at 0xb2e00200... > Kernel args: (null) > ---<>--- > KDB: debugger backends: ddb > KDB: current backend: ddb > Copyright (c) 1992-2021 The FreeBSD Project. > Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, = 1994 > The Regents of the University of California. All rights = reserved. > FreeBSD is a registered trademark of The FreeBSD Foundation. > FreeBSD 14.0-CURRENT mm-src-n245445-def0058cc690 GENERIC-NODBG arm > FreeBSD clang version 11.0.1 (git@github.com:llvm/llvm-project.git = llvmorg-11.0.1-0-g43ff75f2c3fe) > . . . >=20 Well, I got a surprise in exploring: removing boot.scr and ubldr.bin did not prevent booting. (Noticed by the accident of ending up with one of them missing that I only later noticed.) So I recorded a boot and: . . . U-Boot SPL 2020.10 (Apr 19 2021 - 18:04:31 +0000) DRAM: 2048 MiB Trying to boot from MMC1 U-Boot 2020.10 (Apr 19 2021 - 18:04:31 +0000) Allwinner Technology CPU: Allwinner H3 (SUN8I 1680) Model: Xunlong Orange Pi Plus 2E DRAM: 2 GiB . . . Device 0: Vendor: OWC Rev: 0 Prod: Envoy Pro mini =20 Type: Hard Disk Capacity: 228936.5 MB =3D 223.5 GB (468862128 x 512) ... is now current device Scanning usb 0:4... 30675 bytes read in 3 ms (9.8 MiB/s) Found EFI removable media binary efi/boot/bootarm.efi . . . Booting /efi\boot\bootarm.efi Consoles: EFI console =20 |=08/=08-=08\=08|=08/=08-=08\=08|=08/=08-=08\=08|=08/=08-=08\=08|=08/=08-=08= \=08|=08/=08-=08\=08|=08/=08-=08\=08 Reading loader env vars from = /efi/freebsd/loader.env Setting currdev to disk2p4: |=08/=08-=08\=08|=08/=08FreeBSD/arm EFI loader, Revision 1.1 . . . So I've likely been been booting via UEFI for some time via 2020.10 (or even before?), just without noticing at the time. The other implication is likely that what disabled root-on-USB for my context was not the boot.scr removal material but some (possibly proper) subset of other material changed (extracted from ports' main 0d6e5081eb00 commit cgit display): diff --git a/sysutils/u-boot-master/files/FreeBSD_Fragment = b/sysutils/u-boot-master/files/FreeBSD_Fragment index 630d295cc8f1..f3837a932e98 100644 --- a/sysutils/u-boot-master/files/FreeBSD_Fragment +++ b/sysutils/u-boot-master/files/FreeBSD_Fragment @@ -1,3 +1,2 @@ -CONFIG_API=3Dy CONFIG_ARMV7_NONSEC=3Dn -CONFIG_CMD_CACHE=3Dy +CONFIG_EFI_GRUB_ARM32_WORKAROUND=3Dy diff --git a/sysutils/u-boot-master/files/patch-api_api.c = b/sysutils/u-boot-master/files/patch-api_api.c deleted file mode 100644 index 5de1e5e653d9..000000000000 --- a/sysutils/u-boot-master/files/patch-api_api.c +++ /dev/null @@ -1,14 +0,0 @@ ---- api/api.c.orig 2018-07-09 14:24:14 UTC -+++ api/api.c -@@ -289,6 +289,11 @@ static int API_dev_close(va_list ap) - if (!err) - di->state =3D DEV_STA_CLOSED; -=20 -+ if (dcache_status()) -+ flush_dcache_all(); -+ if (icache_status()) -+ invalidate_icache_all(); -+ - return err; - } -=20 diff --git a/sysutils/u-boot-master/files/FreeBSD_Fragment = b/sysutils/u-boot-master/files/FreeBSD_Fragment index 630d295cc8f1..f3837a932e98 100644 --- a/sysutils/u-boot-master/files/FreeBSD_Fragment +++ b/sysutils/u-boot-master/files/FreeBSD_Fragment @@ -1,3 +1,2 @@ -CONFIG_API=3Dy CONFIG_ARMV7_NONSEC=3Dn -CONFIG_CMD_CACHE=3Dy +CONFIG_EFI_GRUB_ARM32_WORKAROUND=3Dy diff --git a/sysutils/u-boot-master/files/boot.cmd = b/sysutils/u-boot-master/files/boot.cmd deleted file mode 100644 index b3ce82975eb3..000000000000 --- a/sysutils/u-boot-master/files/boot.cmd +++ /dev/null @@ -1,2 +0,0 @@ -fatload ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} = ubldr.bin && go ${kernel_addr_r} -echo "Cannot load ubldr.bin" diff --git a/sysutils/u-boot-master/files/patch-api_api.c = b/sysutils/u-boot-master/files/patch-api_api.c deleted file mode 100644 index 5de1e5e653d9..000000000000 --- a/sysutils/u-boot-master/files/patch-api_api.c +++ /dev/null @@ -1,14 +0,0 @@ ---- api/api.c.orig 2018-07-09 14:24:14 UTC -+++ api/api.c -@@ -289,6 +289,11 @@ static int API_dev_close(va_list ap) - if (!err) - di->state =3D DEV_STA_CLOSED; -=20 -+ if (dcache_status()) -+ flush_dcache_all(); -+ if (icache_status()) -+ invalidate_icache_all(); -+ - return err; - } -=20 diff --git a/sysutils/u-boot-master/files/patch-api_api__storage.c = b/sysutils/u-boot-master/files/patch-api_api__storage.c deleted file mode 100644 index 2e5846fb9a5c..000000000000 --- a/sysutils/u-boot-master/files/patch-api_api__storage.c +++ /dev/null @@ -1,25 +0,0 @@ ---- api/api_storage.c.orig 2019-07-08 19:23:28 UTC -+++ api/api_storage.c -@@ -69,13 +69,6 @@ void dev_stor_init(void) - specs[ENUM_SATA].type =3D DEV_TYP_STOR | DT_STOR_SATA; - specs[ENUM_SATA].name =3D "sata"; - #endif --#if defined(CONFIG_SCSI) -- specs[ENUM_SCSI].max_dev =3D CONFIG_SYS_SCSI_MAX_DEVICE; -- specs[ENUM_SCSI].enum_started =3D 0; -- specs[ENUM_SCSI].enum_ended =3D 0; -- specs[ENUM_SCSI].type =3D DEV_TYP_STOR | DT_STOR_SCSI; -- specs[ENUM_SCSI].name =3D "scsi"; --#endif - #if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE) - specs[ENUM_USB].max_dev =3D USB_MAX_STOR_DEV; - specs[ENUM_USB].enum_started =3D 0; -@@ -281,7 +274,7 @@ int dev_enum_storage(struct device_info *di) - { - int i; -=20 -- /* check: ide, usb, scsi, mmc */ -+ /* check: ide, usb, mmc */ - for (i =3D ENUM_IDE; i < ENUM_MAX; i ++) { - if (dev_enum_stor(i, di)) - return 1; diff --git a/sysutils/u-boot-master/files/patch-cmd_boot.c = b/sysutils/u-boot-master/files/patch-cmd_boot.c deleted file mode 100644 index b0c520aeb2ed..000000000000 --- a/sysutils/u-boot-master/files/patch-cmd_boot.c +++ /dev/null @@ -1,13 +0,0 @@ ---- cmd/boot.c.orig 2018-07-09 14:24:14 UTC -+++ cmd/boot.c -@@ -18,6 +18,10 @@ __attribute__((weak)) - unsigned long do_go_exec(ulong (*entry)(int, char * const []), int = argc, - char * const argv[]) - { -+ if (dcache_status()) -+ flush_dcache_all(); -+ if (icache_status()) -+ invalidate_icache_all(); - return entry (argc, argv); - } -=20 diff --git a/sysutils/u-boot-master/files/patch-cmd_elf.c = b/sysutils/u-boot-master/files/patch-cmd_elf.c deleted file mode 100644 index a6cac78a0989..000000000000 --- a/sysutils/u-boot-master/files/patch-cmd_elf.c +++ /dev/null @@ -1,14 +0,0 @@ ---- cmd/elf.c.orig 2018-07-09 14:24:14 UTC -+++ cmd/elf.c -@@ -153,6 +153,11 @@ static unsigned long do_bootelf_exec(ulong = (*entry)(in - { - unsigned long ret; -=20 -+ if (dcache_status()) -+ flush_dcache_all(); -+ if (icache_status()) -+ invalidate_icache_all(); -+ - /* - * pass address parameter as argv[0] (aka command name), - * and all remaining args =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar)