diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-10-21 00:33:43 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-10-21 00:33:43 +0200 |
commit | 023522d3a1e81fe9bc803183337fdc8c183a88c4 (patch) | |
tree | ec374744812891a627f33fa457b0bcf083e2c142 /gnu/system/install.scm | |
parent | 07abc851ce8a580253061e065b31a4037d2f965d (diff) | |
parent | 7373eb8304e0ebbfabe66deb59e78187013403dd (diff) | |
download | guix-023522d3a1e81fe9bc803183337fdc8c183a88c4.tar guix-023522d3a1e81fe9bc803183337fdc8c183a88c4.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/system/install.scm')
-rw-r--r-- | gnu/system/install.scm | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 912096027f..bdf114c180 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -60,8 +60,11 @@ mx6cuboxi-installation-os nintendo-nes-classic-edition-installation-os novena-installation-os + firefly-rk3399-installation-os pine64-plus-installation-os pinebook-installation-os + rock64-installation-os + rockpro64-installation-os rk3399-puma-installation-os wandboard-installation-os os-with-u-boot)) @@ -558,6 +561,11 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET." "/dev/mmcblk1" ; eMMC storage "ttyS0")) +(define firefly-rk3399-installation-os + (embedded-installation-os u-boot-firefly-rk3399-bootloader + "/dev/mmcblk0" ; SD card/eMMC (SD priority) storage + "ttyS2")) ; UART2 connected on the Pi2 bus + (define mx6cuboxi-installation-os (embedded-installation-os u-boot-mx6cuboxi-bootloader "/dev/mmcblk0" ; SD card storage @@ -583,6 +591,16 @@ The bootloader BOOTLOADER is installed to BOOTLOADER-TARGET." "/dev/mmcblk0" ; SD card storage "ttyS0")) +(define rock64-installation-os + (embedded-installation-os u-boot-rock64-rk3328-bootloader + "/dev/mmcblk0" ; SD card/eMMC (SD priority) storage + "ttyS2")) ; UART2 connected on the Pi2 bus + +(define rockpro64-installation-os + (embedded-installation-os u-boot-rockpro64-rk3399-bootloader + "/dev/mmcblk0" ; SD card/eMMC (SD priority) storage + "ttyS2")) ; UART2 connected on the Pi2 bus + (define rk3399-puma-installation-os (embedded-installation-os u-boot-puma-rk3399-bootloader "/dev/mmcblk0" ; SD card storage |