diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-microblaze/bitops.h | 2 | ||||
| -rw-r--r-- | include/configs/MVBLUE.h | 1 | ||||
| -rw-r--r-- | include/configs/imx27lite.h | 1 | ||||
| -rw-r--r-- | include/configs/microblaze-generic.h | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-microblaze/bitops.h b/include/asm-microblaze/bitops.h index 5d814f0eb..e8c835f7c 100644 --- a/include/asm-microblaze/bitops.h +++ b/include/asm-microblaze/bitops.h @@ -266,8 +266,6 @@ found_middle: return result + ffz(tmp); } -#define ffs(x) generic_ffs(x) - /* * hweightN: returns the hamming weight (i.e. the number * of bits set) of a N-bit word diff --git a/include/configs/MVBLUE.h b/include/configs/MVBLUE.h index 79c20696f..669816cba 100644 --- a/include/configs/MVBLUE.h +++ b/include/configs/MVBLUE.h @@ -88,7 +88,6 @@ #define CONFIG_CMD_SAVEENV #define CONFIG_CMD_FLASH #define CONFIG_CMD_IMI -#define CONFIG_CMD_IRQ #define CONFIG_CMD_NET #define CONFIG_CMD_PCI #define CONFIG_CMD_RUN diff --git a/include/configs/imx27lite.h b/include/configs/imx27lite.h index e219cccc9..ee749ecd2 100644 --- a/include/configs/imx27lite.h +++ b/include/configs/imx27lite.h @@ -145,6 +145,7 @@ /* * MTD */ +#define CONFIG_FLASH_CFI_MTD #define CONFIG_MTD_DEVICE /* diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index b486c7753..9b1569a6d 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -146,7 +146,7 @@ #define CONFIG_SYS_MALLOC_BASE (CONFIG_SYS_MONITOR_BASE - CONFIG_SYS_MALLOC_LEN) /* stack */ -#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_MONITOR_BASE +#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_MALLOC_BASE /*#define RAMENV */ #define FLASH |