global: Move remaining CONFIG_SYS_NAND_* to CFG_SYS_NAND_*

[platform/kernel/u-boot.git] / board / atmel / sam9x60ek / sam9x60ek.c

diff --git a/board/atmel/sam9x60ek/sam9x60ek.c b/board/atmel/sam9x60ek/sam9x60ek.c
index 182b3ae..786de18 100644 (file)
--- a/board/atmel/sam9x60ek/sam9x60ek.c
+++ b/board/atmel/sam9x60ek/sam9x60ek.c
@@ -6,6 +6,8 @@
  */
 
 #include <common.h>
+#include <init.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/arch/at91sam9_smc.h>
 #include <asm/arch/at91_common.h>
@@ -34,9 +36,9 @@ static void sam9x60ek_nand_hw_init(void)
        at91_pio3_set_a_periph(AT91_PIO_PORTD, 2, 0);   /* NAND ALE */
        at91_pio3_set_a_periph(AT91_PIO_PORTD, 3, 0);   /* NAND CLE */
        /* Enable NandFlash */
-       at91_set_gpio_output(CONFIG_SYS_NAND_ENABLE_PIN, 1);
+       at91_set_gpio_output(CFG_SYS_NAND_ENABLE_PIN, 1);
        /* Configure RDY/BSY */
-       at91_set_gpio_input(CONFIG_SYS_NAND_READY_PIN, 1);
+       at91_set_gpio_input(CFG_SYS_NAND_READY_PIN, 1);
        at91_pio3_set_a_periph(AT91_PIO_PORTD, 6, 1);
        at91_pio3_set_a_periph(AT91_PIO_PORTD, 7, 1);
        at91_pio3_set_a_periph(AT91_PIO_PORTD, 8, 1);
@@ -99,8 +101,17 @@ void board_debug_uart_init(void)
 #ifdef CONFIG_BOARD_EARLY_INIT_F
 int board_early_init_f(void)
 {
-#ifdef CONFIG_DEBUG_UART
-       debug_uart_init();
+       return 0;
+}
+#endif
+
+#define MAC24AA_MAC_OFFSET     0xfa
+
+#ifdef CONFIG_MISC_INIT_R
+int misc_init_r(void)
+{
+#ifdef CONFIG_I2C_EEPROM
+       at91_set_ethaddr(MAC24AA_MAC_OFFSET);
 #endif
        return 0;
 }