summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Huang <jim.huang@linaro.org>2011-04-27 11:10:46 +0800
committerJim Huang <jim.huang@linaro.org>2011-04-27 11:10:46 +0800
commitc43702ecebd5c1e7b261593087158e423390a991 (patch)
tree44dee7b622acd96fb50b18f93f4ffd244be0a5c3
parent339b9f3cb3b86b48cd8b33c727e4e0972344bb8e (diff)
parent4b4b652e94196f0c008bd8943a4164bca834ae97 (diff)
downloadpandaboard-c43702ecebd5c1e7b261593087158e423390a991.tar.gz
Merge branches 'linaro_android_2.3.3' and 'HEAD' into LEB-panda
-rw-r--r--AndroidBoard.mk2
-rwxr-xr-xinit.omap4.sh16
2 files changed, 1 insertions, 17 deletions
diff --git a/AndroidBoard.mk b/AndroidBoard.mk
index 941416a..c417cac 100644
--- a/AndroidBoard.mk
+++ b/AndroidBoard.mk
@@ -30,7 +30,7 @@ ALL_PREBUILT += $(file)
$(file) : $(LOCAL_PATH)/init.omap4.rc | $(ACP)
$(transform-prebuilt-to-target)
-file := $(TARGET_ROOT_OUT)/system/etc/init.omap4.sh
+file := $(PRODUCT_OUT)/system/etc/init.omap4.sh
ALL_PREBUILT += $(file)
$(file) : $(LOCAL_PATH)/init.omap4.sh | $(ACP)
$(transform-prebuilt-to-target)
diff --git a/init.omap4.sh b/init.omap4.sh
index c3908bd..ecd1aa8 100755
--- a/init.omap4.sh
+++ b/init.omap4.sh
@@ -1,19 +1,3 @@
#!/system/bin/sh
-# Detect the board type
-#while read c1 c2 c3;
-#do
-# case "$c3" in
-# "OMAP3 Devkit8000")
-# setprop ro.runtime.device devkit8000
-# ;;
-# "OMAP3 Beagle Board")
-# setprop ro.runtime.device beagleboard
-# ;;
-# *)
-# echo $c1 $c2 $c3;
-# ;;
-# esac
-#done < /proc/cpuinfo
-
setprop ro.runtime.device pandaboard