From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Schocher Date: Mon, 28 Sep 2015 11:35:38 +0200 Subject: [U-Boot] [PATCH] arm, at91: small updates for the smartweb board In-Reply-To: <21365FD2-85A7-47E6-B4D5-722E69D07DE3@biessmann.de> References: <1443179873-15692-1-git-send-email-hs@denx.de> <21365FD2-85A7-47E6-B4D5-722E69D07DE3@biessmann.de> Message-ID: <560909EA.1010701@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello Andreas, Am 28.09.2015 um 10:51 schrieb Andreas Bie?mann: > Hi Heiko, > >> Am 25.09.2015 um 13:17 schrieb Heiko Schocher : >> >> - 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 >> - change U-Boot prompt to "U-Boot> " >> >> Signed-off-by: Heiko Schocher >> Signed-off-by: Matthias Michel >> --- >> $ ./tools/buildman/buildman -b 20150923 at91 >> WARNING: no status info for 'dra72_evm' >> WARNING: no maintainers for 'dra72_evm' >> WARNING: no status info for 'am335x_gp_evm' >> WARNING: no maintainers for 'am335x_gp_evm' >> WARNING: no status info for 'hikey' >> WARNING: no maintainers for 'hikey' >> Building 5 commits for 61 boards (8 threads, 1 job per thread) >> Cloning repo for thread 0 >> Cloning repo for thread 1 >> Cloning repo for thread 2 >> Cloning repo for thread 3 >> Cloning repo for thread 4 >> Cloning repo for thread 5 >> Cloning repo for thread 6 >> Cloning repo for thread 7 >> 305 0 0 /305 axm >> >> board/siemens/smartweb/smartweb.c | 25 ++++++++++++++----------- >> include/configs/smartweb.h | 5 +++++ >> 2 files changed, 19 insertions(+), 11 deletions(-) >> >> diff --git a/board/siemens/smartweb/smartweb.c b/board/siemens/smartweb/smartweb.c >> index 2d42488..d82f1b7 100644 >> --- 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 d189c3f..fbb66d5 100644 >> --- 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,8 @@ >> /* General Boot Parameter */ >> #define CONFIG_BOOTDELAY 3 >> #define CONFIG_BOOTCOMMAND "run flashboot" >> +#define CONFIG_BOOT_RETRY_TIME 30 >> +#define CONFIG_SYS_PROMPT "U-Boot> " > > could you please use KConfig for at least the SYS_PROMPT setting? fixed. Removed this line from the patch, as SYS_PROMPT is already correct in the smartweb_defconfig. bye, Heiko > > Andreas > >> #define CONFIG_SYS_CBSIZE 512 >> #define CONFIG_SYS_MAXARGS 16 >> #define CONFIG_SYS_PBSIZE \ >> -- >> 2.1.0 >> >> _______________________________________________ >> U-Boot mailing list >> U-Boot at lists.denx.de >> http://lists.denx.de/mailman/listinfo/u-boot > -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany