arm, at91: small updates for the smartweb board

- add CONFIG_BOOT_RETRY_TIME to 30
- fex LED colors
- fix button pressed combination
- add
  CONFIG_USB_HOST_ETHER
  CONFIG_USB_ETHER_ASIX
  CONFIG_USB_ETHER_MCS7830

Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Matthias Michel <matthias.michel@siemens.com>

diff --git a/board/siemens/smartweb/smartweb.c b/board/siemens/smartweb/smartweb.c
index 2d424882a9c9b8404f767c90c6a751bfb091fd8e..d82f1b73a712db93fe610faf7f9ceb5831936088 100644 (file)
--- a/board/siemens/smartweb/smartweb.c
+++ b/board/siemens/smartweb/smartweb.c
@@ -90,7 +90,8 @@ static void smartweb_macb_hw_init(void)
                pin_to_mask(AT91_PIN_PA17) |
                pin_to_mask(AT91_PIN_PA25) |
                pin_to_mask(AT91_PIN_PA26) |
-               pin_to_mask(AT91_PIN_PA28),
+               pin_to_mask(AT91_PIN_PA28) |
+               pin_to_mask(AT91_PIN_PA29),
                &pioa->pudr);
 
        at91_phy_reset();
@@ -101,7 +102,8 @@ static void smartweb_macb_hw_init(void)
                pin_to_mask(AT91_PIN_PA17) |
                pin_to_mask(AT91_PIN_PA25) |
                pin_to_mask(AT91_PIN_PA26) |
-               pin_to_mask(AT91_PIN_PA28),
+               pin_to_mask(AT91_PIN_PA28) |
+               pin_to_mask(AT91_PIN_PA29),
                &pioa->puer);
 
        /* Initialize EMAC=MACB hardware */
@@ -141,13 +143,6 @@ int board_early_init_f(void)
 
 int board_init(void)
 {
-       /* Adress of boot parameters */
-       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
-       smartweb_nand_hw_init();
-#ifdef CONFIG_MACB
-       smartweb_macb_hw_init();
-#endif
        /* power LED red */
        at91_set_gpio_output(AT91_PIN_PC6, 0);
        at91_set_gpio_output(AT91_PIN_PC7, 1);
@@ -163,6 +158,13 @@ int board_init(void)
        at91_udc_probe(&board_udc_data);
 #endif
 
+       /* Adress of boot parameters */
+       gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+
+       smartweb_nand_hw_init();
+#ifdef CONFIG_MACB
+       smartweb_macb_hw_init();
+#endif
        return 0;
 }
 
@@ -197,6 +199,7 @@ void matrix_init(void)
 
 void spl_board_init(void)
 {
+       /* power LED orange */
        at91_set_gpio_output(AT91_PIN_PC6, 1);
        at91_set_gpio_output(AT91_PIN_PC7, 1);
        /* alarm LED orange */
@@ -212,8 +215,8 @@ void spl_board_init(void)
 
        /* check if both  button are pressed */
        if (at91_get_gpio_value(AT91_PIN_PA28) == 0 &&
-           at91_get_gpio_value(AT91_PIN_PA29) == 0) {
-               debug("Recovery button pressed\n");
+               at91_get_gpio_value(AT91_PIN_PA29) == 0) {
+               smartweb_nand_hw_init();
                nand_init();
                spl_nand_erase_one(0, 0);
        }

diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index d189c3fde97ce1f789023c861517b9d37bd7a98e..e11c016aedb1101430bd5ca0da1ae3b537e80c43 100644 (file)
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -117,6 +117,9 @@
  *
  */
 #define CONFIG_MACB
+#define CONFIG_USB_HOST_ETHER
+#define CONFIG_USB_ETHER_ASIX
+#define CONFIG_USB_ETHER_MCS7830
 #define CONFIG_RMII                    /* use reduced MII inteface */
 #define CONFIG_NET_RETRY_COUNT 20      /* # of DHCP/BOOTP retries */
 #define CONFIG_AT91_WANTS_COMMON_PHY
@@ -182,6 +185,7 @@
 /* General Boot Parameter */
 #define CONFIG_BOOTDELAY               3
 #define CONFIG_BOOTCOMMAND             "run flashboot"
+#define CONFIG_BOOT_RETRY_TIME          30
 #define CONFIG_SYS_CBSIZE              512
 #define CONFIG_SYS_MAXARGS             16
 #define CONFIG_SYS_PBSIZE \