4 files changed, 16 insertions, 1 deletions

diff --git a/README b/README
index bb2f4be..2a3a79e 100644
--- a/README
+++ b/README
@@ -68,7 +68,7 @@ How to use it:
 1. source poky/oe-init-build-env rpi-build
 2. Add needed layer to bblayers.conf:
     - meta-raspberrypi
-3  Set MACHINE to raspberrypi in local.conf
+3  Set MACHINE to "raspberrypi"/"raspberrypi2" in local.conf
 4. bitbake rpi-hwup-image
 5. dd to a SD card the generated sdimg file (use xzcat if rpi-sdimg.xz is used)
 6. Boot your RPI.
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
index 86cf773..1ff664d 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -33,6 +33,7 @@ KERNEL_INITRAMFS ?= ""
 
 # Kernel image name
 SDIMG_KERNELIMAGE_raspberrypi  ?= "kernel.img"
+SDIMG_KERNELIMAGE_raspberrypi2 ?= "kernel7.img"
 
 # Boot partition volume id
 BOOTDD_VOLUME_ID ?= "${MACHINE}"
diff --git a/conf/machine/raspberrypi2.conf b/conf/machine/raspberrypi2.conf
new file mode 100644
index 0000000..778f5a6
--- /dev/null
+++ b/conf/machine/raspberrypi2.conf
@@ -0,0 +1,13 @@
+#@TYPE: Machine
+#@NAME: RaspberryPi 2 Development Board
+#@DESCRIPTION: Machine configuration for the RaspberryPi 2
+
+# userland is not compiling on RPI 2
+# https://github.com/raspberrypi/userland/issues/214
+PREFERRED_PROVIDER_virtual/egl ?= "vc-graphics-hardfp"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "vc-graphics-hardfp"
+
+DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
+
+require conf/machine/include/tune-cortexa7.inc
+include conf/machine/include/rpi-base.inc
diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
index b8afecc..fde68dd 100644
--- a/recipes-kernel/linux/linux-raspberrypi.inc
+++ b/recipes-kernel/linux/linux-raspberrypi.inc
@@ -15,6 +15,7 @@ PV_append = "+git${SRCREV}"
 
 # NOTE: For now we pull in the default config from the RPi kernel GIT tree.
 KERNEL_DEFCONFIG_raspberrypi ?= "bcmrpi_defconfig"
+KERNEL_DEFCONFIG_raspberrypi2 ?= "bcm2709_defconfig"
 
 # CMDLINE for raspberrypi
 CMDLINE = "dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"