Merge branch 'master' of /home/wd/git/u-boot/custodians
diff --git a/Makefile b/Makefile
index 845b564..ac3f98f 100644
--- a/Makefile
+++ b/Makefile
@@ -2913,43 +2913,46 @@
## sh3 (Renesas SuperH)
#########################################################################
mpr2_config: unconfig
- @ >include/config.h
- @echo "#define CONFIG_MPR2 1" >> include/config.h
+ @mkdir -p $(obj)include
+ @echo "#define CONFIG_MPR2 1" > $(obj)include/config.h
@$(MKCONFIG) -a $(@:_config=) sh sh3 mpr2
ms7720se_config: unconfig
- @echo "#define CONFIG_MS7720SE 1" > include/config.h
+ @mkdir -p $(obj)include
+ @echo "#define CONFIG_MS7720SE 1" > $(obj)include/config.h
@$(MKCONFIG) -a $(@:_config=) sh sh3 ms7720se
#########################################################################
## sh4 (Renesas SuperH)
#########################################################################
ms7750se_config: unconfig
+ @mkdir -p $(obj)include
@echo "#define CONFIG_MS7750SE 1" > $(obj)include/config.h
@$(MKCONFIG) -a $(@:_config=) sh sh4 ms7750se
ms7722se_config : unconfig
+ @mkdir -p $(obj)include
@echo "#define CONFIG_MS7722SE 1" > $(obj)include/config.h
@$(MKCONFIG) -a $(@:_config=) sh sh4 ms7722se
MigoR_config : unconfig
- @ >include/config.h
- @echo "#define CONFIG_MIGO_R 1" >> include/config.h
+ @mkdir -p $(obj)include
+ @echo "#define CONFIG_MIGO_R 1" > $(obj)include/config.h
@./mkconfig -a $(@:_config=) sh sh4 MigoR
r7780mp_config: unconfig
- @ >include/config.h
- @echo "#define CONFIG_R7780MP 1" >> include/config.h
+ @mkdir -p $(obj)include
+ @echo "#define CONFIG_R7780MP 1" > $(obj)include/config.h
@./mkconfig -a $(@:_config=) sh sh4 r7780mp
r2dplus_config : unconfig
- @ >include/config.h
- @echo "#define CONFIG_R2DPLUS 1" >> include/config.h
+ @mkdir -p $(obj)include
+ @echo "#define CONFIG_R2DPLUS 1" > $(obj)include/config.h
@./mkconfig -a $(@:_config=) sh sh4 r2dplus
sh7763rdp_config : unconfig
- @ >include/config.h
- @echo "#define CONFIG_SH7763RDP 1" >> include/config.h
+ @mkdir -p $(obj)include
+ @echo "#define CONFIG_SH7763RDP 1" > $(obj)include/config.h
@./mkconfig -a $(@:_config=) sh sh4 sh7763rdp
#========================================================================
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 7555cb9..1484b0b 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -33,7 +33,7 @@
CONFIG_DRIVER_SMC911X_16_BIT shall be set"
#endif
-#ifdef CONFIG_DRIVER_SMC911X_32_BIT
+#if defined (CONFIG_DRIVER_SMC911X_32_BIT)
static inline u32 reg_read(u32 addr)
{
return *(volatile u32*)addr;
@@ -42,7 +42,7 @@
{
*(volatile u32*)addr = val;
}
-#elif CONFIG_DRIVER_SMC911X_16_BIT
+#elif defined (CONFIG_DRIVER_SMC911X_16_BIT)
static inline u32 reg_read(u32 addr)
{
volatile u16 *addr_16 = (u16 *)addr;
@@ -597,7 +597,7 @@
val = reg_read(BYTE_TEST);
if (val != 0x87654321) {
- printf(DRIVERNAME ": Invalid chip endian 0x08%x\n", val);
+ printf(DRIVERNAME ": Invalid chip endian 0x%08x\n", val);
goto err_out;
}