Merge commit 'origin/master'

[u-boot] / board / davinci / dv-evm / dv_board.c

diff --git a/board/davinci/dv-evm/dv_board.c b/board/davinci/dv-evm/dv_board.c
index 94925ecfb14ace349c9148177008cb6e653097d8..dce821ba6a48b9146b90f2a58303003f7d7911f7 100644 (file)
--- a/board/davinci/dv-evm/dv_board.c
+++ b/board/davinci/dv-evm/dv_board.c
@@ -31,6 +31,8 @@
 
 #define MACH_TYPE_DAVINCI_EVM          901
 
+DECLARE_GLOBAL_DATA_PTR;
+
 extern void    i2c_init(int speed, int slaveaddr);
 extern void    timer_init(void);
 extern int     eth_hw_init(void);
@@ -115,8 +117,6 @@ void dsp_on(void)
 
 int board_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        /* arch number of the board */
        gd->bd->bi_arch_number = MACH_TYPE_DAVINCI_EVM;
 
@@ -181,7 +181,7 @@ int misc_init_r (void)
                        tmp[0] &= buf[i];
 
                if ((tmp[0] != 0xff) && (getenv("ethaddr") == NULL)) {
-                       sprintf((char *)&tmp[0], "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
+                       sprintf((char *)&tmp[0], "%02x:%02x:%02x:%02x:%02x:%02x",
                                buf[0], buf[1], buf[2], buf[3], buf[4], buf[5]);
                        setenv("ethaddr", (char *)&tmp[0]);
                }
@@ -202,8 +202,6 @@ int misc_init_r (void)
 
 int dram_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;