Merge "Panda: Change graphics init binary name"
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 32e6fd7..6f4ed80 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -25,6 +25,7 @@
 TARGET_CPU_ABI := armeabi-v7a
 TARGET_CPU_ABI2 := armeabi
 TARGET_CPU_SMP := true
+TARGET_ARCH:= arm
 TARGET_ARCH_VARIANT := armv7-a-neon
 ARCH_ARM_HAVE_TLS_REGISTER := true
 
diff --git a/README b/README
index 015dfab..50b04bf 100644
--- a/README
+++ b/README
@@ -24,7 +24,7 @@
 
 # Initial setup, part 1: build fastboot
 source build/envsetup.sh
-lunch full_panda_userdebug
+lunch full_panda-userdebug
 make fastboot
 
 # Initial setup, part 2:
@@ -40,7 +40,7 @@
 
 # Build and flash, part 1: Do a build
 source build/envsetup.sh
-lunch full_panda_userdebug
+lunch full_panda-userdebug
 make
 
 # Build and flash, part 2: Flash
diff --git a/kernel b/kernel
index 81e3635..3b10738 100755
--- a/kernel
+++ b/kernel
Binary files differ
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index cd9e749..1ee44d9 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -17,7 +17,7 @@
 (cd ../../../../out/target/product/panda ; zip -r ../../../../device/ti/panda/self-extractors/full_panda-pseudo_ota.zip system)
 
 ZIP=full_panda-pseudo_ota.zip
-BUILD=imm76i
+BUILD=20120807
 ROOTDEVICE=panda
 DEVICE=panda
 MANUFACTURER=ti
@@ -32,7 +32,7 @@
   case $COMPANY in
   imgtec)
     TO_EXTRACT="\
-            system/vendor/bin/pvrsrvinit \
+            system/vendor/bin/pvrsrvctl \
             system/vendor/lib/egl/libEGL_POWERVR_SGX540_120.so \
             system/vendor/lib/egl/libGLESv1_CM_POWERVR_SGX540_120.so \
             system/vendor/lib/egl/libGLESv2_POWERVR_SGX540_120.so \
diff --git a/self-extractors/imgtec/staging/device-panda.mk b/self-extractors/imgtec/staging/device-panda.mk
index e29e9bd..d1e9856 100644
--- a/self-extractors/imgtec/staging/device-panda.mk
+++ b/self-extractors/imgtec/staging/device-panda.mk
@@ -16,7 +16,7 @@
 
 # Imgtec blobs necessary for Pandaboard
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/proprietary/pvrsrvinit:system/vendor/bin/pvrsrvinit \
+    $(LOCAL_PATH)/proprietary/pvrsrvctl:system/vendor/bin/pvrsrvctl \
     $(LOCAL_PATH)/proprietary/libEGL_POWERVR_SGX540_120.so:system/vendor/lib/egl/libEGL_POWERVR_SGX540_120.so \
     $(LOCAL_PATH)/proprietary/libGLESv1_CM_POWERVR_SGX540_120.so:system/vendor/lib/egl/libGLESv1_CM_POWERVR_SGX540_120.so \
     $(LOCAL_PATH)/proprietary/libGLESv2_POWERVR_SGX540_120.so:system/vendor/lib/egl/libGLESv2_POWERVR_SGX540_120.so \