diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-10-13 15:54:04 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-10-14 16:25:44 +0000 |
| commit | 38f51f0717c509abf6de3301f2290375cfb45978 (patch) | |
| tree | bed6ff75c425532f85a16288ad0ef0f2b0cb6440 | |
| parent | 0ee4d55c078a1e613957811fa0cde1871562e4c2 (diff) | |
| download | definitions-38f51f0717c509abf6de3301f2290375cfb45978.tar.gz | |
Rebase linux branch on top of anholt linux tree for rpi2
| -rw-r--r-- | strata/bsp-rpi2.morph | 4 | ||||
| -rw-r--r-- | strata/bsp-rpi2/linux-rpi2.morph | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/strata/bsp-rpi2.morph b/strata/bsp-rpi2.morph index 0b072218..c3f43007 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 0cb98f09..f789251c 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 |