From d07a487b3240fe0e5bcd13652e7c0415137b9aa9 Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Sun, 5 Oct 2014 15:25:06 +0100 Subject: Downgrade uboot in devel bsp This partially reverts ced256bda95f184361815a6444d752ee10d86d02 --- strata/bsp-jetson-devel.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- cgit v1.2.1 From dd403e19c70462e48ada203fceb09705c4254e02 Mon Sep 17 00:00:00 2001 From: James Thomas Date: Sun, 5 Oct 2014 11:22:42 +0100 Subject: Add DTB_PATH and BOOTLOADER config items to jetson release --- clusters/release.morph | 3 +++ 1 file changed, 3 insertions(+) diff --git a/clusters/release.morph b/clusters/release.morph index 5beee3e2..277f2aba 100644 --- a/clusters/release.morph +++ b/clusters/release.morph @@ -36,6 +36,9 @@ systems: location: devel-system-armv7lhf-jetson.img DISK_SIZE: 4G ROOT_DEVICE: "/dev/mmcblk0p1" + DTB_PATH: "boot/tegra124-pm375.dtb" + BOOTLOADER_CONFIG_FORMAT: "extlinux" + BOOTLOADER_INSTALL: "none" 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 - morph: systems/genivi-baseline-system-x86_64-generic.morph deploy: -- cgit v1.2.1 From 06995d6a80be6c2f76d42c7903cab075d95decf0 Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Sun, 5 Oct 2014 14:28:13 +0000 Subject: Amend system deploy key --- clusters/release.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clusters/release.morph b/clusters/release.morph index 277f2aba..0e4a844f 100644 --- a/clusters/release.morph +++ b/clusters/release.morph @@ -31,7 +31,7 @@ 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 -- cgit v1.2.1 From 8703885bbcf91f4371b923f907246e0775902562 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Wed, 8 Oct 2014 17:05:05 +0100 Subject: Fix KERNEL_ARGS in the jetson devel system --- clusters/release.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clusters/release.morph b/clusters/release.morph index 0e4a844f..73ccfbc9 100644 --- a/clusters/release.morph +++ b/clusters/release.morph @@ -39,7 +39,7 @@ systems: DTB_PATH: "boot/tegra124-pm375.dtb" BOOTLOADER_CONFIG_FORMAT: "extlinux" BOOTLOADER_INSTALL: "none" - 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 + 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: -- cgit v1.2.1