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.

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

Fix emmc values for veyron-mickey in install scripts #260

Merged
merged 1 commit into from
Dec 16, 2020

Conversation

gregordinary
Copy link
Contributor

@gregordinary gregordinary commented Dec 13, 2020

@rk-zero noted the value for the emmc on veyron-mickey was mmcblk1, unlike other veyron devices (so far) which is mmcblk2. This pull request changes the emmc value for veyron-mickey in InstallPrawnOS.sh and InstallPackages.sh to reflect mmcblk1.

Also double checked the output of fdisk -l on the cs10 and c100, which both still have ChromeOS on the emmc and confirmed the mmcblk1 vs mmcblk2 values, respectively.

Veyron-Mickey / CS10:

Disk /dev/mmcblk1: 14.68 GiB, 15758000128 bytes, 30777344 sectors
Units: sectors of 1 * 512 = 512 bytes
Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disklabel type: gpt
Disk identifier: 2F8EA92F-45EF-C145-AE47-9B02F64B7DA2

Device            Start      End  Sectors  Size Type
/dev/mmcblk1p1  8671232 30744575 22073344 10.5G Microsoft basic data
/dev/mmcblk1p2    20480    53247    32768   16M ChromeOS kernel
/dev/mmcblk1p3  4476928  8671231  4194304    2G ChromeOS root fs
/dev/mmcblk1p4    53248    86015    32768   16M ChromeOS kernel
/dev/mmcblk1p5   282624  4476927  4194304    2G ChromeOS root fs
/dev/mmcblk1p6    16448    16448        1  512B ChromeOS kernel
/dev/mmcblk1p7    16449    16449        1  512B ChromeOS root fs
/dev/mmcblk1p8    86016   118783    32768   16M Microsoft basic data
/dev/mmcblk1p9    16450    16450        1  512B ChromeOS reserved
/dev/mmcblk1p10   16451    16451        1  512B ChromeOS reserved
/dev/mmcblk1p11      64    16447    16384    8M unknown
/dev/mmcblk1p12  249856   282623    32768   16M EFI System

Partition table entries are not in disk order.

Veyron-Minnie / C100:

Disk /dev/mmcblk2: 14.68 GiB, 15758000128 bytes, 30777344 sectors
Units: sectors of 1 * 512 = 512 bytes
Sector size (logical/physical): 512 bytes / 512 bytes
I/O size (minimum/optimal): 512 bytes / 512 bytes
Disklabel type: gpt
Disk identifier: 0EB81705-DC06-0248-9D7E-A478985ABC49

Device            Start      End  Sectors  Size Type
/dev/mmcblk2p1  8671232 30744575 22073344 10.5G Microsoft basic data
/dev/mmcblk2p2    20480    53247    32768   16M ChromeOS kernel
/dev/mmcblk2p3  4476928  8671231  4194304    2G ChromeOS root fs
/dev/mmcblk2p4    53248    86015    32768   16M ChromeOS kernel
/dev/mmcblk2p5   282624  4476927  4194304    2G ChromeOS root fs
/dev/mmcblk2p6    16448    16448        1  512B ChromeOS kernel
/dev/mmcblk2p7    16449    16449        1  512B ChromeOS root fs
/dev/mmcblk2p8    86016   118783    32768   16M Microsoft basic data
/dev/mmcblk2p9    16450    16450        1  512B ChromeOS reserved
/dev/mmcblk2p10   16451    16451        1  512B ChromeOS reserved
/dev/mmcblk2p11      64    16447    16384    8M unknown
/dev/mmcblk2p12  249856   282623    32768   16M EFI System

Partition table entries are not in disk order.

@@ -38,7 +38,7 @@ get_emmc_devname() {
case "$device" in
$device_veyron_speedy) local devname=mmcblk2;;
$device_veyron_minnie) local devname=mmcblk2;;
$device_veyron_mickey) local devname=mmcblk2;;
$device_veyron_mickey) local devname=mmcblk1;;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you use spaces instead of tabs for consistency with the rest of the code?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Absolutely. Didn't catch that in the terminal, tab aligned while editing there. Will adjust.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@@ -41,7 +41,7 @@ get_emmc_devname() {
case "$device" in
$device_veyron_speedy) local devname=mmcblk2;;
$device_veyron_minnie) local devname=mmcblk2;;
$device_veyron_mickey) local devname=mmcblk2;;
$device_veyron_mickey) local devname=mmcblk1;;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Thanks for the help!

@SolidHal
Copy link
Owner

this whole mmc vs sd mapping thing is pretty obnoxious. tempted to write some kernel patches to make this consistent. For now this looks great, thanks @gregordinary !

Thanks for the review @austin987

@SolidHal SolidHal merged commit dc834ae into SolidHal:master Dec 16, 2020
@espoelstra
Copy link

I believe the reason the veyron_mickey aka Chromebit CS10 is different is because it does NOT have a microSD slot, only the internal eMMC and a USB2.0 port, so it can never flip-flop the order of the devices depending on what device/kernel it boots from.

@gregordinary
Copy link
Contributor Author

@espoelstra Ccould be why.

Realizing now, it probably follows that the entry for Mickey under get_sd_devname should be removed.

@gregordinary gregordinary deleted the mickey-emmc branch January 13, 2021 05:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants