NVME

nongnu/packages/bootloaders.scm

@@ -39,18 +39,25 @@
 
 (define %u-boot-quartz64-nvme-configs
 '("CONFIG_CMD_NVME=y"
+  "CONFIG_CMD_PCI=y"
   "CONFIG_NVME=y"
+  "CONFIG_NVME_PCI=y"
   "CONFIG_PCI=y"
   "CONFIG_PCI_PNP=y"
-  "CONFIG_PCIE_ROCKCHIP=y"
+  "CONFIG_LOG_MAX_LEVEL=7"
+  "CONFIG_LOG=y"
+  "CONFIG_LOG_CONSOLE=y"
+;  "CONFIG_PCI_ENHANCED_ALLOCATION=y"
+  "CONFIG_PCIE_DW_COMMON=y"
+  "CONFIG_PCIE_DW_ROCKCHIP=y"
   "CONFIG_PHY=y"
-  "CONFIG_PHY_ROCKCHIP_PCIE=y"))
+  "CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y"))
 
 (define-public u-boot-pinephone-pro-rk3399
   (make-u-boot-package "pinephone-pro-rk3399" "aarch64-linux-gnu"))
 
 (define (u-boot-rk3566 board configs)
-  (let ((commit "ca383958b387a768c1a64f8a952eeb5e534d0766")
+  (let ((commit "58040d305147b8608f5766a49d63e863ba163937")
         (revision "1")
         (base (make-u-boot-package board "aarch64-linux-gnu"
 #:configs configs)))
@@ -64,15 +71,20 @@
 				;; OpenSSL patch
                       (url "https://gitlab.com/phodina/u-boot-quartz64")
                       (commit commit)))
-				(patches
+    (patches
   (search-patches "u-boot-allow-disabling-openssl.patch"))
                 (sha256
                  (base32
-                  "0nq83nflmsimbxq6i91dcv5gbx1j4xz2y6dfmyaw8r1yiz4266s8"))))
+                  "0w2yzvfvvydv26dm043jw24r7qkzc3j8jhcrc487pdm79icgfib8"))))
       (arguments
 	   (substitute-keyword-arguments (package-arguments base)
        ((#:phases phases)
 	   #~(modify-phases #$phases
+;	                      (add-after 'configure 'fix-config
+;						    (lambda* _
+;							 (substitute* ".config"
+;							  (("CONFIG_ARM=y")
+;							  "CONFIG_ARM=y\nCONFIG_LOG_MAX_LEVEL=7\nCONFIG_LOG=y\nCONFIG_LOG_CONSOLE=y"))))
                           (add-after 'unpack 'download-rockchip-firmware
                             (lambda* _
                               (let* ((ram-init-dl #$(origin