Merge branch 'late/fixes' into fixes
* late/fixes: ARM: OMAP2+: Fix unmet direct dependencies for SERIAL_OMAP ARM: ux500: always select ABX500_CORE ARM: SIRF: select SMP_ON_UP only on SMP builds ARM: SPEAr: conditionalize l2x0 support ARM: imx: build CPU suspend code only when needed ARM: OMAP: build SMP code only for OMAP4/5 ARM: tegra: Tegra114 needs CPU_FREQ_TABLE ARM: default machine descriptor for multiplatform Signed-off-by: Olof Johansson <olof@lixom.net>hifive-unleashed-5.1
Olof Johansson
commit
5497e7b896
|
|
@ -897,7 +897,6 @@ config ARCH_MULTI_V7
|
|||
bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"
|
||||
default y
|
||||
select ARCH_MULTI_V6_V7
|
||||
select ARCH_VEXPRESS
|
||||
select CPU_V7
|
||||
|
||||
config ARCH_MULTI_V6_V7
|
||||
|
|
|
|||
|
|
@ -137,6 +137,8 @@ CONFIG_SERIAL_8250_DETECT_IRQ=y
|
|||
CONFIG_SERIAL_8250_RSA=y
|
||||
CONFIG_SERIAL_AMBA_PL011=y
|
||||
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
|
||||
CONFIG_SERIAL_OMAP=y
|
||||
CONFIG_SERIAL_OMAP_CONSOLE=y
|
||||
CONFIG_HW_RANDOM=y
|
||||
CONFIG_I2C_CHARDEV=y
|
||||
CONFIG_SPI=y
|
||||
|
|
|
|||
|
|
@ -180,6 +180,13 @@ struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
|
|||
unsigned long dt_root;
|
||||
const char *model;
|
||||
|
||||
#ifdef CONFIG_ARCH_MULTIPLATFORM
|
||||
DT_MACHINE_START(GENERIC_DT, "Generic DT based system")
|
||||
MACHINE_END
|
||||
|
||||
mdesc_best = (struct machine_desc *)&__mach_desc_GENERIC_DT;
|
||||
#endif
|
||||
|
||||
if (!dt_phys)
|
||||
return NULL;
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
#include <linux/bootmem.h>
|
||||
#include <linux/seq_file.h>
|
||||
#include <linux/screen_info.h>
|
||||
#include <linux/of_platform.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/kexec.h>
|
||||
#include <linux/of_fdt.h>
|
||||
|
|
@ -659,9 +660,19 @@ struct screen_info screen_info = {
|
|||
|
||||
static int __init customize_machine(void)
|
||||
{
|
||||
/* customizes platform devices, or adds new ones */
|
||||
/*
|
||||
* customizes platform devices, or adds new ones
|
||||
* On DT based machines, we fall back to populating the
|
||||
* machine from the device tree, if no callback is provided,
|
||||
* otherwise we would always need an init_machine callback.
|
||||
*/
|
||||
if (machine_desc->init_machine)
|
||||
machine_desc->init_machine();
|
||||
#ifdef CONFIG_OF
|
||||
else
|
||||
of_platform_populate(NULL, of_default_bus_match_table,
|
||||
NULL, NULL);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
arch_initcall(customize_machine);
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ ENTRY(v7_secondary_startup)
|
|||
ENDPROC(v7_secondary_startup)
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
#ifdef CONFIG_ARM_CPU_SUSPEND
|
||||
/*
|
||||
* The following code must assume it is running from physical address
|
||||
* where absolute virtual addresses to the data section have to be
|
||||
|
|
|
|||
|
|
@ -37,8 +37,6 @@ config ARCH_OMAP2PLUS_TYPICAL
|
|||
select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5
|
||||
select PM_RUNTIME
|
||||
select REGULATOR
|
||||
select SERIAL_OMAP
|
||||
select SERIAL_OMAP_CONSOLE
|
||||
select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
|
||||
select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4
|
||||
select VFP
|
||||
|
|
|
|||
|
|
@ -32,12 +32,12 @@ obj-$(CONFIG_SOC_HAS_OMAP2_SDRC) += sdrc.o
|
|||
|
||||
# SMP support ONLY available for OMAP4
|
||||
|
||||
obj-$(CONFIG_SMP) += omap-smp.o omap-headsmp.o
|
||||
obj-$(CONFIG_HOTPLUG_CPU) += omap-hotplug.o
|
||||
smp-$(CONFIG_SMP) += omap-smp.o omap-headsmp.o
|
||||
smp-$(CONFIG_HOTPLUG_CPU) += omap-hotplug.o
|
||||
omap-4-5-common = omap4-common.o omap-wakeupgen.o \
|
||||
sleep44xx.o
|
||||
obj-$(CONFIG_ARCH_OMAP4) += $(omap-4-5-common)
|
||||
obj-$(CONFIG_SOC_OMAP5) += $(omap-4-5-common)
|
||||
obj-$(CONFIG_ARCH_OMAP4) += $(omap-4-5-common) $(smp-y)
|
||||
obj-$(CONFIG_SOC_OMAP5) += $(omap-4-5-common) $(smp-y)
|
||||
|
||||
plus_sec := $(call as-instr,.arch_extension sec,+sec)
|
||||
AFLAGS_omap-headsmp.o :=-Wa,-march=armv7-a$(plus_sec)
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ config ARCH_MARCO
|
|||
select CPU_V7
|
||||
select HAVE_ARM_SCU if SMP
|
||||
select HAVE_SMP
|
||||
select SMP_ON_UP
|
||||
select SMP_ON_UP if SMP
|
||||
help
|
||||
Support for CSR SiRFSoC ARM Cortex A9 Platform
|
||||
|
||||
|
|
|
|||
|
|
@ -35,6 +35,8 @@ void __init spear13xx_l2x0_init(void)
|
|||
* write alloc and 'Full line of zero' options
|
||||
*
|
||||
*/
|
||||
if (!IS_ENABLED(CONFIG_CACHE_L2X0))
|
||||
return;
|
||||
|
||||
writel_relaxed(0x06, VA_L2CC_BASE + L2X0_PREFETCH_CTRL);
|
||||
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@ config ARCH_TEGRA_114_SOC
|
|||
select ARM_ARCH_TIMER
|
||||
select ARM_GIC
|
||||
select ARM_L1_CACHE_SHIFT_6
|
||||
select CPU_FREQ_TABLE if CPU_FREQ
|
||||
select CPU_V7
|
||||
select PINCTRL
|
||||
select PINCTRL_TEGRA114
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@ if ARCH_U8500
|
|||
config UX500_SOC_COMMON
|
||||
bool
|
||||
default y
|
||||
select ABX500_CORE
|
||||
select AB8500_CORE
|
||||
select ARM_ERRATA_754322
|
||||
select ARM_ERRATA_764369 if SMP
|
||||
select ARM_GIC
|
||||
|
|
|
|||
Loading…
Reference in New Issue