Merge branch 'patch-1' into 'master'

[mips*r6*]Enable MIPS_CPS for Boston

See merge request kernel-team/linux!23
This commit is contained in:
Ben Hutchings 2018-05-18 10:33:14 +00:00
commit 1c53205545
2 changed files with 2 additions and 1 deletions

2
debian/changelog vendored
View File

@ -34,7 +34,7 @@ linux (4.17~rc5-1~exp1) UNRELEASED; urgency=medium
[ YunQiang Su ]
* [mips{,64}el/loongson-3] enable NUMA, CPU_PM, CPU_IDLE, RS780_HPET,
REGULATOR. (Closes: #898521).
* [mips{,64}r6{,el}] use boston as the target.
* [mips{,64}r6{,el}] use boston as the target, and enable MIPS_CPS.
Add a patch to disable uImage generation to avoid depend on u-boot-tools.
Fix typo the EL's flavor names in installer: not same within defines
Malta is never used for r6. (Closes: #898523)

View File

@ -4,6 +4,7 @@
## choice: System type
CONFIG_MIPS_GENERIC=y
CONFIG_RELOCATION_TABLE_SIZE=0x00121000
CONFIG_MIPS_CPS=y
## end choice
##
## Common Clock Framework