diff options
| -rw-r--r-- | arch/arm/boot/dts/omap3_h1.dts | 15 | ||||
| -rw-r--r-- | arch/arm/configs/omap3_h1_defconfig | 25 |
2 files changed, 23 insertions, 17 deletions
diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts index eb77ae21854..7c3b4ebd314 100644 --- a/arch/arm/boot/dts/omap3_h1.dts +++ b/arch/arm/boot/dts/omap3_h1.dts @@ -11,6 +11,11 @@ */ /dts-v1/; +/* reserve memory for ram_console */ +/memreserve/ 0x83000000 0x20000; /* IMAGE_DOWN_LOAD_ADDR */ +/* /memreserve/ 0x83020000 0x16000; */ /* OMAP_SECURE_RAM_STORAGE_ADDR */ +/* /memreserve/ 0x83036000 0x9000; */ /* OMAP3_SECURE_RAM_CTX_ADDR */ + /include/ "omap36xx.dtsi" / { model = "Olio OMAP3 H1 Board"; @@ -40,6 +45,16 @@ regulator-boot-on; }; + ramoops { + compatible = "ramoops"; + status = "ok"; + + android,ramoops-buffer-start = <0x83000000>; + android,ramoops-buffer-size = <0x20000>; + android,ramoops-console-size = <0x1FC00>; + android,ramoops-annotate-size = <0x400>; + }; + /* omap_pimic is used by the omap-pmic-regulator driver - a * generic framework for omap interfacing with i2c drivers, based * on the TWL framework. diff --git a/arch/arm/configs/omap3_h1_defconfig b/arch/arm/configs/omap3_h1_defconfig index a71a3d77132..42b30e2846a 100644 --- a/arch/arm/configs/omap3_h1_defconfig +++ b/arch/arm/configs/omap3_h1_defconfig @@ -1855,6 +1855,7 @@ CONFIG_SND_OMAP_SOC_MCBSP=y CONFIG_SND_OMAP_SOC_OMAP3_H1=y CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_ALL_CODECS is not set +CONFIG_SND_SOC_OMAP3H1_BT_SCO=y CONFIG_SND_SOC_DMIC=y # CONFIG_SND_SIMPLE_CARD is not set # CONFIG_SOUND_PRIME is not set @@ -2611,7 +2612,9 @@ CONFIG_UBIFS_FS_ZLIB=y # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set # CONFIG_ROMFS_FS is not set -# CONFIG_PSTORE is not set +CONFIG_PSTORE=y +CONFIG_PSTORE_CONSOLE=y +CONFIG_PSTORE_RAM=y # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set # CONFIG_F2FS_FS is not set @@ -2677,7 +2680,7 @@ CONFIG_DEFAULT_MESSAGE_LOGLEVEL=1 CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y CONFIG_FRAME_WARN=1024 -# CONFIG_MAGIC_SYSRQ is not set +CONFIG_MAGIC_SYSRQ=y # CONFIG_STRIP_ASM_SYMS is not set # CONFIG_READABLE_ASM is not set # CONFIG_UNUSED_SYMBOLS is not set @@ -2767,21 +2770,6 @@ CONFIG_HAVE_ARCH_KGDB=y # CONFIG_DEBUG_USER is not set # CONFIG_DEBUG_RODATA is not set # CONFIG_DEBUG_LL is not set -# CONFIG_DEBUG_OMAP2PLUS_UART is not set -# CONFIG_DEBUG_ICEDCC is not set -# CONFIG_DEBUG_SEMIHOSTING is not set -# CONFIG_DEBUG_OMAP2UART1 is not set -# CONFIG_DEBUG_OMAP2UART2 is not set -# CONFIG_DEBUG_OMAP2UART3 is not set -# CONFIG_DEBUG_OMAP3UART3 is not set -# CONFIG_DEBUG_OMAP4UART3 is not set -# CONFIG_DEBUG_OMAP3UART4 is not set -# CONFIG_DEBUG_OMAP4UART4 is not set -# CONFIG_DEBUG_TI81XXUART1 is not set -# CONFIG_DEBUG_TI81XXUART2 is not set -# CONFIG_DEBUG_TI81XXUART3 is not set -# CONFIG_DEBUG_AM33XXUART1 is not set -# CONFIG_DEBUG_ZOOM_UART is not set CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" # CONFIG_PID_IN_CONTEXTIDR is not set @@ -2940,6 +2928,9 @@ CONFIG_XZ_DEC_BCJ=y # CONFIG_XZ_DEC_TEST is not set CONFIG_DECOMPRESS_GZIP=y CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=y +CONFIG_REED_SOLOMON_ENC8=y +CONFIG_REED_SOLOMON_DEC8=y CONFIG_BCH=y CONFIG_BCH_CONST_PARAMS=y CONFIG_TEXTSEARCH=y |