From d0a2d0492a77c94278fa21ffe8efd3f6cf8d701e Mon Sep 17 00:00:00 2001 From: Pavan Naregundi Date: Thu, 3 Mar 2022 15:41:53 +0530 Subject: [PATCH 1/2] [Marvell-armhf] Removing incorrect check in plt setup for fw_env config Change-Id: Icd5a867d22fa3e5e72ac1597f3e73430e8ca2675 Signed-off-by: Pavan Naregundi --- .../sonic-platform-nokia/nokia-7215_plt_setup.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/platform/marvell-armhf/sonic-platform-nokia/nokia-7215_plt_setup.sh b/platform/marvell-armhf/sonic-platform-nokia/nokia-7215_plt_setup.sh index 8301999d0d0a..0af85d730615 100755 --- a/platform/marvell-armhf/sonic-platform-nokia/nokia-7215_plt_setup.sh +++ b/platform/marvell-armhf/sonic-platform-nokia/nokia-7215_plt_setup.sh @@ -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 From 440e6f216b0de27d157efaa4d901fb45dca918fe Mon Sep 17 00:00:00 2001 From: Pavan Naregundi Date: Thu, 10 Mar 2022 15:54:19 +0530 Subject: [PATCH 2/2] [Marvell-armhf] Removing legacy_volume_label in create_partition Change-Id: Ieb3e9c8821172c90e606b1209b2cef23a2dce271 Signed-off-by: Pavan Naregundi --- platform/marvell-armhf/platform.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/marvell-armhf/platform.conf b/platform/marvell-armhf/platform.conf index 58748808fef7..3a9869158abc 100644 --- a/platform/marvell-armhf/platform.conf +++ b/platform/marvell-armhf/platform.conf @@ -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