2 files changed, 20 insertions, 3 deletions

diff --git a/README b/README
index 65a1e5f..c58bc99 100644
--- a/README
+++ b/README
@@ -29,7 +29,8 @@ Contents:
     3.L. Enable SPI bus
     3.M. Enable I2C
     3.N. Enable PiTFT support
-    3.O. Enable UART support
+    3.O. Misc. display
+    3.P. Enable UART support
 4. Extra apps
     4.A. omxplayer
 5. Board Configuration
@@ -241,9 +242,15 @@ List of currently supported models:
     - pitft22
     - pitft28r
 
-3.O. Enable UART
-===============
+3.O. Misc. display
+==================
+If you would like to use the Waveshare "C" 1024×600, 7 inch Capacitive Touch
+Screen LCD, HDMI interface (http://www.waveshare.com/7inch-HDMI-LCD-C.htm)
+Rev 2.1, please set the following in your local.conf
+WAVESHARE_1024X600_C_2.1 = "1"
 
+3.P. Enable UART
+===============
 RaspberryPi 1, 2 and CM will have UART console enabled by default.
 
 RaspberryPi 3 does not have the UART enabled by default because this needs a
diff --git a/recipes-bsp/bootfiles/rpi-config_git.bb b/recipes-bsp/bootfiles/rpi-config_git.bb
index 20ec343..8adc938 100644
--- a/recipes-bsp/bootfiles/rpi-config_git.bb
+++ b/recipes-bsp/bootfiles/rpi-config_git.bb
@@ -110,6 +110,16 @@ do_deploy() {
         echo "# Enable VC4 Graphics" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
         echo "dtoverlay=vc4-kms-v3d,${VC4_CMA_SIZE}" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
     fi
+
+    # Waveshare "C" 1024x600 7" Rev2.1 IPS capacitive touch (http://www.waveshare.com/7inch-HDMI-LCD-C.htm)
+    if [ "${WAVESHARE_1024X600_C_2.1}" = "1" ]; then
+        echo "# Waveshare \"C\" 1024x600 7\" Rev2.1 IPS capacitive touch screen" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        echo "max_usb_current=1" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        echo "hdmi_group=2" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        echo "hdmi_mode=87" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        echo "hdmi_cvt 1024 600 60 6 0 0 0" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        echo "hdmi_drive=1" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+    fi
 }
 
 do_deploy_append_raspberrypi3-64() {