GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-04-02 12:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm, at91: small updates for the smartweb board

Browse source 
- 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>
This commit is contained in:
Heiko Schocher 2015-09-28 11:36:05 +02:00 • committed by Andreas Bießmann
parent ac1eefebf5
commit aca5d0830a
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
board/siemens/smartweb/smartweb.c
View file

@ -90,7 +90,8 @@ static void smartweb_macb_hw_init(void)
pin_to_mask(AT91_PIN_PA17) | pin_to_mask(AT91_PIN_PA17) |
pin_to_mask(AT91_PIN_PA25) | pin_to_mask(AT91_PIN_PA25) |
pin_to_mask(AT91_PIN_PA26) | 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); &pioa->pudr);
at91_phy_reset(); 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_PA17) |
pin_to_mask(AT91_PIN_PA25) | pin_to_mask(AT91_PIN_PA25) |
pin_to_mask(AT91_PIN_PA26) | 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); &pioa->puer);
/* Initialize EMAC=MACB hardware */ /* Initialize EMAC=MACB hardware */
@ -141,13 +143,6 @@ int board_early_init_f(void)
int board_init(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 */ /* power LED red */
at91_set_gpio_output(AT91_PIN_PC6, 0); at91_set_gpio_output(AT91_PIN_PC6, 0);
at91_set_gpio_output(AT91_PIN_PC7, 1); at91_set_gpio_output(AT91_PIN_PC7, 1);
@ -163,6 +158,13 @@ int board_init(void)
at91_udc_probe(&board_udc_data); at91_udc_probe(&board_udc_data);
#endif #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; return 0;
} }
@ -197,6 +199,7 @@ void matrix_init(void)
void spl_board_init(void) void spl_board_init(void)
{ {
/* power LED orange */
at91_set_gpio_output(AT91_PIN_PC6, 1); at91_set_gpio_output(AT91_PIN_PC6, 1);
at91_set_gpio_output(AT91_PIN_PC7, 1); at91_set_gpio_output(AT91_PIN_PC7, 1);
/* alarm LED orange */ /* alarm LED orange */
@ -213,7 +216,7 @@ void spl_board_init(void)
/* check if both button are pressed */ /* check if both button are pressed */
if (at91_get_gpio_value(AT91_PIN_PA28) == 0 && if (at91_get_gpio_value(AT91_PIN_PA28) == 0 &&
at91_get_gpio_value(AT91_PIN_PA29) == 0) { at91_get_gpio_value(AT91_PIN_PA29) == 0) {
debug("Recovery button pressed\n"); smartweb_nand_hw_init();
nand_init(); nand_init();
spl_nand_erase_one(0, 0); spl_nand_erase_one(0, 0);
} }

4
include/configs/smartweb.h
View file

@ -117,6 +117,9 @@
* *
*/ */
#define CONFIG_MACB #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_RMII /* use reduced MII inteface */
#define CONFIG_NET_RETRY_COUNT 20 /* # of DHCP/BOOTP retries */ #define CONFIG_NET_RETRY_COUNT 20 /* # of DHCP/BOOTP retries */
#define CONFIG_AT91_WANTS_COMMON_PHY #define CONFIG_AT91_WANTS_COMMON_PHY
@ -182,6 +185,7 @@
/* General Boot Parameter */ /* General Boot Parameter */
#define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTCOMMAND "run flashboot" #define CONFIG_BOOTCOMMAND "run flashboot"
#define CONFIG_BOOT_RETRY_TIME 30
#define CONFIG_SYS_CBSIZE 512 #define CONFIG_SYS_CBSIZE 512
#define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_PBSIZE \ #define CONFIG_SYS_PBSIZE \