summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-06-01 07:16:36 -0400
committerTom Rini <trini@konsulko.com>2015-06-01 07:16:36 -0400
commit656ae05273419c344c11466de72476455793d6b6 (patch)
treed5625c1f4d0ce695ab761af6d194fd9acc5e00fa /arch
parent43b1ff5f33456e85b2fccccaf2f9fe09821a45ac (diff)
parenta5aef732066c6de0d2466174fb017e8a6fb0267a (diff)
downloadtalos-obmc-uboot-656ae05273419c344c11466de72476455793d6b6.tar.gz
talos-obmc-uboot-656ae05273419c344c11466de72476455793d6b6.zip
Merge branch 'rmobile' of git://git.denx.de/u-boot-sh
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/armv7/rmobile/Kconfig22
-rw-r--r--arch/arm/include/asm/arch-rmobile/r8a7794.h4
2 files changed, 26 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/rmobile/Kconfig b/arch/arm/cpu/armv7/rmobile/Kconfig
index ae23078395..ef56286715 100644
--- a/arch/arm/cpu/armv7/rmobile/Kconfig
+++ b/arch/arm/cpu/armv7/rmobile/Kconfig
@@ -50,6 +50,28 @@ config RMOBILE_EXTRAM_BOOT
depends on TARGET_ALT || TARGET_KOELSCH || TARGET_LAGER || TARGET_PORTER || TARGET_SILK
default n
+choice
+ prompt "Qos setting primary"
+ depends on TARGET_ALT || TARGET_GOSE || TARGET_KOELSCH || TARGET_LAGER
+ default QOS_PRI_NORMAL
+
+config QOS_PRI_NORMAL
+ bool "Non primary"
+ help
+ Select normal mode for QoS setting.
+
+config QOS_PRI_MEDIA
+ bool "Media primary"
+ help
+ Select multimedia primary mode for QoS setting.
+
+config QOS_PRI_GFX
+ bool "GFX primary"
+ help
+ Select GFX(graphics) primary mode for QoS setting.
+
+endchoice
+
source "board/atmark-techno/armadillo-800eva/Kconfig"
source "board/renesas/gose/Kconfig"
source "board/renesas/koelsch/Kconfig"
diff --git a/arch/arm/include/asm/arch-rmobile/r8a7794.h b/arch/arm/include/asm/arch-rmobile/r8a7794.h
index 6d11fa479b..ea7dc4c073 100644
--- a/arch/arm/include/asm/arch-rmobile/r8a7794.h
+++ b/arch/arm/include/asm/arch-rmobile/r8a7794.h
@@ -32,4 +32,8 @@
#define CONFIG_SYS_SH_SDHI2_BASE 0xEE160000
#define CONFIG_SYS_SH_SDHI_NR_CHANNEL 3
+#define R8A7794_CUT_ES2 2
+#define IS_R8A7794_ES2() \
+ (rmobile_get_cpu_rev_integer() == R8A7794_CUT_ES2)
+
#endif /* __ASM_ARCH_R8A7794_H */
OpenPOWER on IntegriCloud