summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMy Name <me@example.com>2016-01-27 18:09:20 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-01-27 18:14:00 (GMT)
commiteb0cdcd7ecdc03d6388a30599341b0d35c442e43 (patch)
tree1c6c6d2c964f698f67b12270c9d95bb86ab3bf93
parent2f5fc2f7745d0fb3a72c4d07092298d195d1f19e (diff)
downloaddefinitions-baserock/pedroalvarez/merge-rpi2-wip-4.5.tar.gz
-rw-r--r--strata/bsp-rpi2.morph2
-rw-r--r--strata/bsp-rpi2/linux@rpi2.morph9
-rw-r--r--systems/genivi-baseline-system-armv7lhf-rpi2.morph4
3 files changed, 5 insertions, 10 deletions
diff --git a/strata/bsp-rpi2.morph b/strata/bsp-rpi2.morph
index 5df18aa..59ae207 100644
--- a/strata/bsp-rpi2.morph
+++ b/strata/bsp-rpi2.morph
@@ -14,7 +14,7 @@ chunks:
- name: linux@rpi2
morph: strata/bsp-rpi2/linux@rpi2.morph
repo: upstream:linux
- ref: baserock/pedroalvarez/rpi2-drm-rebased-on-vc4-kms-v3d-rpi2
+ ref: v4.5-rc1
unpetrify-ref: baserock/pedroalvarez/rpi2-drm-rebased-on-vc4-kms-v3d-rpi2
- name: linux-firmware@rpi2
repo: upstream:linux-firmware
diff --git a/strata/bsp-rpi2/linux@rpi2.morph b/strata/bsp-rpi2/linux@rpi2.morph
index 0f856b8..eda0bcb 100644
--- a/strata/bsp-rpi2/linux@rpi2.morph
+++ b/strata/bsp-rpi2/linux@rpi2.morph
@@ -1,7 +1,7 @@
name: linux@rpi2
kind: chunk
configure-commands:
-- make bcm2709_defconfig
+- make bcm2835_defconfig
- scripts/config -d KERNEL_LZO
- scripts/config -e KERNEL_GZIP
- scripts/config -e NAMESPACES
@@ -109,15 +109,10 @@ configure-commands:
- yes '' | make ARCH=arm oldconfig
build-commands:
- make $MAKEFLAGS ARCH=arm zImage dtbs
-- make $MAKEFLAGS modules
install-commands:
- mkdir -p "$DESTDIR"/boot/overlays
- cp arch/arm/boot/zImage "$DESTDIR"/boot/zImage
-- cp arch/arm/boot/dts/*.dtb "$DESTDIR"/boot/.
-- make INSTALL_MOD_PATH="$DESTDIR" modules_install
-- cp arch/arm/boot/dts/overlays/*.dtb* "$DESTDIR"/boot/overlays/
-- cp arch/arm/boot/dts/overlays/README "$DESTDIR"/boot/overlays/
-- scripts/mkknlimg arch/arm/boot/zImage "$DESTDIR"/boot/kernel7.img
+- cp arch/arm/boot/dts/bcm2836-rpi-2-b.dtb "$DESTDIR"/boot/
system-integration:
linux-rpi2-misc:
00-depmod:
diff --git a/systems/genivi-baseline-system-armv7lhf-rpi2.morph b/systems/genivi-baseline-system-armv7lhf-rpi2.morph
index 8f96323..4cff51e 100644
--- a/systems/genivi-baseline-system-armv7lhf-rpi2.morph
+++ b/systems/genivi-baseline-system-armv7lhf-rpi2.morph
@@ -31,8 +31,8 @@ strata:
morph: strata/wayland-generic.morph
- name: graphics-common
morph: strata/graphics-common.morph
-- name: input-common
- morph: strata/input-common.morph
+- name: input-genivi
+ morph: strata/input-genivi.morph
- name: mesa-common
morph: strata/mesa-common.morph
- name: x-common