brcm63xx: Change overlay volume name to overlay1/2
To be consistent with the naming of bootfs1/2 and rootfs1/2, change the name of the corresponding volume for the overlay to overlay1/2.
Only WE7202242SA and SMARTHUB3_R0A are in customer's hands. SMARTHUB3_R0A is using eMMC flash, and we use the partition number for eMMC devices at this point, so there is no issue. Existing WE7202242SA or SMARTHUB3_R0A won't be migrated. New revisions of the boards have a different board id with the new renamed overlay partition.
Existing boards currently under development, need to be updated manually. After upgrading to the new system, the overlay will fail to mount due to the rename, and the following needs to be executed from serial console:
IMPORTANT:: From this point on, running older images with the old overlay name will no longer work and only newer images (i.e. after this change) will work. To run older images, one has to the same steps as above, but do the rename the other way round.
It is advised to do the rename before the upgrade and then do upgrade via the bootloader (see "Robust instructions" below). In case one has already upgraded, one can follow the "Alternative instructions" further down.
Robust instructions (rename before the upgrade)
These are newer instructions that are a bit more robust and less prone to error.
-
Rename the overlay volumes:
ubirename /dev/ubi0 overlayA overlay1 overlayB overlay2 -
Check that both overlay volumes exist with the new names. The command
ubinfo --all | grep overlayshould return:
Name: overlay1 Name: overlay2 -
Reboot via serial console and hold the return/enter-key right after entering the command and keep holding it....
rebootKeep holding the return-key until the board has stopped inside the bootloader. This looks like this and you should see a prompt like this:
Hit any key to stop autoboot: 0
=>
=>
=> Enable Switch MAC Port Rx/Tx, set PBVLAN to FAN out, set switch to NO-STP. offset_jump = 2
RDP TM memory = 20MB, MC memory = 4MB : Max Possible Bufs <8192> of size <2048>; Allocating <7680> bufs; RDP enum <2>
Creating CPU ring for queue number 0 with 32 packets descriptor=0x1ffe63e4, size_of_entry 16
Done initializing Ring 0 Base=0x1c5180a0 End=0x1c5182a0 calculated entries= 32 RDD Base=1c5180a0K descriptor=0x1ffe63e4
=>
-
Navigate to http://192.168.1.1 in your browser and upload the new image. The device will reboot into the new system
-
Check that only two partitions exist:
ubinfo --all | grep overlayshould return:
Name: overlay1 Name: overlay2In case you see overlayA or overlayB there (because you accidentally booted into the old system for example), remove those using the following command and then check again as described above.
ubinfo --all | grep -E 'overlay[AB]' | sed -e 's/Name: *//' | xargs -r -n1 ubirmvol /dev/ubi0 --name
Alternative instructions (if you have already upgraded)
These instructions are for those who happened to upgrade to the new version already and did not follow the robust instruction above.
-
Upgrade to the new version (does not matter if via sysupgrade or bootloader). You probably already have done so...
-
In the newly upgraded the new system, rename overlayA:
ubirename /dev/ubi0 overlayA overlay1 -
Then, rename overlayB:
ubirename /dev/ubi0 overlayB overlay2 -
It might be that the new overlay has been created automatically and one of the renames has failed, remove the stray one.
ubinfo --all | grep -E 'overlay[AB]' | sed -e 's/Name: *//' | xargs -r -n1 ubirmvol /dev/ubi0 --name -
Check again that both overlay partitions exist with the new names. The command
ubinfo --all | grep overlayshould return:
Name: overlay1 Name: overlay2 -
Reboot: reboot