diff options
| author | Dennis Gilmore <dennis@ausil.us> | 2012-08-10 01:10:04 -0500 |
|---|---|---|
| committer | Dennis Gilmore <dennis@ausil.us> | 2012-08-10 01:10:04 -0500 |
| commit | d76fa08bde160fd07352e7bf14da7b057cb51b11 (patch) | |
| tree | fa63d623115a1ea8a99c727adccfeb6366e0d960 | |
| parent | 1932bb13996b0484ef98054a5aeb42c422768072 (diff) | |
| download | kernel-d76fa08bde160fd07352e7bf14da7b057cb51b11.tar.gz kernel-d76fa08bde160fd07352e7bf14da7b057cb51b11.tar.xz kernel-d76fa08bde160fd07352e7bf14da7b057cb51b11.zip | |
- disable some options on highbank at calxeda's request
- enable the PL011 serial console on highbank
- enable ARM architected timer on all arm arches
| -rw-r--r-- | config-arm-generic | 2 | ||||
| -rw-r--r-- | config-arm-highbank | 19 | ||||
| -rw-r--r-- | kernel.spec | 5 |
3 files changed, 26 insertions, 0 deletions
diff --git a/config-arm-generic b/config-arm-generic index 94d299b2d..31ebd9bfe 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -17,6 +17,8 @@ CONFIG_SMP=y CONFIG_NR_CPUS=4 CONFIG_SMP_ON_UP=y +CONFIG_ARM_ARCH_TIMER=y + # CONFIG_FPE_NWFPE is not set CONFIG_FPE_FASTFPE=y diff --git a/config-arm-highbank b/config-arm-highbank index 40b5e6c04..6fe9262bd 100644 --- a/config-arm-highbank +++ b/config-arm-highbank @@ -30,9 +30,28 @@ CONFIG_GPIO_PL061=y CONFIG_SERIAL_AMBA_PL010=y CONFIG_SERIAL_AMBA_PL010_CONSOLE=y +CONFIG_SERIAL_AMBA_PL011=y +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_RTC_DRV_PL030=y CONFIG_RTC_DRV_PL031=y # CONFIG_DVB_TDA1004X is not set # CONFIG_DVB_PLL is not set + +# these were all requested to be disabled on highbank kernels by calxeda +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_WIMAX is not set +# CONFIG_RFKILL is not set +# CONFIG_CAIF is not set +# CONFIG_NFC is not set +# CONFIG_MTD is not set +# CONFIG_PARPORT is not set +# CONFIG_ATM_DRIVERS is not set +# CONFIG_WAN is not set +# CONFIG_ISDN is not set +# CONFIG_MEDIA_SUPPORT is not set +# CONFIG_DRM is not set +# CONFIG_SND is not set +# end of list of requested disabled options diff --git a/kernel.spec b/kernel.spec index 049fbfc56..bdf9735c9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2293,6 +2293,11 @@ fi # ||----w | # || || %changelog +* Fri Aug 10 2012 Dennis Gilmore <dennis@ausil.us> +- disable some options on highbank at calxeda's request +- enable the PL011 serial console on highbank +- enable ARM architected timer on all arm arches + * Thu Aug 09 2012 Josh Boyer <jwboyer@redhat.com> - 3.6.0-0.rc1.git3.2 - Update secure-boot patch to pass correct CFLAGS to EFI stub |