diff options
| author | John Stultz <john.stultz@linaro.org> | 2012-04-03 15:56:00 -0700 |
|---|---|---|
| committer | Tushar Behera <tushar.behera@linaro.org> | 2012-04-17 13:11:57 +0530 |
| commit | 33d639a5e2d1158e54127d5041b34a9423b2fb4a (patch) | |
| tree | 0fc2df6e8675e994f638b5bc7165c853878bcf74 | |
| parent | bfbc578a53acded49c718f42a0365b6df85ccbbe (diff) | |
| download | linux-topics-33d639a5e2d1158e54127d5041b34a9423b2fb4a.tar.gz | |
config: Fixups to get Panda booting.
Hashed out a few issues preventing pandaboard from booting android
using the merge_config script.
Signed-off-by: John Stultz <john.stultz@linaro.org>
| -rw-r--r-- | configs/android.conf | 6 | ||||
| -rw-r--r-- | configs/panda.conf | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/configs/android.conf b/configs/android.conf index b8e9e9db4c0..6fa633d96d1 100644 --- a/configs/android.conf +++ b/configs/android.conf @@ -7,7 +7,7 @@ CONFIG_WAKELOCK=y CONFIG_USER_WAKELOCK=y CONFIG_BLK_DEV_LOOP=y CONFIG_DM_CRYPT=y -CONFIG_EABI=y +CONFIG_AEABI=y CONFIG_POWER_SUPPLY=y CONFIG_ANDROID_PARANOID_NETWORK=y CONFIG_NET_ACTIVITY_STATS=y @@ -25,3 +25,7 @@ CONFIG_ANDROID_TIMED_GPIO=y CONFIG_ANDROID_LOW_MEMORY_KILLER=y CONFIG_ANDROID_INTF_ALARM_DEV=y CONFIG_CRYPTO_TWOFISH=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=16384 + diff --git a/configs/panda.conf b/configs/panda.conf index a80ecaba2c5..8afa4a3b0ad 100644 --- a/configs/panda.conf +++ b/configs/panda.conf @@ -10,7 +10,6 @@ CONFIG_MTD_ONENAND=y CONFIG_MTD_ONENAND_VERIFY_WRITE=y CONFIG_MTD_ONENAND_OMAP2=y CONFIG_MTD_UBI=y -CONFIG_BLK_DEV_LOOP=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_SCSI_MULTI_LUN=y @@ -55,7 +54,6 @@ CONFIG_DEBUG_GPIO=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_TWL4030=y CONFIG_W1=y -CONFIG_POWER_SUPPLY=y CONFIG_WATCHDOG=y CONFIG_OMAP_WATCHDOG=y CONFIG_TWL4030_WATCHDOG=y @@ -98,7 +96,6 @@ CONFIG_USB_MON=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_MUSB_HDRC=y -CONFIG_USB_MUSB_OMAP2PLUS=y CONFIG_MUSB_PIO_ONLY=y CONFIG_USB_WDM=y CONFIG_USB_STORAGE=y @@ -115,3 +112,4 @@ CONFIG_MMC_OMAP=y CONFIG_MMC_OMAP_HS=y CONFIG_RTC_CLASS=y CONFIG_DEBUG_INFO=y +CONFIG_PANEL_DVI=y |