Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Marvell-armhf] Fixing issues related to partition label #10203

Merged
merged 2 commits into from
Mar 24, 2022
Merged

[Marvell-armhf] Fixing issues related to partition label #10203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0a2d04
[Marvell-armhf] Removing incorrect check in plt setup for fw_env config
pavannaregundi Mar 3, 2022
440e6f2
[Marvell-armhf] Removing legacy_volume_label in create_partition
pavannaregundi Mar 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion platform/marvell-armhf/platform.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ create_ubi_partition() {

create_gpt_partition() {
blk_dev="/dev/sda"
demo_part=$(sgdisk -p $blk_dev | grep -e "$demo_volume_label" -e "$legacy_volume_label" | awk '{print $1}')
demo_part=$(sgdisk -p $blk_dev | grep -e "$demo_volume_label" | awk '{print $1}')
# ONIE partition size 168MB
onie_part_size=168

Expand Down
6 changes: 0 additions & 6 deletions platform/marvell-armhf/sonic-platform-nokia/nokia-7215_plt_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ fw_uboot_env_cfg()
if [ "$PLATFORM" = "armhf-nokia_ixs7215_52x-r0" ]; then
# Ixs7215 / IPD6448M board Uboot ENV offset
FW_ENV_DEFAULT='/dev/mtd0 0x00100000 0x10000 0x10000'

demo_part=$(sgdisk -p /dev/sda | grep -e "SONiC-OS")
if [ -z "$demo_part" ]; then
# ET6448M Board - For Backward compatibility
FW_ENV_DEFAULT='/dev/mtd0 0x00500000 0x80000 0x100000 8'
fi
else
FW_ENV_DEFAULT='/dev/mtd0 0x00500000 0x80000 0x100000 8'
fi
Expand Down