diff options
| author | Tom Rini <trini@konsulko.com> | 2018-02-23 13:05:03 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-02-23 13:05:03 -0500 |
| commit | 0c0eaee562291f5bbca38c5bab3b1cd75b617fc0 (patch) | |
| tree | e32039459a0a2677ceeda4da86c4f668f9f7fc48 | |
| parent | 1c124d379dbb78a93495202749efe952fbddba1c (diff) | |
| parent | 0b75cc3f1303a5558115918b4aed760d0d68a797 (diff) | |
Merge git://git.denx.de/u-boot-sh
| -rw-r--r-- | arch/sh/cpu/sh2/config.mk | 2 | ||||
| -rw-r--r-- | arch/sh/include/asm/string.h | 33 | ||||
| -rw-r--r-- | drivers/mmc/uniphier-sd.c | 5 |
3 files changed, 8 insertions, 32 deletions
diff --git a/arch/sh/cpu/sh2/config.mk b/arch/sh/cpu/sh2/config.mk index 12e202d539..a063e8361c 100644 --- a/arch/sh/cpu/sh2/config.mk +++ b/arch/sh/cpu/sh2/config.mk @@ -8,7 +8,7 @@ ENDIANNESS += -EB ifdef CONFIG_CPU_SH2A -PLATFORM_CPPFLAGS += -m2a -m2a-nofpu -mb +PLATFORM_CPPFLAGS += -m2a-nofpu -mb else # SH2 PLATFORM_CPPFLAGS += -m3e -mb endif diff --git a/arch/sh/include/asm/string.h b/arch/sh/include/asm/string.h index 27d981b79a..999febcb6b 100644 --- a/arch/sh/include/asm/string.h +++ b/arch/sh/include/asm/string.h @@ -81,37 +81,8 @@ static inline int strcmp(const char *__cs, const char *__ct) return __res; } -#define __HAVE_ARCH_STRNCMP -static inline int strncmp(const char *__cs, const char *__ct, size_t __n) -{ - register int __res; - unsigned long __dummy; - - if (__n == 0) - return 0; - - __asm__ __volatile__( - "mov.b @%1+, %3\n" - "1:\n\t" - "mov.b @%0+, %2\n\t" - "cmp/eq %6, %0\n\t" - "bt/s 2f\n\t" - " cmp/eq #0, %3\n\t" - "bt/s 3f\n\t" - " cmp/eq %3, %2\n\t" - "bt/s 1b\n\t" - " mov.b @%1+, %3\n\t" - "add #-2, %1\n\t" - "mov.b @%1, %3\n" - "2:\n\t" - "sub %3, %2\n" - "3:" - :"=r" (__cs), "=r" (__ct), "=&r" (__res), "=&z" (__dummy) - : "0" (__cs), "1" (__ct), "r" (__cs+__n) - : "t"); - - return __res; -} +#undef __HAVE_ARCH_STRNCMP +extern int strncmp(const char *__cs, const char *__ct, size_t __n); #undef __HAVE_ARCH_MEMSET extern void *memset(void *__s, int __c, size_t __count); diff --git a/drivers/mmc/uniphier-sd.c b/drivers/mmc/uniphier-sd.c index 741f9dfd9c..a080674c8a 100644 --- a/drivers/mmc/uniphier-sd.c +++ b/drivers/mmc/uniphier-sd.c @@ -847,6 +847,11 @@ static int uniphier_sd_probe(struct udevice *dev) } static const struct udevice_id uniphier_sd_match[] = { + { .compatible = "renesas,sdhi-r8a7790", .data = 0 }, + { .compatible = "renesas,sdhi-r8a7791", .data = 0 }, + { .compatible = "renesas,sdhi-r8a7792", .data = 0 }, + { .compatible = "renesas,sdhi-r8a7793", .data = 0 }, + { .compatible = "renesas,sdhi-r8a7794", .data = 0 }, { .compatible = "renesas,sdhi-r8a7795", .data = UNIPHIER_SD_CAP_64BIT }, { .compatible = "renesas,sdhi-r8a7796", .data = UNIPHIER_SD_CAP_64BIT }, { .compatible = "renesas,sdhi-r8a77970", .data = UNIPHIER_SD_CAP_64BIT }, |