Add support for Odroid M1S

andrewraj · January 26, 2024, 2:54pm

Thank you @darkxst for making this happen. I have not tested it yet as I was considering this board only if it was officially supported. I just purchased the last stock of 4GB with UK plugs and will test it right after it arrives.

CopyCat73 · January 27, 2024, 12:37pm

Can you explain why we would need to install the official release when this build is integrated? I noticed there are upgrades offered already in this build, can we also just upgrade to a final release? Not sure if I need to wait or if I can already migrate to my m1s

darkxst · January 28, 2024, 12:00am

HA Core and Supervisor updates will continue just fine with these test builds, but you will not receive any HAOS updates. Updates can be done via USB though, and maybe I could use one of those to transition back to official builds. But if not you will need take a backup, reinstall then restore backup from on-boarding page,

darkxst · January 28, 2024, 11:33pm

I have rebased Odroid M1s on HAOS 11.5rc2. This build should receive OTA updates once official build is released.

You can upgrade using the rauc image copied to a USB drive labeled “CONFIG”, make sure the file is owned by root if using EXT4.

Then just run
ha os import

bertreb · January 29, 2024, 11:22am

Thanks, I successfully updated via the rauc/usb method.

bgcngm · January 29, 2024, 9:40pm

@darkxst is NVMe also supported? Just asking because I saw your order boot patch and I am wondering if only internal eMMC and SD slot is supported.

BradAU · January 29, 2024, 10:00pm

Thanks for your continued work on this @darkxst, updated successfully.

darkxst · January 30, 2024, 12:51am

NVMe seems to have broken with this update (even kernel support), will fix this in next update. Regardless of that however NVMe boot is currently not possible since the u-boot.scr is hard coded to search only MMC devices.

github.com

darkxst/ha-operating-system/blob/3249363b5b48a93055a1291961d24c3d217b18fb/buildroot-external/board/hardkernel/odroid-m1s/uboot-boot.ush

part start mmc ${devnum} hassos-bootstate mmc_env
mmc dev ${devnum}

setenv loadbootstate " \
    echo 'loading env...'; \
    mmc read ${ramdisk_addr_r} ${mmc_env} 0x40; \
    env import -c ${ramdisk_addr_r} 0x8000;"

setenv storebootstate " \
    echo 'storing env...'; \
    env export -c -s 0x8000 ${ramdisk_addr_r} BOOT_ORDER BOOT_A_LEFT BOOT_B_LEFT MACHINE_ID; \
    mmc write ${ramdisk_addr_r} ${mmc_env} 0x40;"

run loadbootstate
test -n "${BOOT_ORDER}" || setenv BOOT_ORDER "A B"
test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3

# Allows ConditionFirstBoot=
test -n "${MACHINE_ID}" || setenv BOOT_CONDITION "systemd.condition-first-boot=true"

This file has been truncated. show original

In theory though, if that was fixed, u-boot installed on eMMC should be able to boot into the NVMe. The Rockchip BootROM can’t boot directly to NVMe or USB.

wd40 · February 1, 2024, 7:55pm

HAOS 11.5rc2. is running for 2 days straight without any issues, thanks!

Would this apply for other flavors of Odroid? For example the M1?

I would sleep much more calmly having only some boot code on the emmc (which i assume is written only once?), opposed to having the whole system on the emmc with only /data the nvme (which is the best we can do for now if i understand correctly)

darkxst · February 1, 2024, 10:52pm

Yes, it should probably work on M1 also, however it could be installed on SPI flash replacing petitboot there.

HAOS itself is largely readonly, once you move the datadisk, writes on the eMMC should be very infrequent. So you probably dont need to worry much about wear in this case.

darkxst · February 12, 2024, 3:23am

Here is a new build, synced up with my open PR [1] on the official HAOS repo.

This changes partition layout slightly (which USB updates wont fixup), so a full re-install is recommended either now, or when moving to an official release.

[1]

github.com/home-assistant/operating-system

Add support for Odroid M1S Board

home-assistant:dev ← darkxst:odroid-m1s-merge

opened 01:05PM - 28 Jan 24 UTC

darkxst

+2841 -2

Hardkernel have recently released the Odroid M1S which is a slimmed down version… of the original Odroid M1. Features: - Rockchip RK3566 - 4 or 8GB LPDDR4 RAM - 64GB eMMC (soldered) - Pcie 2.1 NVMe M2 slot - new 14pin GPIO header that supports a variety of addon boards (most require DT overlays though) This needs to be added as a new board since it uses a different TPL blob for DDR initialiasation. There is no upstream support for this board just yet, however that is in progress. For now I am using the following: Uboot using generic-rk3568 target Linux device tree synced from the unofficial hardkernel 6.1 linux https://github.com/tobetter/linux/tree/odroid-6.1.y Installation to eMMC can be done directly with Hardkernel's USB UMS tool https://wiki.odroid.com/odroid-m1s/getting_started/os_installation_guide?redirect=1#install_over_usb_from_pc

