summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVioleta Menendez Gonzalez <violeta.menendez@codethink.co.uk>2014-09-30 15:36:34 (GMT)
committerVioleta Menendez Gonzalez <violeta.menendez@codethink.co.uk>2014-10-02 15:11:04 (GMT)
commitb9ff7ff14f259bb8a4e228d56092551d55d8c0e8 (patch)
treeccf374a2f67fc47d3613e1c69edbfcd4018821b4
parentedf589f356930ab47a04fec39bfcf55bac10329c (diff)
downloaddefinitions-baserock/violetamenendez/jetson-nouveau-module-v3.tar.gz
Add Nouveau support for Jetson systemsbaserock/violetamenendez/jetson-nouveau-module-v3
-rw-r--r--clusters/jetson-upgrade.morph7
-rw-r--r--strata/bsp-jetson-devel.morph6
-rw-r--r--strata/bsp-jetson-devel/linux-jetson-tk1.morph22
-rw-r--r--strata/bsp-jetson-devel/nouveau-drm.morph10
4 files changed, 39 insertions, 6 deletions
diff --git a/clusters/jetson-upgrade.morph b/clusters/jetson-upgrade.morph
index e378cca..92c7d50 100644
--- a/clusters/jetson-upgrade.morph
+++ b/clusters/jetson-upgrade.morph
@@ -1,18 +1,17 @@
name: jetson-upgrade
kind: cluster
systems:
-- morph: devel-system-armv7lhf-jetson
+- morph: systems/devel-system-armv7lhf-jetson.morph
deploy-defaults:
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
+ 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
FSTAB_SRC: LABEL=src /src auto defaults,rw,noatime 0 2
deploy:
jetson:
type: ssh-rsync
location: root@localhost
- HOSTNAME: baserock-jetson
diff --git a/strata/bsp-jetson-devel.morph b/strata/bsp-jetson-devel.morph
index bf110d1..8bcdfb2 100644
--- a/strata/bsp-jetson-devel.morph
+++ b/strata/bsp-jetson-devel.morph
@@ -31,3 +31,9 @@ chunks:
ref: 19bc31ce3198a3c19cdd96d392bde34cb34ed525
unpetrify-ref: baserock/arm/tegra-3.10
build-depends: []
+- name: nouveau-drm
+ morph: strata/bsp-jetson-devel/nouveau-drm.morph
+ repo: github:Gnurou/nouveau
+ ref: gk20a
+ build-depends:
+ - linux-jetson-tk1
diff --git a/strata/bsp-jetson-devel/linux-jetson-tk1.morph b/strata/bsp-jetson-devel/linux-jetson-tk1.morph
index 3494f62..1f98009 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
@@ -44,10 +44,28 @@ configure-commands:
- scripts/config -d DEBUG_STACK_TRACE
- scripts/config -e NFSD
- scripts/config -e NFSD_V3
+- scripts/config -e DRM_TEGRA_STAGING
+- scripts/config -m DRM_NOUVEAU
- 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/.
+- cp arch/arm/boot/dts/tegra124-jetson-tk1.dtb "$DESTDIR"/boot/.
+- make modules
+- make INSTALL_MOD_PATH="$DESTDIR" modules_install
+- install -d "$DESTDIR$PREFIX/src/linux"
+- |
+ (
+ printf 'Makefile\0'
+ printf 'Module.symvers\0'
+ find arch/arm -maxdepth 1 -name 'Makefile*' -print0
+ find arch/arm \( -name 'module.lds' -o -name 'Kbuild.platforms' -o -name 'Platform' \) -print0
+ find arch/arm \( -type d -a \( -name include -o -name scripts \) \) -o \
+ \! -type d -a \( -path '*include/*' -o -path '*scripts/*' \) -print0
+ find include -name 'asm*' -prune -o -print0
+ find include/asm-generic -print0
+ find include/uapi -print0
+ find scripts -print0
+ ) | cpio -0pumd "$DESTDIR$PREFIX/src/linux"
diff --git a/strata/bsp-jetson-devel/nouveau-drm.morph b/strata/bsp-jetson-devel/nouveau-drm.morph
new file mode 100644
index 0000000..e89df38
--- /dev/null
+++ b/strata/bsp-jetson-devel/nouveau-drm.morph
@@ -0,0 +1,10 @@
+name: nouveau-drm
+kind: chunk
+build-commands:
+ - cd drm && make M=$(pwd) -C /usr/src/linux/ modules
+install-commands:
+ - cd drm && make 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 depmod -a "$version"; done)