Skip to content

Commit fcd8e7d

Browse files
committed
Addressing review comments
1 parent 647ad51 commit fcd8e7d

File tree

4 files changed

+10
-282
lines changed

4 files changed

+10
-282
lines changed

device/pensando/arm64-elba-asic-r0/config_db.json

Lines changed: 0 additions & 272 deletions
This file was deleted.

files/dsc/install_debian.j2

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,10 @@ cat <<EOF >> $root_mnt/$BL_CONF
244244
default main
245245
246246
label main
247-
kernel /$image_dir/boot/vmlinuz-5.10.0-18-2-arm64
248-
initrd /$image_dir/boot/initrd.img-5.10.0-18-2-arm64
249-
devicetree /$image_dir/boot/elba-asic-psci.dtb
250-
append softdog.soft_panic=1 FW_NAME=mainfwa root=/dev/mmcblk0p10 rw rootwait rootfstype=ext4 loopfstype=squashfs loop=/$image_dir/fs.squashfs
247+
kernel /$image_dir/boot/vmlinuz-5.10.0-18-2-arm64
248+
initrd /$image_dir/boot/initrd.img-5.10.0-18-2-arm64
249+
devicetree /$image_dir/boot/elba-asic-psci.dtb
250+
append softdog.soft_panic=1 FW_NAME=mainfwa root=/dev/mmcblk0p10 rw rootwait rootfstype=ext4 loopfstype=squashfs loop=/$image_dir/fs.squashfs
251251
}
252252
EOF
253253
}
@@ -257,19 +257,19 @@ install_root_filesystem()
257257
echo "==> Installing root filesystem"
258258

259259
mount /dev/mmcblk0p$root_pn $root_mnt
260-
mkdir -p $root_mnt/$image_dir
260+
mkdir -p $root_mnt/$image_dir
261261

262262
# Decompress the file for the file system directly to the partition
263-
if [ x"$docker_inram" = x"on" ]; then
263+
if [ x"$docker_inram" = x"on" ]; then
264264
# when disk is small, keep dockerfs.tar.gz in disk, expand it into ramfs during initrd
265265
tar xfO $PKG $INSTALLER_PAYLOAD | unzip -o - -x "platform.tar.gz" -d $root_mnt/$image_dir
266-
else
266+
else
267267
tar xfO $PKG $INSTALLER_PAYLOAD | unzip -o - -x "$FILESYSTEM_DOCKERFS" "platform.tar.gz" -d $root_mnt/$image_dir
268268

269269
TAR_EXTRA_OPTION="--numeric-owner"
270270
mkdir -p $root_mnt/$image_dir/$DOCKERFS_DIR
271271
tar xfO $PKG $INSTALLER_PAYLOAD | unzip -op - "$FILESYSTEM_DOCKERFS" | tar xz $TAR_EXTRA_OPTION -f - -C $root_mnt/$image_dir/$DOCKERFS_DIR
272-
fi
272+
fi
273273

274274
create_bootloader_conf
275275

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8
1+
10

platform/pensando/dsc-drivers/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Source: ionic
22
Section: main
33
Priority: extra
4-
Maintainer: Guohan Lu <gulv@microsoft.com>
4+
Maintainer: Shantanu Shrivastava <shanshri@amd.com>
55
Build-Depends: debhelper (>= 8.0.0), bzip2
66
Standards-Version: 3.9.3
77
#Vcs-Git: git://git.debian.org/collab-maint/bcmsdk.git

0 commit comments

Comments
 (0)