On Thu, Mar 6, 2014 at 7:20 PM, Ian Campbell <i...@hellion.org.uk> wrote:
> Signed-off-by: Ian Campbell <i...@hellion.org.uk>
Acked-by: Rob Herring <r...@kernel.org>
> ---
> board/highbank/highbank.c | 14 ++++++++++----
> 1 file changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
> index 4b272c7..d42447d 100644
> --- a/board/highbank/highbank.c
> +++ b/board/highbank/highbank.c
> @@ -51,17 +51,23 @@ int board_eth_init(bd_t *bis)
> return rc;
> }
>
> -#ifdef CONFIG_MISC_INIT_R
> -int misc_init_r(void)
> +#ifdef CONFIG_SCSI_AHCI_PLAT
> +void scsi_init(void)
> {
> - char envbuffer[16];
> - u32 boot_choice;
> u32 reg = readl(HB_SREG_A9_PWRDOM_STAT);
>
> if (reg & PWRDOM_STAT_SATA) {
> ahci_init(HB_AHCI_BASE);
> scsi_scan(1);
> }
> +}
> +#endif
> +
> +#ifdef CONFIG_MISC_INIT_R
> +int misc_init_r(void)
> +{
> + char envbuffer[16];
> + u32 boot_choice;
>
> boot_choice = readl(HB_SREG_A9_BOOT_SRC_STAT) & 0xff;
> sprintf(envbuffer, "bootcmd%d", boot_choice);
> --
> 1.8.5.3
>
> _______________________________________________
> U-Boot mailing list
> u-b...@lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
--
You received this message because you are subscribed to the Google Groups
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to linux-sunxi+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
