Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jb mr1 #5

Open
wants to merge 17 commits into
base: jb-mr1
Choose a base branch
from
Open

Jb mr1 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7280bb6
Add edison build defconfig
wanggjghost Mar 18, 2013
8b82e12
remove extra ram console settings
Hashcode Mar 19, 2013
2d0e27e
Revert "i2c-algo-bit: Generate correct i2c address sequence for 10-bi…
Hashcode Mar 22, 2013
612f514
turn back off emu_uart during boot if EMU_UART is disabled
Hashcode Mar 26, 2013
b8eaefe
defconfig updates: setup by memory
Hashcode Mar 28, 2013
d9d7d4e
defconfig: updates
Hashcode Mar 29, 2013
5a7bb0e
ram_console: change for 1GB
Hashcode Mar 29, 2013
3ca0201
temp: disable uart3_hwmod
Hashcode Mar 29, 2013
524a2b5
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1
wanggjghost Apr 1, 2013
e2d45cf
stacktrace : fix fp check from moto src
wanggjghost Mar 21, 2013
45456bf
[moto]add motsoc1 code
wanggjghost Mar 25, 2013
4e62df9
[moto]motsoc1,turn off mclk when close
wanggjghost Mar 25, 2013
fbf4a52
[moto] init motsoc1 in board-mapphone when define macro
wanggjghost Mar 25, 2013
8465aa3
[moto] motsoc1 fix build break
wanggjghost Mar 25, 2013
083d56c
[moto][radio]add pnx6718 g4852
wanggjghost Mar 25, 2013
90539ef
fix usb hub build break
wanggjghost Apr 1, 2013
002f726
Merge branch 'cm-10.1' into jb-mr1
wanggjghost Apr 4, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions arch/arm/configs/mapphone_maserati_defconfig → arch/arm/configs/mapphone_1GB_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
# Linux/arm 3.0.8 Kernel Configuration
# Linux/arm 3.0.31 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
Expand Down Expand Up @@ -385,6 +385,7 @@ CONFIG_ARM_GIC=y
# CONFIG_ARCH_SUPPORTS_MSI is not set
# CONFIG_PCCARD is not set
# CONFIG_ARM_ERRATA_764369 is not set
# CONFIG_PL310_ERRATA_769419 is not set

#
# Kernel Features
Expand Down Expand Up @@ -448,10 +449,10 @@ CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
CONFIG_USE_OF=y
CONFIG_ZBOOT_ROM_TEXT=0
CONFIG_ZBOOT_ROM_BSS=0
CONFIG_CMDLINE="root=/dev/ram0 rw mem=1023M@0x80000000 console=null vram=10300K omapfb.vram=0:8256K,1:4K,2:2040K init=/init ip=off mmcparts=mmcblk1:p7(pds),p8(utags),p14(boot),p15(recovery),p16(cdrom),p17(misc),p18(cid),p19(kpanic),p20(system),p21(cache),p22(preinstall),p23(webtop),p24(userdata),p25(emstorage) mot_sst=1 androidboot.bootloader=0x0A74"
CONFIG_CMDLINE="root=/dev/ram0 rw mem=1023M@0x80000000 console=null vram=10300K omapfb.vram=0:8256K,1:4K,2:2040K init=/init ip=off mot_sst=1 androidboot.bootloader=0x0A74"
# CONFIG_CMDLINE_FROM_BOOTLOADER is not set
# CONFIG_CMDLINE_EXTEND is not set
CONFIG_CMDLINE_FORCE=y
CONFIG_CMDLINE_EXTEND=y
# CONFIG_CMDLINE_FORCE is not set
# CONFIG_XIP_KERNEL is not set
# CONFIG_KEXEC is not set
# CONFIG_CRASH_DUMP is not set
Expand Down Expand Up @@ -2793,6 +2794,7 @@ CONFIG_PROC_FS=y
CONFIG_PROC_SYSCTL=y
CONFIG_PROC_PAGE_MONITOR=y
CONFIG_PROC_SOCINFO=y
# CONFIG_EXPOSE_VIRTUAL_PID is not set
CONFIG_SYSFS=y
CONFIG_TMPFS=y
CONFIG_TMPFS_POSIX_ACL=y
Expand Down
6 changes: 3 additions & 3 deletions .../configs/mapphone_targa_phablet_defconfig → ...rm/configs/mapphone_1GB_phablet_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,10 +453,10 @@ CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
CONFIG_USE_OF=y
CONFIG_ZBOOT_ROM_TEXT=0
CONFIG_ZBOOT_ROM_BSS=0
CONFIG_CMDLINE="root=/dev/ram0 rw mem=1023M@0x80000000 console=null vram=10300K omapfb.vram=0:8256K,1:4K,2:2040K init=/init ip=off mmcparts=mmcblk1:p7(pds),p15(boot),p16(recovery),p17(cdrom),p18(misc),p19(cid),p20(kpanic),p21(system),p22(cache),p23(preinstall),p24(webtop),p25(userdata),p26(emstorage) mot_sst=1 androidboot.bootloader=0x0A72"
CONFIG_CMDLINE="root=/dev/ram0 rw mem=1023M@0x80000000 console=null vram=10300K omapfb.vram=0:8256K,1:4K,2:2040K init=/init ip=off mot_sst=1 androidboot.bootloader=0x0A74"
# CONFIG_CMDLINE_FROM_BOOTLOADER is not set
# CONFIG_CMDLINE_EXTEND is not set
CONFIG_CMDLINE_FORCE=y
CONFIG_CMDLINE_EXTEND=y
# CONFIG_CMDLINE_FORCE is not set
# CONFIG_XIP_KERNEL is not set
# CONFIG_KEXEC is not set
# CONFIG_CRASH_DUMP is not set
Expand Down
16 changes: 7 additions & 9 deletions arch/arm/configs/mapphone_spyder_defconfig → arch/arm/configs/mapphone_512MB_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
# Linux/arm 3.0.8 Kernel Configuration
# Linux/arm 3.0.31 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
Expand Down Expand Up @@ -385,6 +385,7 @@ CONFIG_ARM_GIC=y
# CONFIG_ARCH_SUPPORTS_MSI is not set
# CONFIG_PCCARD is not set
# CONFIG_ARM_ERRATA_764369 is not set
# CONFIG_PL310_ERRATA_769419 is not set

