mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
ARM: mach-shmobile: kzm9d: update defconfig
* Do not disable SUSPEND Suspend seems to work fine on the kzm9d. This is part of an effort reduce differences between mach-shmobile defconfigs with a view to using a common defconfig. * Enable PM_RUNTIME This also seems to work fine on the kzm9d. This is part of an effort reduce differences between mach-shmobile defconfigs with a view to using a common defconfig. * Move kernel command line from defconfig to dts. This brings us one small step closer to sharing defconfig between kzm9d and other boards. Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
parent
f90755d07d
commit
8098df15c2
2 changed files with 2 additions and 4 deletions
|
@ -21,6 +21,6 @@ memory {
|
||||||
};
|
};
|
||||||
|
|
||||||
chosen {
|
chosen {
|
||||||
bootargs = "console=ttyS1,115200n81";
|
bootargs = "console=tty0 console=ttyS1,115200n81 earlyprintk=serial8250-em.1,115200n81 mem=128M@0x40000000 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -32,11 +32,9 @@ CONFIG_FORCE_MAX_ZONEORDER=13
|
||||||
CONFIG_ZBOOT_ROM_TEXT=0x0
|
CONFIG_ZBOOT_ROM_TEXT=0x0
|
||||||
CONFIG_ZBOOT_ROM_BSS=0x0
|
CONFIG_ZBOOT_ROM_BSS=0x0
|
||||||
CONFIG_ARM_APPENDED_DTB=y
|
CONFIG_ARM_APPENDED_DTB=y
|
||||||
CONFIG_CMDLINE="console=tty0 console=ttyS1,115200n81 earlyprintk=serial8250-em.1,115200n81 mem=128M@0x40000000 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096"
|
|
||||||
CONFIG_CMDLINE_FORCE=y
|
|
||||||
CONFIG_VFP=y
|
CONFIG_VFP=y
|
||||||
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
|
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
|
||||||
# CONFIG_SUSPEND is not set
|
CONFIG_PM_RUNTIME=y
|
||||||
CONFIG_NET=y
|
CONFIG_NET=y
|
||||||
CONFIG_PACKET=y
|
CONFIG_PACKET=y
|
||||||
CONFIG_UNIX=y
|
CONFIG_UNIX=y
|
||||||
|
|
Loading…
Reference in a new issue