summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPraneeth Bajjuri <praneeth@ti.com>2015-02-03 15:50:59 -0600
committerPraneeth Bajjuri <praneeth@ti.com>2015-02-03 15:50:59 -0600
commit0bd1e5343c630752d126bf35d5bc506e2faaf3f7 (patch)
tree9452c829fc54fa051ca1dfebf6040c371bbfa21b
parent95b851016f79c42a9e8a824c7c81e49015c17820 (diff)
android: x15: Merge script and config update
beagle x15 merge script and androidization update patch. Usage: To build: ./ti_config_fragments/android_x15_config.sh make uImage LOADADDR=0x80008000; make dtbs Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
-rw-r--r--ti_config_fragments/android_x15.cfg9
-rwxr-xr-xti_config_fragments/android_x15_config.sh13
2 files changed, 22 insertions, 0 deletions
diff --git a/ti_config_fragments/android_x15.cfg b/ti_config_fragments/android_x15.cfg
new file mode 100644
index 00000000000..83856e7b65e
--- /dev/null
+++ b/ti_config_fragments/android_x15.cfg
@@ -0,0 +1,9 @@
+###############################################################################
+# x15 Android Config Options
+# Use to set additional android options exclusively for TI products
+# Note:
+# Use android/configs/android-base.cfg to set google android base options
+# Use android/configs/android-recommended.cfg to set google android
+# recommended options
+###############################################################################
+CONFIG_CMDLINE="root=/dev/mmcblk0p2 rw console=ttyO2,119200 androidboot.console=ttyO2 init=/init rootfstype=ext4 rootwait drm.rnodes=1 snd.slots_reserved=1,1"
diff --git a/ti_config_fragments/android_x15_config.sh b/ti_config_fragments/android_x15_config.sh
new file mode 100755
index 00000000000..7c3b0adbaea
--- /dev/null
+++ b/ti_config_fragments/android_x15_config.sh
@@ -0,0 +1,13 @@
+export ARCH=arm
+./scripts/kconfig/merge_config.sh \
+arch/arm/configs/omap2plus_defconfig \
+ti_config_fragments/dra7_only.cfg \
+ti_config_fragments/baseport.cfg \
+ti_config_fragments/power.cfg \
+ti_config_fragments/connectivity.cfg \
+ti_config_fragments/ipc.cfg \
+ti_config_fragments/audio_display.cfg \
+ti_config_fragments/radio.cfg \
+ti_config_fragments/wlan.cfg \
+ti_config_fragments/android_omap.cfg \
+ti_config_fragments/android_x15.cfg