eeva/wip-pinebook-pro
1
0
Fork 0
mirror of https://github.com/samueldr/wip-pinebook-pro.git synced 2024-11-05 18:49:41 +01:00
Code Issues Releases Wiki Activity

overlay: uBootPinebookPro* -> ubootPinebookPro*

Browse source 
This better reflects Nixpkgs
This commit is contained in:
Samuel Dionne-Riel 2020-07-14 19:30:27 -04:00
parent 497b7f7641
commit 4a46accd02
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -69,7 +69,7 @@ while most other packages can be fetched from the cache.
Assuming `/dev/mmcblk0` is an SD card. Assuming `/dev/mmcblk0` is an SD card.
``` ```
$ nix-build -A pkgs.uBootPinebookPro $ nix-build -A pkgs.ubootPinebookPro
$ lsblk /dev/mmcblk0 && sudo dd if=result/idbloader.img of=/dev/mmcblk0 bs=512 seek=64 oflag=direct,sync && sudo dd if=result/u-boot.itb of=/dev/mmcblk0 bs=512 seek=16384 oflag=direct,sync $ lsblk /dev/mmcblk0 && sudo dd if=result/idbloader.img of=/dev/mmcblk0 bs=512 seek=64 oflag=direct,sync && sudo dd if=result/u-boot.itb of=/dev/mmcblk0 bs=512 seek=16384 oflag=direct,sync
``` ```
@ -87,13 +87,13 @@ a situation where you can debug and fix the system if this happens. With this
said, it should be safe enough. said, it should be safe enough.
``` ```
$ nix-build -A pkgs.uBootPinebookPro $ nix-build -A pkgs.ubootPinebookPro
$ lsblk /dev/disk/by-path/platform-fe330000.sdhci && sudo dd if=result/idbloader.img of=/dev/disk/by-path/platform-fe330000.sdhci bs=512 seek=64 oflag=direct,sync && sudo dd if=result/u-boot.itb of=/dev/disk/by-path/platform-fe330000.sdhci bs=512 seek=16384 oflag=direct,sync $ lsblk /dev/disk/by-path/platform-fe330000.sdhci && sudo dd if=result/idbloader.img of=/dev/disk/by-path/platform-fe330000.sdhci bs=512 seek=64 oflag=direct,sync && sudo dd if=result/u-boot.itb of=/dev/disk/by-path/platform-fe330000.sdhci bs=512 seek=16384 oflag=direct,sync
``` ```
### Alternative boot order ### Alternative boot order
If you rather USB and SD card is tried before the eMMC, `pkgs.uBootPinebookProExternalFirst` If you rather USB and SD card is tried before the eMMC, `pkgs.ubootPinebookProExternalFirst`
can be installed, which has an alternative patch set added on top that will can be installed, which has an alternative patch set added on top that will
change the boot order. change the boot order.

11
overlay.nix
View file

@ -2,12 +2,13 @@ final: super:
let let
inherit (final) callPackage kernelPatches linuxPackagesFor; inherit (final) callPackage kernelPatches linuxPackagesFor;
renamed = old: new: builtins.trace "The ${old} attribute name is deprecated. Prefer using ${new}." final.${new};
in in
{ {
# Alternative BSP u-boot, with nvme support if desired # Alternative BSP u-boot, with nvme support if desired
# * https://gitlab.manjaro.org/manjaro-arm/packages/core/uboot-pinebookpro # * https://gitlab.manjaro.org/manjaro-arm/packages/core/uboot-pinebookpro
uBootPinebookPro = callPackage ./u-boot {}; ubootPinebookPro = callPackage ./u-boot {};
uBootPinebookProExternalFirst = callPackage ./u-boot { ubootPinebookProExternalFirst = callPackage ./u-boot {
externalFirst = true; externalFirst = true;
}; };
@ -23,4 +24,10 @@ in
pinebookpro-firmware = callPackage ./firmware {}; pinebookpro-firmware = callPackage ./firmware {};
pinebookpro-keyboard-updater = callPackage ./keyboard-updater {}; pinebookpro-keyboard-updater = callPackage ./keyboard-updater {};
# Aliases
# Renamed to better follow the Nixpkgs naming scheme.
uBootPinebookPro = renamed "uBootPinebookPro" "ubootPinebookPro";
uBootPinebookProExternalFirst = renamed "uBootPinebookProExternalFirst" "ubootPinebookProExternalFirst";
} }