Merge branch 'sh/stable-updates'

3 files changed, 7 insertions, 1 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index a6a70233033d..0031a6979f3a 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -124,6 +124,9 @@ config SYS_SUPPORTS_APM_EMULATION
         bool
         select ARCH_SUSPEND_POSSIBLE
 
+config SYS_SUPPORTS_HUGETLBFS
+        bool
+
 config SYS_SUPPORTS_SMP
         bool
 
@@ -204,6 +207,7 @@ config CPU_SH4
         select CPU_HAS_SR_RB
         select CPU_HAS_FPU if !CPU_SH4AL_DSP
         select SYS_SUPPORTS_TMU
+        select SYS_SUPPORTS_HUGETLBFS if MMU
 
 config CPU_SH4A
         bool
@@ -218,6 +222,7 @@ config CPU_SH5
         bool
         select CPU_HAS_FPU
         select SYS_SUPPORTS_TMU
+        select SYS_SUPPORTS_HUGETLBFS if MMU
 
 config CPU_SHX2
         bool
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 9ab99fe7be55..66e40aabc600 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -225,6 +225,7 @@ define archhelp
         @echo '  vmlinux.srec              - Create an ELF S-record'
         @echo '* uImage                    - Alias to bootable U-Boot image'
         @echo '  uImage.srec               - Create an S-record for U-Boot'
+        @echo '  uImage.bin                - Kernel-only image for U-Boot (bin)'
         @echo '* uImage.gz                 - Kernel-only image for U-Boot (gzip)'
         @echo '  uImage.bz2                - Kernel-only image for U-Boot (bzip2)'
         @echo '  uImage.lzma               - Kernel-only image for U-Boot (lzma)'
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index ca02b72bf46f..a5e0867d8ae9 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -225,7 +225,7 @@ endchoice
 
 choice
         prompt "HugeTLB page size"
-        depends on HUGETLB_PAGE && (CPU_SH4 || CPU_SH5) && MMU
+        depends on HUGETLB_PAGE
         default HUGETLB_PAGE_SIZE_1MB if PAGE_SIZE_64KB
         default HUGETLB_PAGE_SIZE_64K