darkxst · February 14, 2024, 10:44pm

My work on adding Odroid M1S support has now been merged into the official HAOS repo. Thanks to everyone who helped with testing!

The first dev builds are available here:

This changes partition layout slightly (which USB updates wont fix up), so a full re-install is recommended (unless you already did that with my previous update from a few days ago).

The new official build will receive OTA OS updates starting soon.

There is no documentation as yet, perhaps one of you early testers might like to help with updates on that for Home Assistant site?

Jojo-A · February 15, 2024, 10:53am

@darkxst Thank you really much for your effort! This is highly appreciated! I have a M1S here and will install the image this week.
What help is needed regarding the documentation? I would like to support!

Cheers

darkxst · February 15, 2024, 11:43am

@Jojo-A Mainly just the installation process.

Does this work on Odroid M1S? I’ve long wiped the builtin petitboot

Otherwise document the USB sd image
https://wiki.odroid.com/odroid-m1s/getting_started/os_installation_guide?redirect=1#install_over_usb_from_pc

Jojo-A · February 15, 2024, 2:20pm

Currently I would think that my eMMC petitboot is not wiped, yet! For first tests I just installed the original Hardkernel Ubuntu via the USB install method. I would now go for the same approach with the HAOS image:

prepare SD card to let the M1S be recognized as mass storage
“boot” up the M1S to be detected as mass storage by my host system
dd the HAOS image to the mass storage device (which is the eMMC on the M1S)

So quite straight forward, I think. Booting HAOS from SD card directly should work in any case as SD card has higher boot priority than eMMC.

darkxst · February 15, 2024, 11:53pm

Before you wipe it can you test the Odroid-N2 instructions for enabling USB mode?

Sd card with USB image works well for initial install, however if a user tries to use it adter HAOS is installed, it wont boot without unless you short maskROM pad

I’d probably recommend Balena Etcher or Rufus(win only) on any online guide!

The SD Card has higher priority but the different u-boot versions cause grief. Hardkernel use Rockchip u-boot and HAOS uses mainline u-boot. These can’t boot each other, so an SD card with HAOS will fail to boot when using petitboot. Same applies in reverse a Hardkernel SD image wont boot when running HAOS.

I think a USB recovery mode will get added to HAOS later though.

BradAU · February 16, 2024, 12:51am

Thanks again for all your work on this @darkxst it’s great to see it now included in official builds. I’m currently running 11.6.dev1706439573 on my system and looking above seems a full re-install is needed.
Is this as simple as putting the 12.0.rc1 image onto a USB and booting as the petitboot was already changed?

darkxst · February 16, 2024, 4:42am

Hi Brad,
Good question, you can’t boot off a USB however. Also the Hardkernel USB SD image wont boot from HAOS u-boot. I guess there are few options here:

Boot the Hardkernel SD image for USB by shorting the 2 maskROM pads near the 40 pin connector.
Nuke uboot on eMMC from the running system, after this you can boot the Hardkernel SD image for Etcher install over USB.
dd if=/dev/zero of=/dev/mmcblk0 bs=512 seek=64 count=6080
My very final unofficial build has UMS enabled on the OTG port, so in theory you can try flash directly over the existing OS with Balena etcher (I would recommend you unmount the data partition first though)

This last feature was removed from the initial official release due to concerns around concurrent disk access, but it will be coming back in future release in a slightly safer version.

BradAU · February 16, 2024, 6:16am

Thanks Tim, booting the HardKernel SD while shorting the 2 maskROM pads worked perfectly for me.

Jojo-A · February 16, 2024, 12:16pm

Oh, it feels like being put back to school so badly . I have to confess that I seem to have a significant lack of knowledge regarding all this bootloader stuff!

Even if I would really like to contribute to the installation docs I think I should first try to get familiar with the technical background. Otherwise any contribution would be too unreliable, I think…

So if I understood it correctly: as long as I stay in the Hardkernel world on both SD card and eMMC, everything is fine. And as soon as I mix up HK stuff and other stuff, it will become tricky…

So what can I do in the current state? My M1S has the HK Ubuntu installed on eMMC through the USB mass storage method described by HK. There is no SPI flash to switch to USB-OTG mode. So for what I understand is that the only way to get the eMMC appear as a mass storage device is to use the specific SD card image by HK - or am I wrong here?