Merge branch 'master' of git://git.denx.de/u-boot-mmc
* 'master' of git://git.denx.de/u-boot-mmc:
Revert "mmc: retry the cmd8 to meet 74 clocks requirement in the spec"
mmc: mv_sdhci: Fix host version read for Armada100
diff --git a/board/matrix_vision/mvblx/Makefile b/board/matrix_vision/mvblx/Makefile
index 01cb517..f519a5d 100644
--- a/board/matrix_vision/mvblx/Makefile
+++ b/board/matrix_vision/mvblx/Makefile
@@ -37,12 +37,6 @@
$(LIB): $(obj).depend $(OBJS)
$(call cmd_link_o_target, $(OBJS))
-clean:
- rm -f $(OBJS)
-
-distclean: clean
- rm -f $(LIB) core *.bak $(obj).depend
-
#########################################################################
# defines $(obj).depend target
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 7409a36..5995354 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -179,7 +179,7 @@
while (arg <= argc) {
idx = 0;
- while (idx = hstrstr_r(argv[arg], idx, &match, &env_htab)) {
+ while ((idx = hstrstr_r(argv[arg], idx, &match, &env_htab))) {
if (!(matched[idx / 8] & (1 << (idx & 7)))) {
puts(match->key);
puts("=");
diff --git a/drivers/bios_emulator/x86emu/ops2.c b/drivers/bios_emulator/x86emu/ops2.c
index 937bf4c..59dbb42 100644
--- a/drivers/bios_emulator/x86emu/ops2.c
+++ b/drivers/bios_emulator/x86emu/ops2.c
@@ -42,6 +42,7 @@
****************************************************************************/
#include <common.h>
+#include <linux/compiler.h>
#include "x86emu/x86emui.h"
/*----------------------------- Implementation ----------------------------*/
@@ -168,7 +169,7 @@
int mod, rl, rh;
uint destoffset;
u8 *destreg;
- char *name = 0;
+ __maybe_unused char *name = 0;
int cond = 0;
START_OF_INSTR();
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 6b3fd76..03a6f5a 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -41,10 +41,14 @@
#elif XILINX_UART16550_BASEADDR
# define CONFIG_SYS_NS16550 1
# define CONFIG_SYS_NS16550_SERIAL
-# define CONFIG_SYS_NS16550_REG_SIZE -4
+# if defined(__MICROBLAZEEL__)
+# define CONFIG_SYS_NS16550_REG_SIZE -4
+# else
+# define CONFIG_SYS_NS16550_REG_SIZE 4
+# endif
# define CONFIG_CONS_INDEX 1
# define CONFIG_SYS_NS16550_COM1 \
- (XILINX_UART16550_BASEADDR + 0x1000)
+ ((XILINX_UART16550_BASEADDR & ~0xF) + 0x1000)
# define CONFIG_SYS_NS16550_CLK XILINX_UART16550_CLOCK_HZ
# define CONFIG_BAUDRATE 115200
diff --git a/tools/.gitignore b/tools/.gitignore
index 98a5c78..e4d2c2f 100644
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -2,6 +2,7 @@
/envcrc
/gen_eth_addr
/img2srec
+/mkenvimage
/mkimage
/mpc86x_clk
/mxsboot