diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2019-07-12 21:08:32 +0000 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2019-07-13 09:13:40 +0000 |
| commit | 1537ae57ca2e729caf8c47788088ab9c8b025723 (patch) | |
| tree | 2bf2e1985ff7781832ff4c77e442a934d48db8ba /meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles | |
| parent | 9776e29680e68658bbef5ce54dc481207bac0bfd (diff) | |
Revert "Fix rpi touchscreen support on master"
We need to reconsider this changeset. It seems to
produce a regression.
This reverts commit ccb667c35ffdea7a2bc1304750e6b22368cd55f7.
Change-Id: I42754a899e8530f4e18a069ed227f18a8d615801
Diffstat (limited to 'meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles')
| -rw-r--r-- | meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/bcm2835-bootfiles.bbappend | 9 | ||||
| -rw-r--r-- | meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend | 6 |
2 files changed, 2 insertions, 13 deletions
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/bcm2835-bootfiles.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/bcm2835-bootfiles.bbappend index 7998c826a..adb19c09c 100644 --- a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/bcm2835-bootfiles.bbappend +++ b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/bcm2835-bootfiles.bbappend @@ -1,10 +1 @@ RDEPENDS_${PN}_append_sota += " u-boot-otascript" - -# uprev firmware - -RPIFW_DATE = "20190517" -SRCREV = "e1900836948f6c6bdf4571da1b966a9085c95d37" -SRC_URI[md5sum] = "ba272fed3661f0c8d5e4c424d2617246" -SRC_URI[sha256sum] = "2a4c566e98b16575ebf295b795b40a5772f81282948e957bdc9733cf72fdcd39" - -PV = "${RPIFW_DATE}" diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend index e4246e958..9222fd52a 100644 --- a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend +++ b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend @@ -11,10 +11,8 @@ do_deploy_append() { echo "avoid_warnings=2" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt echo "mask_gpu_interrupt0=0x400" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt - echo "dtoverlay=vc4-kms-v3d,cma-256" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt - echo "dtoverlay=rpi-7inch" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt - echo "dtoverlay=rpi-backlight" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt - echo "dtoverlay=rpi-ft5406" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt + echo "dtoverlay=vc4-kms-v3d-overlay,cma-256" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt + echo "dtoverlay=rpi-ft5406-overlay" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt echo "dtparam=audio=on" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt } |