diff options
| author | Tom Rini <[email protected]> | 2019-01-25 10:41:24 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-01-25 10:41:24 -0500 |
| commit | 87f78478a4a1bf574db0b0e575ca37cf91fb187c (patch) | |
| tree | ffd24bbe72072067cda47dbc7ea1abe80b1e01ac /arch | |
| parent | d01806a8fcbdaedcc67cead56ece572021d97ab7 (diff) | |
| parent | fae3798ac9f6de5a4cb1aa1e849d419a2bb8dbbe (diff) | |
Merge tag 'arc-fixes-for-2019.04-rc1' of git://git.denx.de/u-boot-arc
A couple of trivial fixes and improvements for ARC
Most notable are:
* Move of ENV_SIZE/ENV_OFFSET to Kconfig
* Fix with private structure allocation for arc_uart
* Definition of CONFIG_SYS_CACHELINE_SIZE useful for building drivers
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arc/include/asm/cache.h | 3 | ||||
| -rw-r--r-- | arch/arc/lib/cpu.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/arc/include/asm/cache.h b/arch/arc/include/asm/cache.h index 1604cd0b3e7..0fdcf2d2dd5 100644 --- a/arch/arc/include/asm/cache.h +++ b/arch/arc/include/asm/cache.h @@ -16,6 +16,9 @@ */ #define ARCH_DMA_MINALIGN 128 +/* CONFIG_SYS_CACHELINE_SIZE is used a lot in drivers */ +#define CONFIG_SYS_CACHELINE_SIZE ARCH_DMA_MINALIGN + #if defined(ARC_MMU_ABSENT) #define CONFIG_ARC_MMU_VER 0 #elif defined(CONFIG_ARC_MMU_V2) diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c index 07daaa8d155..01cca95d5b1 100644 --- a/arch/arc/lib/cpu.c +++ b/arch/arc/lib/cpu.c @@ -87,7 +87,7 @@ const char *arc_em_version(int arcver, char *name, int name_len) bool xymem = ARC_FEATURE_EXISTS(ARC_AUX_XY_BUILD); int i; - for (i = 0; i++ < sizeof(em_versions) / sizeof(struct em_template_t);) { + for (i = 0; i < sizeof(em_versions) / sizeof(struct em_template_t); i++) { if (em_versions[i].cache == cache && em_versions[i].dsp == dsp && em_versions[i].xymem == xymem) { @@ -147,7 +147,7 @@ const char *arc_hs_version(int arcver, char *name, int name_len) bool dual_issue = arcver == 0x54 ? true : false; int i; - for (i = 0; i++ < sizeof(hs_versions) / sizeof(struct hs_template_t);) { + for (i = 0; i < sizeof(hs_versions) / sizeof(struct hs_template_t); i++) { if (hs_versions[i].cache == cache && hs_versions[i].mmu == mmu && hs_versions[i].dual_issue == dual_issue && |