diff options
| author | Olof Johansson | 2019-11-08 10:34:10 -0800 |
|---|---|---|
| committer | Olof Johansson | 2019-11-08 10:34:11 -0800 |
| commit | 8400f492a06871a1b0e9f48eb5169bdd27244248 (patch) | |
| tree | 42ffa0f2180773c3431974efb6ab7bc941d0b0f8 /arch | |
| parent | 536c43b41d1a05c262f47b97cb302d7ade97dae4 (diff) | |
| parent | 0fc21fdf4e1023d0e5f8d42a42cdd372177699e2 (diff) | |
Merge tag 'at91-5.5-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/defconfig
AT91 defconfig for 5.5
- Unselect PIT now that the TCBs can be used at boot time
* tag 'at91-5.5-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
ARM: configs: at91: unselect PIT
Link: https://lore.kernel.org/r/20191107222445.GA202433@piout.net
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/at91_dt_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/sama5_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig index 309c55a8d107..3729a6e0ee24 100644 --- a/arch/arm/configs/at91_dt_defconfig +++ b/arch/arm/configs/at91_dt_defconfig @@ -18,6 +18,7 @@ CONFIG_ARCH_MULTI_V5=y CONFIG_ARCH_AT91=y CONFIG_SOC_AT91RM9200=y CONFIG_SOC_AT91SAM9=y +# CONFIG_ATMEL_CLOCKSOURCE_PIT is not set CONFIG_AEABI=y CONFIG_UACCESS_WITH_MEMCPY=y CONFIG_ZBOOT_ROM_TEXT=0x0 diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig index ef785340e6f8..27f6135c4ee7 100644 --- a/arch/arm/configs/sama5_defconfig +++ b/arch/arm/configs/sama5_defconfig @@ -20,6 +20,7 @@ CONFIG_ARCH_AT91=y CONFIG_SOC_SAMA5D2=y CONFIG_SOC_SAMA5D3=y CONFIG_SOC_SAMA5D4=y +# CONFIG_ATMEL_CLOCKSOURCE_PIT is not set CONFIG_AEABI=y CONFIG_UACCESS_WITH_MEMCPY=y CONFIG_ZBOOT_ROM_TEXT=0x0 |