Merge branch 'master' of git://git.denx.de/u-boot

[u-boot] / arch / arm / cpu / armv7 / rmobile / Kconfig

diff --git a/arch/arm/cpu/armv7/rmobile/Kconfig b/arch/arm/cpu/armv7/rmobile/Kconfig
index 57dcceccc7cea3390a898e4b2298bb4fd882340c..85c06eb45f3f203f5213614317f095b05ae13754 100644 (file)
--- a/arch/arm/cpu/armv7/rmobile/Kconfig
+++ b/arch/arm/cpu/armv7/rmobile/Kconfig
@@ -2,6 +2,7 @@ if RMOBILE
 
 choice
        prompt "Renesus ARM SoCs board select"
+       optional
 
 config TARGET_ARMADILLO_800EVA
        bool "armadillo 800 eva board"
@@ -39,6 +40,11 @@ config TARGET_PORTER
        select DM
        select DM_SERIAL
 
+config TARGET_STOUT
+       bool "Stout board"
+       select DM
+       select DM_SERIAL
+
 endchoice
 
 config SYS_SOC
@@ -46,9 +52,31 @@ config SYS_SOC
 
 config RMOBILE_EXTRAM_BOOT
        bool "Enable boot from RAM"
-       depends on TARGET_ALT || TARGET_KOELSCH || TARGET_LAGER || TARGET_PORTER || TARGET_SILK
+       depends on TARGET_ALT || TARGET_KOELSCH || TARGET_LAGER || TARGET_PORTER || TARGET_SILK || TARGET_STOUT
        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"
@@ -57,5 +85,6 @@ source "board/kmc/kzm9g/Kconfig"
 source "board/renesas/alt/Kconfig"
 source "board/renesas/silk/Kconfig"
 source "board/renesas/porter/Kconfig"
+source "board/renesas/stout/Kconfig"
 
 endif