diff options
| author | Tom Rini <trini@konsulko.com> | 2019-02-07 14:48:56 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-02-07 14:48:56 -0500 |
| commit | 50e24381c097579ff2a8b171838347c82c2fba04 (patch) | |
| tree | 211a78888bf1fa02244bb7dcd5963eaa050b9199 /arch | |
| parent | 4dfe43849a4c76ac5fc2486d20e37d459f980a00 (diff) | |
| parent | 4d40e009c06742df9582f8b54f37f6cea0680ba1 (diff) | |
| download | u-boot-50e24381c097579ff2a8b171838347c82c2fba04.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
- SPI-NOR support
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/am33xx/Kconfig | 1 | ||||
| -rw-r--r-- | arch/sh/include/asm/bitops.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig index 4d47d09637..85ea8946b0 100644 --- a/arch/arm/mach-omap2/am33xx/Kconfig +++ b/arch/arm/mach-omap2/am33xx/Kconfig @@ -230,7 +230,6 @@ config TARGET_AM43XX_EVM imply DM_I2C imply DM_SPI imply DM_SPI_FLASH - imply SPI_FLASH_BAR imply SPL_ENV_SUPPORT imply SPL_FS_EXT4 imply SPL_FS_FAT diff --git a/arch/sh/include/asm/bitops.h b/arch/sh/include/asm/bitops.h index 8cb8385d76..765f28f116 100644 --- a/arch/sh/include/asm/bitops.h +++ b/arch/sh/include/asm/bitops.h @@ -153,6 +153,10 @@ static inline int ffs (int x) } #define PLATFORM_FFS +#define hweight32(x) generic_hweight32(x) +#define hweight16(x) generic_hweight16(x) +#define hweight8(x) generic_hweight8(x) + #endif /* __KERNEL__ */ #endif /* __ASM_SH_BITOPS_H */ |