summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-11-17 10:52:31 (GMT)
committerRichard Maw <richard.maw@codethink.co.uk>2014-11-17 10:52:31 (GMT)
commit522e5ce8f922a688c1fa715d35445aeebf975336 (patch)
tree0c4fc5cd15bce4758b8393e666fbca3137f55f48
parentf7804de43f3a5fd99fc110f120d65555cef41b52 (diff)
parent09c2dc8456b1abc033c79b97646284db113b80ff (diff)
downloaddefinitions-522e5ce8f922a688c1fa715d35445aeebf975336.tar.gz
Merge branch 'baserock/pedroalvarez/unify-jetson-kernel'
This includes the patches from Pedro Alvarez required to make the release. Reviewed-by: Pedro Alvarez Reviewed-by: Sam Thursfield
-rw-r--r--clusters/jetson-upgrade.morph6
-rw-r--r--clusters/release.morph6
-rw-r--r--strata/bsp-jetson-devel.morph39
-rw-r--r--strata/bsp-jetson-devel/bsp-support.morph6
-rw-r--r--strata/bsp-jetson-devel/device-tree-compiler.morph6
-rw-r--r--strata/bsp-jetson-devel/linux-jetson-tk1.morph55
-rw-r--r--strata/bsp-jetson-devel/u-boot.morph16
-rw-r--r--strata/bsp-jetson.morph (renamed from strata/bsp-jetson-genivi.morph)32
-rw-r--r--strata/bsp-jetson/bsp-support.morph (renamed from strata/bsp-jetson-genivi/bsp-support.morph)0
-rw-r--r--strata/bsp-jetson/device-tree-compiler.morph (renamed from strata/bsp-jetson-genivi/device-tree-compiler.morph)0
-rw-r--r--strata/bsp-jetson/linux-firmware-jetson.morph6
-rw-r--r--strata/bsp-jetson/linux-jetson-tk1.morph (renamed from strata/bsp-jetson-genivi/linux-jetson-tk1-genivi.morph)2
-rw-r--r--strata/bsp-jetson/nouveau-drm.morph (renamed from strata/bsp-jetson-genivi/nouveau-drm.morph)0
-rw-r--r--strata/bsp-jetson/u-boot.morph (renamed from strata/bsp-jetson-genivi/u-boot.morph)0
-rw-r--r--systems/build-system-armv7lhf-jetson.morph4
-rw-r--r--systems/devel-system-armv7lhf-jetson.morph4
-rw-r--r--systems/genivi-baseline-system-armv7lhf-jetson.morph4
17 files changed, 38 insertions, 148 deletions
diff --git a/clusters/jetson-upgrade.morph b/clusters/jetson-upgrade.morph
index 4eb6b80..a73507a 100644
--- a/clusters/jetson-upgrade.morph
+++ b/clusters/jetson-upgrade.morph
@@ -6,11 +6,11 @@ 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
- FSTAB_SRC: LABEL=src /src auto defaults,rw,noatime 0 2
+ KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1
+ FSTAB_SRC: LABEL=src /src auto defaults,rw,noatime,nofail 0 2
deploy:
self:
type: ssh-rsync
diff --git a/clusters/release.morph b/clusters/release.morph
index 5466df2..7651d50 100644
--- a/clusters/release.morph
+++ b/clusters/release.morph
@@ -36,10 +36,10 @@ systems:
location: build-system-armv7lhf-jetson.img
DISK_SIZE: 4G
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: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1
- morph: systems/genivi-baseline-system-x86_64-generic.morph
deploy:
genivi-baseline-system-x86_64-generic:
@@ -57,4 +57,4 @@ systems:
DTB_PATH: "boot/tegra124-jetson-tk1.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: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1
diff --git a/strata/bsp-jetson-devel.morph b/strata/bsp-jetson-devel.morph
deleted file mode 100644
index e5f52a9..0000000
--- a/strata/bsp-jetson-devel.morph
+++ /dev/null
@@ -1,39 +0,0 @@
-name: bsp-jetson-devel
-kind: stratum
-description: |
- Platform-specific chunks for NVIDIA Jetson TK1 development system.
-
- Support for the Tegra platform is still being developed. This BSP uses
- a patched version of Linux 3.10 supplied by NVIDIA, which provides
- reliable SATA, USB and networking and runs the CPUs at full speed.
- To make use of the graphics acceleration on the Jetson you will need
- to use a newer kernel.
-build-depends:
-- morph: strata/core.morph
-chunks:
-- name: device-tree-compiler
- morph: strata/bsp-jetson-devel/device-tree-compiler.morph
- repo: upstream:device-tree-compiler
- ref: c92f284c3cf76d471eb27a271de3a51cb45ed058
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: u-boot
- morph: strata/bsp-jetson-devel/u-boot.morph
- repo: upstream:u-boot
- ref: b15ae44ab9f085140039b09a00232d5aed6596a9
- unpetrify-ref: baserock/arm/tegra-uboot-btrfs
- 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
- build-depends:
- - u-boot
-- name: bsp-support
- morph: strata/bsp-jetson-devel/bsp-support.morph
- repo: baserock:baserock/bsp-support
- ref: 19bc31ce3198a3c19cdd96d392bde34cb34ed525
- unpetrify-ref: baserock/arm/tegra-3.10
- build-depends: []
diff --git a/strata/bsp-jetson-devel/bsp-support.morph b/strata/bsp-jetson-devel/bsp-support.morph
deleted file mode 100644
index 23524ac..0000000
--- a/strata/bsp-jetson-devel/bsp-support.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: bsp-support
-kind: chunk
-install-commands:
-- install -o 0 -g 0 -m 755 -D nv-ondemand-cpufreq-governor.service "$DESTDIR/usr/lib/systemd/system/nv-ondemand-cpufreq-governor.service"
-- install -d "$DESTDIR/usr/lib/systemd/system/sysinit.target.wants"
-- ln -s /usr/lib/systemd/system/nv-ondemand-cpufreq-governor.service "$DESTDIR/usr/lib/systemd/system/sysinit.target.wants/nv-ondemand-cpufreq-governor.service"
diff --git a/strata/bsp-jetson-devel/device-tree-compiler.morph b/strata/bsp-jetson-devel/device-tree-compiler.morph
deleted file mode 100644
index 8abfafc..0000000
--- a/strata/bsp-jetson-devel/device-tree-compiler.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: device-tree-compiler
-kind: chunk
-build-commands:
-- make all
-install-commands:
-- make install DESTDIR="$DESTDIR" PREFIX="$PREFIX"
diff --git a/strata/bsp-jetson-devel/linux-jetson-tk1.morph b/strata/bsp-jetson-devel/linux-jetson-tk1.morph
deleted file mode 100644
index 31cb393..0000000
--- a/strata/bsp-jetson-devel/linux-jetson-tk1.morph
+++ /dev/null
@@ -1,55 +0,0 @@
-name: linux-jetson-tk1
-kind: chunk
-configure-commands:
-- make ARCH=arm tegra12_defconfig
-- scripts/config -d KERNEL_LZO
-- scripts/config -e KERNEL_GZIP
-- scripts/config -e NAMESPACES
-- scripts/config -e PACKET
-- scripts/config -e SATA_AHCI
-- scripts/config -e ATA_GENERIC
-- scripts/config -e HAVE_IDE
-- scripts/config -d BLK_DEV_IDE_SATA
-- scripts/config -e BTRFS_FS
-- scripts/config -e BTRFS_FS_POSIX_ACL
-- scripts/config -e DEVTMPFS
-- scripts/config -e DEVTMPFS_MOUNT
-- scripts/config -e CONFIG_FHANDLE
-- scripts/config -e CGROUPS
-- scripts/config -e AUTOFS4_FS
-- scripts/config --set-str UEVENT_HELPER_PATH ''
-- scripts/config -e EXT2_FS
-- scripts/config -e EXT2_FS_XATTR
-- scripts/config -e EXT2_FS_POSIX_ACL
-- scripts/config -e EXT2_FS_SECURITY
-- scripts/config -e EXT2_FS_XIP
-- scripts/config -e EXT3_FS
-- scripts/config -d EXT3_DEFAULTS_TO_ORDERED
-- scripts/config -e EXT3_FS_XATTR
-- scripts/config -e EXT3_FS_POSIX_ACL
-- scripts/config -e EXT3_FS_SECURITY
-- scripts/config -e EXT4_FS
-- scripts/config -e EXT4_FS_XATTR
-- scripts/config -e EXT4_FS_POSIX_ACL
-- scripts/config -e EXT4_FS_SECURITY
-- scripts/config -d EXT4_DEBUG
-- scripts/config -d JBD_DEBUG
-- scripts/config -d JBD2_DEBUG
-- scripts/config -e BLK_DEV_LOOP
-- scripts/config -d BLK_DEV_CRYPTOLOOP
-- scripts/config --set-val BLK_DEV_LOOP_MIN_COUNT 8
-- scripts/config -e IKCONFIG
-- scripts/config -e IKCONFIG_PROC
-- scripts/config -e SECCOMP
-- scripts/config -d DEBUG_STACK_TRACE
-- scripts/config -e NFSD
-- scripts/config -e NFSD_V3
-- scripts/config -e VLAN_8021Q
-- scripts/config -e BRIDGE_VLAN_FILTERING
-- yes '' | make ARCH=arm oldconfig
-build-commands:
-- make $MAKEFLAGS ARCH=arm LOADADDR=0x80200000 zImage dtbs
-install-commands:
-- mkdir -p "$DESTDIR"/boot
-- cp arch/arm/boot/zImage "$DESTDIR"/boot/zImage
-- cp arch/arm/boot/dts/tegra124-pm375.dtb "$DESTDIR"/boot/.
diff --git a/strata/bsp-jetson-devel/u-boot.morph b/strata/bsp-jetson-devel/u-boot.morph
deleted file mode 100644
index 705b385..0000000
--- a/strata/bsp-jetson-devel/u-boot.morph
+++ /dev/null
@@ -1,16 +0,0 @@
-name: u-boot
-kind: chunk
-configure-commands:
-- make ARCH=arm jetson-tk1_config
-build-commands:
-- make ARCH=arm CROSS_COMPILE=/usr/bin/
-- make ARCH=arm CROSS_COMPILE=/usr/bin/ tools
-install-commands:
-- mkdir -p "$DESTDIR$PREFIX/bin"
-- mkdir -p "$DESTDIR/boot"
-- install -m 755 u-boot-dtb-tegra.bin "$DESTDIR/boot/u-boot.bin"
-- install -m 755 tools/img2brec.sh "$DESTDIR$PREFIX/bin/."
-- install -m 755 tools/jtagconsole "$DESTDIR$PREFIX/bin/."
-- install -m 755 tools/netconsole "$DESTDIR$PREFIX/bin/."
-- install -m 755 tools/mkenvimage "$DESTDIR$PREFIX/bin/."
-- install -m 755 tools/mkimage "$DESTDIR$PREFIX/bin/."
diff --git a/strata/bsp-jetson-genivi.morph b/strata/bsp-jetson.morph
index 62835b7..eda1d99 100644
--- a/strata/bsp-jetson-genivi.morph
+++ b/strata/bsp-jetson.morph
@@ -1,7 +1,7 @@
-name: bsp-jetson-genivi
+name: bsp-jetson
kind: stratum
description: |
- Platform-specific chunks for NVIDIA Jetson TK1 GENIVI Baseline
+ Platform-specific chunks for NVIDIA Jetson TK1
Support for the Tegra platform is still being developed. A very recent
kernel with some patches is currently required to get a fully
@@ -13,35 +13,41 @@ build-depends:
- morph: strata/core.morph
chunks:
- name: device-tree-compiler
- morph: strata/bsp-jetson-genivi/device-tree-compiler.morph
+ morph: strata/bsp-jetson/device-tree-compiler.morph
repo: upstream:device-tree-compiler
ref: c92f284c3cf76d471eb27a271de3a51cb45ed058
unpetrify-ref: baserock/morph
build-depends: []
- name: u-boot
- morph: strata/bsp-jetson-genivi/u-boot.morph
+ morph: strata/bsp-jetson/u-boot.morph
repo: upstream:u-boot
ref: c77921345b943cdf5f2f28bbe88c6d8970620d2e
unpetrify-ref: baserock/jetson/u-boot-tegra-next
build-depends:
- device-tree-compiler
-- name: linux-jetson-tk1-genivi
- morph: strata/bsp-jetson-genivi/linux-jetson-tk1-genivi.morph
+- name: linux-jetson-tk1
+ morph: strata/bsp-jetson/linux-jetson-tk1.morph
repo: upstream:linux
- ref: 8da6ad2e1c6366ebb2d9a72aeaf4a42dc32c8623
- unpetrify-ref: baserock/jetson/3.17.0-rc5
+ ref: 8c885b20c4c9115d29dca4e5afd66228c51c5f69
+ unpetrify-ref: baserock/jetson/linux-tegra-3.18-rc3
build-depends:
- u-boot
- name: bsp-support
- morph: strata/bsp-jetson-genivi/bsp-support.morph
+ morph: strata/bsp-jetson/bsp-support.morph
repo: baserock:baserock/bsp-support
ref: 19bc31ce3198a3c19cdd96d392bde34cb34ed525
unpetrify-ref: baserock/arm/tegra-3.10
build-depends: []
- name: nouveau-drm
- morph: strata/bsp-jetson-genivi/nouveau-drm.morph
+ morph: strata/bsp-jetson/nouveau-drm.morph
repo: upstream:nouveau
- ref: 62d1f5d2f5b3e5122eeac0f763dcdd1d04bf5c45
- unpetrify-ref: baserock/jetson/3.17-rc5
+ ref: 4d0929aa231a0c2d2b66fa1f8ea1c8fa4d872501
+ unpetrify-ref: baserock/jetson/gk20a
build-depends:
- - linux-jetson-tk1-genivi
+ - 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
+ build-depends: []
diff --git a/strata/bsp-jetson-genivi/bsp-support.morph b/strata/bsp-jetson/bsp-support.morph
index 23524ac..23524ac 100644
--- a/strata/bsp-jetson-genivi/bsp-support.morph
+++ b/strata/bsp-jetson/bsp-support.morph
diff --git a/strata/bsp-jetson-genivi/device-tree-compiler.morph b/strata/bsp-jetson/device-tree-compiler.morph
index 8abfafc..8abfafc 100644
--- a/strata/bsp-jetson-genivi/device-tree-compiler.morph
+++ b/strata/bsp-jetson/device-tree-compiler.morph
diff --git a/strata/bsp-jetson/linux-firmware-jetson.morph b/strata/bsp-jetson/linux-firmware-jetson.morph
new file mode 100644
index 0000000..c803eab
--- /dev/null
+++ b/strata/bsp-jetson/linux-firmware-jetson.morph
@@ -0,0 +1,6 @@
+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 -m644 nvidia/tegra124/xusb.bin "$DESTDIR/lib/firmware/nvidia/tegra124"
diff --git a/strata/bsp-jetson-genivi/linux-jetson-tk1-genivi.morph b/strata/bsp-jetson/linux-jetson-tk1.morph
index c3dfe0f..42c16f0 100644
--- a/strata/bsp-jetson-genivi/linux-jetson-tk1-genivi.morph
+++ b/strata/bsp-jetson/linux-jetson-tk1.morph
@@ -1,4 +1,4 @@
-name: linux-jetson-tk1-genivi
+name: linux-jetson-tk1
kind: chunk
configure-commands:
- make ARCH=arm tegra_defconfig
diff --git a/strata/bsp-jetson-genivi/nouveau-drm.morph b/strata/bsp-jetson/nouveau-drm.morph
index e297a06..e297a06 100644
--- a/strata/bsp-jetson-genivi/nouveau-drm.morph
+++ b/strata/bsp-jetson/nouveau-drm.morph
diff --git a/strata/bsp-jetson-genivi/u-boot.morph b/strata/bsp-jetson/u-boot.morph
index 705b385..705b385 100644
--- a/strata/bsp-jetson-genivi/u-boot.morph
+++ b/strata/bsp-jetson/u-boot.morph
diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph
index db0b36e..674b540 100644
--- a/systems/build-system-armv7lhf-jetson.morph
+++ b/systems/build-system-armv7lhf-jetson.morph
@@ -9,8 +9,8 @@ strata:
morph: strata/core.morph
- name: foundation
morph: strata/foundation.morph
-- name: bsp-jetson-devel
- morph: strata/bsp-jetson-devel.morph
+- name: bsp-jetson
+ morph: strata/bsp-jetson.morph
- name: tools
morph: strata/tools.morph
- name: morph-utils
diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph
index 35976a7..0bf7da1 100644
--- a/systems/devel-system-armv7lhf-jetson.morph
+++ b/systems/devel-system-armv7lhf-jetson.morph
@@ -21,8 +21,8 @@ strata:
morph: strata/openstack-clients.morph
- name: nfs
morph: strata/nfs.morph
-- name: bsp-jetson-devel
- morph: strata/bsp-jetson-devel.morph
+- name: bsp-jetson
+ morph: strata/bsp-jetson.morph
- name: nodejs
morph: strata/nodejs.morph
- name: ruby
diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph
index 39f05b4..59cca3e 100644
--- a/systems/genivi-baseline-system-armv7lhf-jetson.morph
+++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph
@@ -9,8 +9,8 @@ strata:
morph: strata/core.morph
- name: foundation
morph: strata/foundation.morph
-- name: bsp-jetson-genivi
- morph: strata/bsp-jetson-genivi.morph
+- name: bsp-jetson
+ morph: strata/bsp-jetson.morph
- name: connectivity
morph: strata/connectivity.morph
- name: connman-common