#
# Kernel Features
Expand Down Expand Up @@ -448,10 +449,10 @@ CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
CONFIG_USE_OF=y
CONFIG_ZBOOT_ROM_TEXT=0
CONFIG_ZBOOT_ROM_BSS=0
CONFIG_CMDLINE="root=/dev/ram0 rw mem=1023M@0x80000000 console=null vram=10300K omapfb.vram=0:8256K,1:4K,2:2040K init=/init ip=off mmcparts=mmcblk1:p7(pds),p8(utags),p14(boot),p15(recovery),p16(cdrom),p17(misc),p18(cid),p19(kpanic),p20(system),p21(cache),p22(preinstall),p23(webtop),p24(userdata),p25(emstorage) mot_sst=1 androidboot.bootloader=0x0A74"
CONFIG_CMDLINE="root=/dev/ram0 rw mem=512M@0x80000000 console=null vram=10300K omapfb.vram=0:8256K,1:4K,2:2040K init=/init ip=off mot_sst=1 androidboot.bootloader=0x0A74"
# CONFIG_CMDLINE_FROM_BOOTLOADER is not set
# CONFIG_CMDLINE_EXTEND is not set
CONFIG_CMDLINE_FORCE=y
CONFIG_CMDLINE_EXTEND=y
# CONFIG_CMDLINE_FORCE is not set
# CONFIG_XIP_KERNEL is not set
# CONFIG_KEXEC is not set
# CONFIG_CRASH_DUMP is not set
Expand Down Expand Up @@ -2793,6 +2794,7 @@ CONFIG_PROC_FS=y
CONFIG_PROC_SYSCTL=y
CONFIG_PROC_PAGE_MONITOR=y
CONFIG_PROC_SOCINFO=y
# CONFIG_EXPOSE_VIRTUAL_PID is not set
CONFIG_SYSFS=y
CONFIG_TMPFS=y
CONFIG_TMPFS_POSIX_ACL=y
Expand Down Expand Up @@ -3020,11 +3022,7 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
# CONFIG_SECURITY_DMESG_RESTRICT is not set
# CONFIG_SECURITY is not set
# CONFIG_SECURITYFS is not set
CONFIG_TF_ZEBRA=y
CONFIG_SECURITY_MIDDLEWARE_COMPONENT=y
# CONFIG_SMC_KERNEL_CRYPTO is not set
CONFIG_SECURE_TRACE=y
# CONFIG_TF_DRIVER_DEBUG_SUPPORT is not set
# CONFIG_SECURITY_MIDDLEWARE_COMPONENT is not set
CONFIG_DEFAULT_SECURITY_DAC=y
CONFIG_DEFAULT_SECURITY=""
CONFIG_CRYPTO=y
Expand Down
8 changes: 4 additions & 4 deletions ...nfigs/mapphone_maserati_phablet_defconfig → .../configs/mapphone_512MB_phablet_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,10 +453,10 @@ CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
CONFIG_USE_OF=y
CONFIG_ZBOOT_ROM_TEXT=0
CONFIG_ZBOOT_ROM_BSS=0
CONFIG_CMDLINE="root=/dev/ram0 rw mem=1023M@0x80000000 console=null vram=10300K omapfb.vram=0:8256K,1:4K,2:2040K init=/init ip=off mmcparts=mmcblk1:p7(pds),p8(utags),p14(boot),p15(recovery),p16(cdrom),p17(misc),p18(cid),p19(kpanic),p20(system),p21(cache),p22(preinstall),p23(webtop),p24(userdata),p25(emstorage) mot_sst=1 androidboot.bootloader=0x0A74"
# CONFIG_CMDLINE_FROM_BOOTLOADER is not set
# CONFIG_CMDLINE_EXTEND is not set
CONFIG_CMDLINE_FORCE=y
CONFIG_CMDLINE="root=/dev/ram0 rw mem=512M@0x80000000 console=null vram=10300K omapfb.vram=0:8256K,1:4K,2:2040K init=/init ip=off mot_sst=1 androidboot.bootloader=0x0A74"
CONFIG_CMDLINE_FROM_BOOTLOADER=y
CONFIG_CMDLINE_EXTEND=y
# CONFIG_CMDLINE_FORCE is not set
# CONFIG_XIP_KERNEL is not set
# CONFIG_KEXEC is not set
# CONFIG_CRASH_DUMP is not set
Expand Down
7 changes: 5 additions & 2 deletions arch/arm/configs/mapphone_targa_defconfig → arch/arm/configs/mapphone_edison_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
CONFIG_USE_OF=y
CONFIG_ZBOOT_ROM_TEXT=0
CONFIG_ZBOOT_ROM_BSS=0
CONFIG_CMDLINE="root=/dev/ram0 rw mem=1023M@0x80000000 console=null vram=10300K omapfb.vram=0:8256K,1:4K,2:2040K init=/init ip=off mmcparts=mmcblk1:p7(pds),p15(boot),p16(recovery),p17(cdrom),p18(misc),p19(cid),p20(kpanic),p21(system),p22(cache),p23(preinstall),p24(webtop),p25(userdata),p26(emstorage) mot_sst=1 androidboot.bootloader=0x0A72"
CONFIG_CMDLINE="root=/dev/ram0 rw mem=1023M@0x80000000 console=null vram=10300K omapfb.vram=0:8256K,1:4K,2:2040K init=/init ip=off mmcparts=mmcblk1:p7(pds),p15(boot),p16(recovery),p17(cdrom),p18(misc),p19(cid),p20(kpanic),p21(system),p22(cache),p23(preinstall),p24(webtop),p25(userdata),p26(emstorage) mot_sst=1 androidboot.bootloader=0x0A74"
# CONFIG_CMDLINE_FROM_BOOTLOADER is not set
# CONFIG_CMDLINE_EXTEND is not set
CONFIG_CMDLINE_FORCE=y
Expand Down Expand Up @@ -1042,7 +1042,7 @@ CONFIG_APANIC_PLABEL="kpanic"
# CONFIG_OMAP_DIE_TEMP_SENSOR is not set
CONFIG_SND_EXTERNAL_AMP=y
CONFIG_SND_LM48901_AMP=y
# CONFIG_MOTSOC1 is not set
CONFIG_MOTSOC1=y
CONFIG_OMAP_DEV_TYPE_DRV=y
CONFIG_PN544=y
CONFIG_VIB_PWM_SWEEP=y
Expand Down Expand Up @@ -1082,6 +1082,8 @@ CONFIG_RADIO_CTRL_CLASS=y
CONFIG_MDM6600_CTRL=y
CONFIG_MDM9600_CTRL=y
CONFIG_WRIGLEY_CTRL=y
CONFIG_PNX6718_CTRL=y
CONFIG_G4852_CTRL=y

#
# Motorola TS 27.010 Mux driver
Expand Down Expand Up @@ -1255,6 +1257,7 @@ CONFIG_USB_NET_ZAURUS=y
# CONFIG_USB_VL600 is not set
CONFIG_USB_NET_GOBI=y
# CONFIG_WAN is not set
CONFIG_USB_SERIAL_PNX6718=y

#
# CAIF transport drivers
Expand Down
Loading