configuration.nix

@@ -50,7 +50,6 @@
     ffmpeg
     (v4l_utils.override { withGUI = false; })
     usbutils
-    gcc gnumake cmake
   ];
 
   ###

kernel/Pine64-PineCube-support.patch

@@ -43,41 +43,17 @@ diff --git a/arch/arm/boot/dts/sun8i-v3s.dtsi b/arch/arm/boot/dts/sun8i-v3s.dtsi
 index e5312869c0d2..b4069df84d10 100644
 --- a/arch/arm/boot/dts/sun8i-v3s.dtsi
 +++ b/arch/arm/boot/dts/sun8i-v3s.dtsi
-@@ -138,6 +138,39 @@ mixer0_out_tcon0: endpoint {
+@@ -138,6 +138,15 @@ mixer0_out_tcon0: endpoint {
  			};
  		};
  
-+syscon: system-control@1c00000 {
-+			compatible = "allwinner,sun8i-h3-system-control","syscon";
++		syscon: system-control@1c00000 {
++			compatible = "allwinner,sun8i-v3s-system-control",
++				     "allwinner,sun8i-h3-system-control";
 +			reg = <0x01c00000 0x1000>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			ranges;
-+
-+			sram_c: sram@1d00000 {
-+				compatible = "mmio-sram";
-+				reg = <0x01d00000 0x80000>;
-+				#address-cells = <1>;
-+				#size-cells = <1>;
-+				ranges = <0 0x01d00000 0x80000>;
-+
-+				ve_sram: sram-section@0 {
-+					compatible = "allwinner,sun8i-h3-sram-c1",
-+					 "allwinner,sun4i-a10-sram-c1";
-+					reg = <0x000000 0x80000>;
-+				};
-+			};
-+		};
-+ve: video-engine@01c0e000 {
-+			compatible = "allwinner,sunxi-cedar-ve";
-+			reg = < 0x1c0e000 0x1000 0x1c00000 0x10 0x1c20000 0x800 >;
-+			memory-region = < 0x84 >;
-+			syscon = < 0x15 >;
-+			clocks = < 0x03 0x29 0x03 0x6c 0x03 0x61 >;
-+			clock-names = "ahb\0mod\0ram";
-+			resets = < 0x03 0x1a >;
-+			status = "okay";
-+			interrupts = < 0x00 0x3a 0x04 >;
 +		};
 +
  		tcon0: lcd-controller@1c0c000 {

kernel/sunxi-cedar.nix

@@ -11,20 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "s/Cxr1GlmvORBvoJvU0LCpezacuQv5qT/9GyJYcAtq4=";
   };
 
-  preConfigure = ''
-    # forgive my laziness... add an install target to Makefile
-    echo "install:" >> Makefile
-    echo "	$MAKE -C $KERNEL_SOURCE M=$PWD install" >> Makefile
-  '';
-
-  # For "Makefile"
   makeFlags = [
-    "ARCH=arm"
-    "KERNEL_SOURCE=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-    "CROSS_COMPILE=armv7l-unknown-linux-gnueabihf-"
-    "INSTALL_MOD_PATH=$(out)"
-  ];
+    # For Makefile.linux
+    #"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+    #"INSTALL_MOD_PATH=$(out)"
+    #"KERNELRELEASE=${kernel.modDirVersion}"
 
+    # For Makefile
+    "KERNEL_SOURCE=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+  ];
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
   hardeningDisable = [ "pic" ];