From bd513d82ecdf0a45c7123a3bac458342b76a12dd Mon Sep 17 00:00:00 2001
From: James Thomas <james.thomas@codethink.co.uk>
Date: Mon, 27 Apr 2015 16:50:19 +0000
Subject: Upgrade jetson to 4.0

Quite a lot of changes here, new firmware, nouveau platform driver
no longer exists as a separate module, and we no longer need the
bsp-support to set the scaling governor, as it's ON_DEMAND by default

Change-Id: I7ab2b969659702929b9df3bcb1ab7dd6d68f73f4
---
 strata/bsp-jetson.morph                       | 17 ++++++-----------
 strata/bsp-jetson/linux-firmware-jetson.morph | 11 ++++++++++-
 strata/bsp-jetson/linux-jetson-tk1.morph      |  5 +++++
 strata/bsp-jetson/nouveau-drm.morph           |  6 +++---
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/strata/bsp-jetson.morph b/strata/bsp-jetson.morph
index 85ab5ecf..80e61871 100644
--- a/strata/bsp-jetson.morph
+++ b/strata/bsp-jetson.morph
@@ -27,22 +27,17 @@ chunks:
 - name: linux-jetson-tk1
   morph: strata/bsp-jetson/linux-jetson-tk1.morph
   repo: upstream:linux
-  ref: 682c943b0159b1a4105f31020605bf8a0f155ffd
-  unpetrify-ref: baserock/v3.18-with-cpufreq
-- name: bsp-support
-  morph: strata/bsp-jetson/bsp-support.morph
-  repo: baserock:baserock/bsp-support
-  ref: 19bc31ce3198a3c19cdd96d392bde34cb34ed525
-  unpetrify-ref: baserock/arm/tegra-3.10
+  ref: a6df05fd37874251833bd6f18404cd2efaa62603
+  unpetrify-ref: baserock/tegra/4.0-with-cpufreq-gpu
 - name: nouveau-drm
   morph: strata/bsp-jetson/nouveau-drm.morph
   repo: upstream:nouveau
-  ref: 4d0929aa231a0c2d2b66fa1f8ea1c8fa4d872501
-  unpetrify-ref: baserock/jetson/gk20a
+  ref: 73de0a7758eb447d6157d2ed79c84d1a4e6ca09b
+  unpetrify-ref: baserock/tegra/4.0
   build-depends:
   - linux-jetson-tk1
 - name: linux-firmware-jetson
   morph: strata/bsp-jetson/linux-firmware-jetson.morph
   repo: upstream:linux-firmware
-  ref: 9322ef5b14c78ec28163baa41bff240a0e098810
-  unpetrify-ref: baserock/jetson
+  ref: ff2afc9d9649cab2a1f79b8d4eeb0cc0100a2f85
+  unpetrify-ref: baserock/tegra/4.0
diff --git a/strata/bsp-jetson/linux-firmware-jetson.morph b/strata/bsp-jetson/linux-firmware-jetson.morph
index c803eab2..e24e7ec7 100644
--- a/strata/bsp-jetson/linux-firmware-jetson.morph
+++ b/strata/bsp-jetson/linux-firmware-jetson.morph
@@ -2,5 +2,14 @@ name: linux-firmware-jetson
 kind: chunk
 install-commands:
 - install -d "$DESTDIR/lib/firmware/nvidia/tegra124"
-- install -m644 nvidia/tegra124/gk20a_ctxsw.bin "$DESTDIR/lib/firmware/nvidia/tegra124"
+- install -d "$DESTDIR/lib/firmware/nouveau"
+- install -m644 nouveau/nvea_fuc409c "$DESTDIR/lib/firmware/nouveau"
+- install -m644 nouveau/nvea_fuc409d "$DESTDIR/lib/firmware/nouveau"
+- install -m644 nouveau/nvea_fuc41ac "$DESTDIR/lib/firmware/nouveau"
+- install -m644 nouveau/nvea_fuc41ad "$DESTDIR/lib/firmware/nouveau"
+- install -m644 nouveau/nvea_bundle "$DESTDIR/lib/firmware/nouveau"
+- install -m644 nouveau/nvea_method "$DESTDIR/lib/firmware/nouveau"
+- install -m644 nouveau/nvea_sw_ctx "$DESTDIR/lib/firmware/nouveau"
+- install -m644 nouveau/nvea_sw_nonctx "$DESTDIR/lib/firmware/nouveau"
 - install -m644 nvidia/tegra124/xusb.bin "$DESTDIR/lib/firmware/nvidia/tegra124"
+- install -m644 LICENCE.nvidia "$DESTDIR/lib/firmware"
diff --git a/strata/bsp-jetson/linux-jetson-tk1.morph b/strata/bsp-jetson/linux-jetson-tk1.morph
index 43972811..073a5a02 100644
--- a/strata/bsp-jetson/linux-jetson-tk1.morph
+++ b/strata/bsp-jetson/linux-jetson-tk1.morph
@@ -217,6 +217,11 @@ configure-commands:
 - scripts/config -e SCSI_ISCSI_ATTRS
 - scripts/config -e ISCSI_TCP
 - scripts/config -e SCSI_LOWLEVEL
+- scripts/config -m DRM_NOUVEAU
+- scripts/config -e NOUVEAU_PLATFORM_DRIVER
+- scripts/config -e DRM_TEGRA_STAGING
+- scripts/config --set-val NOUVEAU_DEBUG 5
+- scripts/config --set-val NOUVEAU_DEBUG_DEFAULT 3
 - yes '' | make ARCH=arm oldconfig
 build-commands:
 - make $MAKEFLAGS ARCH=arm LOADADDR=0x80200000 zImage dtbs
diff --git a/strata/bsp-jetson/nouveau-drm.morph b/strata/bsp-jetson/nouveau-drm.morph
index e297a069..33221a70 100644
--- a/strata/bsp-jetson/nouveau-drm.morph
+++ b/strata/bsp-jetson/nouveau-drm.morph
@@ -1,12 +1,12 @@
 name: nouveau-drm
 kind: chunk
 build-commands:
- - cd drm && make ARCH=arm M=$(pwd) -C /usr/src/linux/ modules
+ - sed -e 's/.*android\/sync.*/#ifdef CONFIG_SYNC\n&\n#endif/' -i drm/nouveau/nouveau_fence.c
+ - cd drm/nouveau && make ARCH=arm M=$(pwd) -C /usr/src/linux/ modules
 install-commands:
- - cd drm && make ARCH=arm M="$(pwd)" -C /usr/src/linux/ INSTALL_MOD_PATH="$DESTDIR" modules_install
+ - cd drm/nouveau && make ARCH=arm M="$(pwd)" -C /usr/src/linux/ INSTALL_MOD_PATH="$DESTDIR" modules_install
 system-integration:
    nouveau-drm-misc:
        00-earlyconf:
           - (cd /lib/modules && for version in *; do rm "$version/kernel/drivers/gpu/drm/nouveau/nouveau.ko"; done)
-          - (cd /lib/modules && for version in *; do rm "$version/kernel/drivers/gpu/drm/nouveau/nouveau_platform.ko"; done)
           - (cd /lib/modules && for version in *; do depmod -a "$version"; done)
-- 
cgit v1.2.1