apm821xx: MBL: load kernel/dtb from SATA 0:1 first

[sqrwf]

(Backport of commit 7aa5dc4)

This remedies an issue with the MBL Duo if both disks are inserted
and contain OpenWrt. kernel and dtb would be loaded from SATA 1:1
while rootfs (/dev/sda2) would be mounted on SATA 0:1.

Such a mix&match would obviously only work if both OpenWrt versions/
builds are identical, and especially fail after sysupgrade upgraded
the system disk on SATA 0:1.

The fallback to SATA 1:1 needs to be kept for MBL Single (only has
SATA 1:1) and MBL Duo with one disk inserted on SATA 1:1. To speed
up booting in those cases, the unneccesarily doubled "sata init"
will only be called once. (In theory it could be omitted completely
since the on-flash boot script already initializes SATA to load the
on-disk boot script.)

Tested on MBL Duo (all possible combination of disks) and MBL Single

Signed-off-by: Freddy Leitner hello@square.wf

[mkresin]

I was about to merge the backport. But your commit has exactly the same issue I asked to fix for your next contribution.

I'm not going to commit it till it is fixed.

[sqrwf]

You mean that my e-mail on github is set to private? That's going to stay that way.

[mkresin]

No, what I mean is that the From: in https://github.com/openwrt/openwrt/pull/1350.patch is set to a value ("square.wf" <30551458+squarewf@users.noreply.github.com>) not matching your Signed-off-by (Signed-off-by: Freddy Leitner <hello@square.wf>).

And no, @users.noreply.github.com will not be accepted as SoB.

From https://openwrt.org/submitting-patches

• the Author field must match the “Signed-off-by:” line
  • if you are editing files and committing through GitHub, you must write your real name in the “Name” field in GitHub settings and the email used in the “Signed-off-by:” must be your primary github email
  • if you are editing files and committing on your local PC, set your name and email with

git config --global user.name "my name"
git config --global user.email "my@email.address"

Our system rejects commits if from != SoB. The last time I replaced the From: with the one from your SoB.

[sqrwf]

Edit: The discrepancy between From and SoB is a result of Github's email privacy setting. Honestly, no drama intended, right now I just don't have time nor energy to create what you would consider a proper setup. For now, thank you for your help and patience.