summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-10-13 15:54:04 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-10-13 17:16:01 (GMT)
commitf95cfaf50a5bec3f59a73010d52dc7810fc66dab (patch)
tree283d92b6a578d5a0f7eb2030aa41880c3241fb17
parent9ec202c9faf9972904f3ded2422077c50c5e915a (diff)
downloaddefinitions-baserock/pedroalvarez/rpv2-drm-rebased.tar.gz
Rebase linux branch on top of anholt linux tree for rpi2baserock/pedroalvarez/rpv2-drm-rebased
-rw-r--r--strata/bsp-rpi2.morph4
-rw-r--r--strata/bsp-rpi2/linux-rpi2.morph1
2 files changed, 2 insertions, 3 deletions
diff --git a/strata/bsp-rpi2.morph b/strata/bsp-rpi2.morph
index 0b07221..c3f4300 100644
--- a/strata/bsp-rpi2.morph
+++ b/strata/bsp-rpi2.morph
@@ -25,8 +25,8 @@ chunks:
- name: linux-rpi2
morph: strata/bsp-rpi2/linux-rpi2.morph
repo: upstream:linux
- ref: baserock/pedroalvarez/rpi2-drm
- unpetrify-ref: baserock/pedroalvarez/rpi2-drm
+ ref: baserock/pedroalvarez/rpi2-drm-rebased-on-vc4-kms-v3d-rpi2
+ unpetrify-ref: baserock/pedroalvarez/rpi2-drm-rebased-on-vc4-kms-v3d-rpi2
build-depends:
- grep
- name: linux-firmware-rpi2
diff --git a/strata/bsp-rpi2/linux-rpi2.morph b/strata/bsp-rpi2/linux-rpi2.morph
index 0cb98f0..f789251 100644
--- a/strata/bsp-rpi2/linux-rpi2.morph
+++ b/strata/bsp-rpi2/linux-rpi2.morph
@@ -106,7 +106,6 @@ configure-commands:
- scripts/config -e BOOT_PRINTK_DELAY
- scripts/config -e DRM_VC4
- scripts/config -e I2C_BCM2835
-- scripts/config -d FB_BCM2708
- yes '' | make ARCH=arm oldconfig
build-commands:
- make $MAKEFLAGS ARCH=arm zImage dtbs