Merge branch 'master' of ssh://git.linaro.org/~/public_git/iMX53 into linaro_android_2.3.4

4 files changed, 2 insertions, 16 deletions

diff --git a/AndroidBoard.mk b/AndroidBoard.mk
index b6421d3..b1fd323 100644
--- a/AndroidBoard.mk
+++ b/AndroidBoard.mk
@@ -26,11 +26,6 @@ $(file) : $(LOCAL_PATH)/init.rc | $(ACP)
 	$(transform-prebuilt-to-target)
 	#sed -e 's,mmcblk0p5,mmcblk0p6,g;s,mmcblk0p3,mmcblk0p5,g;s,mmcblk0p2,mmcblk0p3,g' $(LOCAL_PATH)/../common/init.rc >$(file)
 
-file := $(TARGET_ROOT_OUT)/init.omap4.rc
-ALL_PREBUILT += $(file)
-$(file) : $(LOCAL_PATH)/init.omap4.rc | $(ACP)
-	$(transform-prebuilt-to-target)
-
 file := $(TARGET_ROOT_OUT)/initlogo.rle
 ALL_PREBUILT += $(file)
 $(file) : $(LOCAL_PATH)/initlogo.rle | $(ACP)
diff --git a/init.omap4.rc b/init.omap4.rc
deleted file mode 100644
index c867e9e..0000000
--- a/init.omap4.rc
+++ /dev/null
@@ -1,9 +0,0 @@
-on boot
-    # create dhcpcd dir
-    mkdir /data/misc/dhcp 0770 dhcp dhcp
-    chmod 0770 /data/misc/dhcp
-
-service faketsd /system/bin/faketsd
-    user bluetooth
-    group bluetooth
-    oneshot
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 3287f76..67746cd 100755
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1 +1 @@
-add_lunch_combo pandaboard-eng
+add_lunch_combo generic-eng
diff --git a/vold.fstab b/vold.fstab
index be7ec95..924c72d 100644
--- a/vold.fstab
+++ b/vold.fstab
@@ -12,4 +12,4 @@
 ## <sysfs_path> - List of sysfs paths to source devices
 ######################
 
-dev_mount sdcard /mnt/sdcard 7 /devices/platform/omap/omap_hsmmc.0/mmc_host/mmc0
+dev_mount sdcard /mnt/sdcard 7 /devices/platform/sdhci-esdhc-imx.0/mmc_host/mmc0