My definitions for building u-boot and the kernel for the Jetson with drm as an out of tree module

4 files changed, 41 insertions, 10 deletions

diff --git a/clusters/jetson-upgrade.morph b/clusters/jetson-upgrade.morph
index e378cca5..2817e01f 100644
--- a/clusters/jetson-upgrade.morph
+++ b/clusters/jetson-upgrade.morph
@@ -1,18 +1,17 @@
 name: jetson-upgrade
 kind: cluster
 systems:
-- morph: devel-system-armv7lhf-jetson
+- morph: systems/devel-system-armv7lhf-jetson.morph
   deploy-defaults:
     TROVE_HOST: TROVE_HOST
     TROVE_ID: TROVE_ID
     ROOT_DEVICE: "/dev/mmcblk0p1"
-    DTB_PATH: "boot/tegra124-pm375.dtb"
+    DTB_PATH: "boot/tegra124-jetson-tk1.dtb"
     BOOTLOADER_CONFIG_FORMAT: "extlinux"
     BOOTLOADER_INSTALL: "none"
-    KERNEL_ARGS: console=ttyS0,115200n8 no_console_suspend=1 lp0_vec=2064@0xf46ff000 video=tegrafb mem=1862M@2048M memtype=255 ddr_die=2048M@2048M section=256M pmuboard=0x0177:0x0000:0x02:0x43:0x00 vpr=151M@3945M tsec=32M@3913M otf_key=c75e5bb91eb3bd94560357b64422f85 usbcore.old_scheme_first=1 core_edp_mv=1150 core_edp_ma=4000 tegraid=40.1.1.0.0 debug_uartport=lsport,3 power_supply=Adapter audio_codec=rt5640 modem_id=0 android.kerneltype=normal usb_port_owner_info=0 fbcon=map:1 commchip_id=0 usb_port_owner_info=0 lane_owner_info=6 emc_max_dvfs=0 touch_id=0@0 tegra_fbmem=32899072@0xad012000 board_info=0x0177:0x0000:0x02:0x43:0x00 tegraboot=sdmmc gpt
+    KERNEL_ARGS: console=ttyS0,115200n8 no_console_suspend=1 lp0_vec=2064@0xf46ff000 video=tegrafb mem=1862M@2048M memtype=255 ddr_die=2048M@2048M section=256M pmuboard=0x0177:0x0000:0x02:0x43:0x00 vpr=151M@3945M tsec=32M@3913M otf_key=c75e5bb91eb3bd94560357b64422f85 usbcore.old_scheme_first=1 core_edp_mv=1150 core_edp_ma=4000 cma=256M tegraid=40.1.1.0.0 debug_uartport=lsport,3 power_supply=Adapter audio_codec=rt5640 modem_id=0 android.kerneltype=normal usb_port_owner_info=0 fbcon=map:1 commchip_id=0 usb_port_owner_info=0 lane_owner_info=6 emc_max_dvfs=0 touch_id=0@0 tegra_fbmem=32899072@0xad012000 board_info=0x0177:0x0000:0x02:0x43:0x00 tegraboot=sdmmc gpt
     FSTAB_SRC: LABEL=src /src auto defaults,rw,noatime 0 2
   deploy:
     jetson:
         type: ssh-rsync
         location: root@localhost
-        HOSTNAME: baserock-jetson
diff --git a/strata/bsp-jetson-devel.morph b/strata/bsp-jetson-devel.morph
index bf110d1f..fdc5e4d5 100644
--- a/strata/bsp-jetson-devel.morph
+++ b/strata/bsp-jetson-devel.morph
@@ -14,15 +14,15 @@ chunks:
 - name: u-boot
   morph: strata/bsp-jetson-devel/u-boot.morph
   repo: upstream:u-boot
-  ref: b15ae44ab9f085140039b09a00232d5aed6596a9
-  unpetrify-ref: baserock/arm/tegra-uboot-btrfs
+  ref: violeta-jetson
+  unpetrify-ref: b15ae44ab9f085140039b09a00232d5aed6596a9
   build-depends:
   - device-tree-compiler
 - name: linux-jetson-tk1
   morph: strata/bsp-jetson-devel/linux-jetson-tk1.morph
   repo: upstream:linux
-  ref: de3664efca390a8d2fe525a583d17772deee8500
-  unpetrify-ref: baserock/arm/tegra-3.10
+  ref: violeta-jetson
+  unpetrify-ref: de3664efca390a8d2fe525a583d17772deee8500
   build-depends:
   - u-boot
 - name: bsp-support
@@ -31,3 +31,9 @@ chunks:
   ref: 19bc31ce3198a3c19cdd96d392bde34cb34ed525
   unpetrify-ref: baserock/arm/tegra-3.10
   build-depends: []
+- name: drm-module
+  morph: strata/bsp-jetson-devel/drm-module.morph
+  repo: github:Gnurou/nouveau
+  ref: gk20a
+  build-depends:
+  - linux-jetson-tk1
diff --git a/strata/bsp-jetson-devel/drm-module.morph b/strata/bsp-jetson-devel/drm-module.morph
new file mode 100644
index 00000000..fffc6d31
--- /dev/null
+++ b/strata/bsp-jetson-devel/drm-module.morph
@@ -0,0 +1,10 @@
+name: drm-module
+kind: chunk
+build-commands:
+ - cd drm && make M=$(pwd) -C /usr/src/linux/ modules
+install-commands:
+ - cd drm && make M="$(pwd)" -C /usr/src/linux/ INSTALL_MOD_PATH="$DESTDIR" modules_install
+system-integration:
+   drm-module-misc:
+       00-earlyconf:
+          - depmod -a
diff --git a/strata/bsp-jetson-devel/linux-jetson-tk1.morph b/strata/bsp-jetson-devel/linux-jetson-tk1.morph
index 3494f62b..3174c69b 100644
--- a/strata/bsp-jetson-devel/linux-jetson-tk1.morph
+++ b/strata/bsp-jetson-devel/linux-jetson-tk1.morph
@@ -1,7 +1,7 @@
 name: linux-jetson-tk1
 kind: chunk
 configure-commands:
-- make ARCH=arm tegra12_defconfig
+- make ARCH=arm tegra_defconfig
 - scripts/config -d KERNEL_LZO
 - scripts/config -e KERNEL_GZIP
 - scripts/config -e NAMESPACES
@@ -50,4 +50,20 @@ build-commands:
 install-commands:
 - mkdir -p "$DESTDIR"/boot
 - cp arch/arm/boot/zImage "$DESTDIR"/boot/zImage
-- cp arch/arm/boot/dts/tegra124-pm375.dtb "$DESTDIR"/boot/.
+- cp arch/arm/boot/dts/tegra124-jetson-tk1.dtb "$DESTDIR"/boot/.
+- make modules
+- make INSTALL_MOD_PATH="$DESTDIR" modules_install
+- install -d "$DESTDIR$PREFIX/src/linux"
+- |
+  (
+      printf 'Makefile\0'
+      printf 'Module.symvers\0'
+      find arch/arm -maxdepth 1 -name 'Makefile*' -print0
+      find arch/arm \( -name 'module.lds' -o -name 'Kbuild.platforms' -o -name 'Platform' \) -print0
+      find arch/arm \( -type d -a \( -name include -o -name scripts \) \) -o \
+                               \! -type d -a \( -path '*include/*' -o -path '*scripts/*' \) -print0
+      find include -name 'asm*' -prune -o -print0
+      find include/asm-generic -print0
+      find include/uapi -print0
+      find scripts -print0
+  ) | cpio -0pumd "$DESTDIR$PREFIX/src/linux"