leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-atmel

Browse Source
This commit is contained in:
Tom Rini 2015-10-01 07:53:15 -04:00
commit 4bbc08f2ec
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
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 */
@ -212,8 +215,8 @@ 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);
} }

8
include/configs/at91-sama5_common.h
View File

@ -53,6 +53,13 @@
#define CONFIG_CMD_DHCP #define CONFIG_CMD_DHCP
#ifdef CONFIG_SYS_USE_MMC #ifdef CONFIG_SYS_USE_MMC
#ifdef CONFIG_ENV_IS_IN_MMC
/* Use raw reserved sectors to save environment */
#define CONFIG_ENV_OFFSET 0x2000
#define CONFIG_ENV_SIZE 0x1000
#define CONFIG_SYS_MMC_ENV_DEV 0
#else
/* u-boot env in sd/mmc card */ /* u-boot env in sd/mmc card */
#define CONFIG_ENV_IS_IN_FAT #define CONFIG_ENV_IS_IN_FAT
#define CONFIG_FAT_WRITE #define CONFIG_FAT_WRITE
@ -60,6 +67,7 @@
#define FAT_ENV_DEVICE_AND_PART "0" #define FAT_ENV_DEVICE_AND_PART "0"
#define FAT_ENV_FILE "uboot.env" #define FAT_ENV_FILE "uboot.env"
#define CONFIG_ENV_SIZE 0x4000 #define CONFIG_ENV_SIZE 0x4000
#endif
#define CONFIG_BOOTCOMMAND "if test ! -n ${dtb_name}; then " \ #define CONFIG_BOOTCOMMAND "if test ! -n ${dtb_name}; then " \
"setenv dtb_name at91-${board_name}.dtb; " \ "setenv dtb_name at91-${board_name}.dtb; " \

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 \