From c1074900f65d82578d2db5198fac06891534d799 Mon Sep 17 00:00:00 2001
From: James Thomas <james@seriousinternetbusiness.com>
Date: Sun, 26 Oct 2014 10:07:38 +0000
Subject: Use the same kernel and u-boot for all jetson systems

---
 clusters/jetson-upgrade.morph                  | 2 +-
 strata/bsp-jetson-devel.morph                  | 8 ++++----
 strata/bsp-jetson-devel/linux-jetson-tk1.morph | 4 ++--
 strata/bsp-jetson-genivi.morph                 | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/clusters/jetson-upgrade.morph b/clusters/jetson-upgrade.morph
index f44e597a..6f4f631e 100644
--- a/clusters/jetson-upgrade.morph
+++ b/clusters/jetson-upgrade.morph
@@ -6,7 +6,7 @@ systems:
     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
diff --git a/strata/bsp-jetson-devel.morph b/strata/bsp-jetson-devel.morph
index e5f52a9c..9148160d 100644
--- a/strata/bsp-jetson-devel.morph
+++ b/strata/bsp-jetson-devel.morph
@@ -20,15 +20,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: c77921345b943cdf5f2f28bbe88c6d8970620d2e
+  unpetrify-ref: baserock/jetson/u-boot-tegra-next
   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: 1e25ebbdc76152c56b2367e6db2218bc80d1c99a
+  unpetrify-ref: baserock/james/jetson-3.17-rc5-cpufreq
   build-depends:
   - u-boot
 - name: bsp-support
diff --git a/strata/bsp-jetson-devel/linux-jetson-tk1.morph b/strata/bsp-jetson-devel/linux-jetson-tk1.morph
index 3494f62b..f1cc227f 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,4 @@ 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/.
diff --git a/strata/bsp-jetson-genivi.morph b/strata/bsp-jetson-genivi.morph
index 62835b74..bc2ff280 100644
--- a/strata/bsp-jetson-genivi.morph
+++ b/strata/bsp-jetson-genivi.morph
@@ -28,8 +28,8 @@ chunks:
 - name: linux-jetson-tk1-genivi
   morph: strata/bsp-jetson-genivi/linux-jetson-tk1-genivi.morph
   repo: upstream:linux
-  ref: 8da6ad2e1c6366ebb2d9a72aeaf4a42dc32c8623
-  unpetrify-ref: baserock/jetson/3.17.0-rc5
+  ref: 1e25ebbdc76152c56b2367e6db2218bc80d1c99a
+  unpetrify-ref: baserock/james/jetson-3.17-rc5-cpufreq
   build-depends:
   - u-boot
 - name: bsp-support
-- 
cgit v1.2.1