summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-10-24 09:14:52 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-10-24 09:14:52 +0100
commit826f0cff22511204a1fde979e954469852227646 (patch)
treebba4a7f556d9545ecd131263573796f4b1d522f5
parent86e2c4aecdbae8a5ecdad8c463870042e5564505 (diff)
parent8703885bbcf91f4371b923f907246e0775902562 (diff)
downloaddefinitions-826f0cff22511204a1fde979e954469852227646.tar.gz
Merge remote-tracking branch 'origin/baserock/pedroalvarez/release-14.40-fixes'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk> Reviewed-By: Richard Maw <richard.maw@codethink.co.uk> Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk>
-rw-r--r--clusters/release.morph7
-rw-r--r--strata/bsp-jetson-devel.morph4
2 files changed, 7 insertions, 4 deletions
diff --git a/clusters/release.morph b/clusters/release.morph
index 5beee3e2..73ccfbc9 100644
--- a/clusters/release.morph
+++ b/clusters/release.morph
@@ -31,12 +31,15 @@ systems:
DISK_SIZE: 4G
- morph: systems/devel-system-armv7lhf-jetson.morph
deploy:
- release:
+ devel-system-armv7lhf-jetson:
type: rawdisk
location: devel-system-armv7lhf-jetson.img
DISK_SIZE: 4G
ROOT_DEVICE: "/dev/mmcblk0p1"
- KERNEL_ARGS: cma=256M 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
+ DTB_PATH: "boot/tegra124-pm375.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
- morph: systems/genivi-baseline-system-x86_64-generic.morph
deploy:
genivi-baseline-system-x86_64-generic:
diff --git a/strata/bsp-jetson-devel.morph b/strata/bsp-jetson-devel.morph
index a8fc696a..e5f52a9c 100644
--- a/strata/bsp-jetson-devel.morph
+++ b/strata/bsp-jetson-devel.morph
@@ -20,8 +20,8 @@ chunks:
- name: u-boot
morph: strata/bsp-jetson-devel/u-boot.morph
repo: upstream:u-boot
- ref: c77921345b943cdf5f2f28bbe88c6d8970620d2e
- unpetrify-ref: baserock/jetson/u-boot-tegra-next
+ ref: b15ae44ab9f085140039b09a00232d5aed6596a9
+ unpetrify-ref: baserock/arm/tegra-uboot-btrfs
build-depends:
- device-tree-compiler
- name: linux-jetson-tk1