diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2017-07-31 20:21:02 +0200 |
|---|---|---|
| committer | Lucas Stach <l.stach@pengutronix.de> | 2017-07-31 20:21:02 +0200 |
| commit | 361c36d997789ac1f42d14ccd6f45449c8604958 (patch) | |
| tree | 430d3161b9cf4a86fee7fe3eea70eba1d2453d25 /arch | |
| parent | 8b8d55e3c2a1f8b3b6323f59f90da6b51196402c (diff) | |
| parent | 78c40c6e9e9bc23c46c9b5eda3bc8825cdf5e91a (diff) | |
| download | barebox-361c36d997789ac1f42d14ccd6f45449c8604958.tar.gz barebox-361c36d997789ac1f42d14ccd6f45449c8604958.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-at91/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 2 | ||||
| -rw-r--r-- | arch/mips/include/asm/cpu.h | 2 | ||||
| -rw-r--r-- | arch/mips/lib/cpu-probe.c | 4 |
4 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 9db53b2261..3b572ebdfe 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -256,6 +256,7 @@ choice config MACH_ANIMEO_IP bool "Somfy Animeo IP" + depends on !CONSOLE_NONE config MACH_AT91SAM9260EK bool "Atmel AT91SAM9260-EK" diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index f0d29ad3c0..9ee7042e92 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -222,6 +222,7 @@ config MACH_KINDLE_MX50 select I2C_IMX select MFD_MC13XXX select ARM_BOARD_APPEND_ATAG + select ARM_LINUX help Say Y here if you are using the fourth or fifth generation Amazon Kindle Model No. D01100 (Kindle Wi-Fi), D01200 (Kindle Touch) or @@ -750,6 +751,7 @@ config HABV4 select HAB select IMX_OCOTP depends on ARCH_IMX6 + depends on OFDEVICE help High Assurance Boot, as found on i.MX28/i.MX6. diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h index 572cabba34..e0bb78ea61 100644 --- a/arch/mips/include/asm/cpu.h +++ b/arch/mips/include/asm/cpu.h @@ -51,6 +51,7 @@ #define PRID_IMP_24K 0x9300 #define PRID_IMP_24KE 0x9600 +#define PRID_IMP_74K 0x9700 /* * These are the PRID's for when 23:16 == PRID_COMP_BROADCOM @@ -105,6 +106,7 @@ enum cpu_type_enum { * MIPS32 class processors */ CPU_24K, + CPU_74K, CPU_BMIPS3300, CPU_JZRISC, CPU_LOONGSON1, diff --git a/arch/mips/lib/cpu-probe.c b/arch/mips/lib/cpu-probe.c index 71dbaf6382..b5d63db189 100644 --- a/arch/mips/lib/cpu-probe.c +++ b/arch/mips/lib/cpu-probe.c @@ -106,6 +106,10 @@ static inline void cpu_probe_mips(struct cpuinfo_mips *c) c->cputype = CPU_24K; __cpu_name = "MIPS 24Kc"; break; + case PRID_IMP_74K: + c->cputype = CPU_74K; + __cpu_name = "MIPS 74Kc"; + break; } } |