From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ley Foon Tan Date: Tue, 07 Mar 2017 10:51:46 +0800 Subject: [U-Boot] [PATCH 14/20] arm: socfpga: add SPL support for Arria 10 In-Reply-To: <61150823-f702-ce0b-9cb1-a9e8f3c0dec8@denx.de> References: <1487756858-16730-1-git-send-email-ley.foon.tan@intel.com> <1487756858-16730-15-git-send-email-ley.foon.tan@intel.com> <61150823-f702-ce0b-9cb1-a9e8f3c0dec8@denx.de> Message-ID: <1488855106.2433.24.camel@intel.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: u-boot@lists.denx.de On Sab, 2017-02-25 at 22:43 +0100, Marek Vasut wrote: > On 02/22/2017 10:47 AM, Ley Foon Tan wrote: > > > > Add SPL support for Arria 10. > > > > Signed-off-by: Tien Fong Chee > > Signed-off-by: Ley Foon Tan > > --- > >  arch/arm/mach-socfpga/spl.c | 92 > > ++++++++++++++++++++++++++++++++++++++++++++- > >  1 file changed, 90 insertions(+), 2 deletions(-) > > > > diff --git a/arch/arm/mach-socfpga/spl.c b/arch/arm/mach- > > socfpga/spl.c > > index fec4c7a..1299e67 100644 > > --- a/arch/arm/mach-socfpga/spl.c > > +++ b/arch/arm/mach-socfpga/spl.c > > @@ -19,37 +19,55 @@ > >  #include > >  #include > >  #include > > +#include > > +#include > > +#include > > +#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10) > > +#include > > +#endif > >   > >  DECLARE_GLOBAL_DATA_PTR; > >   > > +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) > > +#define BOOTINFO_BSEL_SHIFT 0 > Wasn't this defined in the misc support patch already ? Good catch, will remove this. > > > > >  static struct pl310_regs *const pl310 = > >   (struct pl310_regs *)CONFIG_SYS_PL310_BASE; > >  static struct scu_registers *scu_regs = > >   (struct scu_registers *)SOCFPGA_MPUSCU_ADDRESS; > >  static struct nic301_registers *nic301_regs = > >   (struct nic301_registers *)SOCFPGA_L3REGS_ADDRESS; > > -static struct socfpga_system_manager *sysmgr_regs = > > +#elif defined(CONFIG_TARGET_SOCFPGA_ARRIA10) > > +#define BOOTINFO_BSEL_SHIFT 12 > > +#endif > > + > > +static const struct socfpga_system_manager *sysmgr_regs = > >   (struct socfpga_system_manager *)SOCFPGA_SYSMGR_ADDRESS; > >   > >  u32 spl_boot_device(void) > >  { > >   const u32 bsel = readl(&sysmgr_regs->bootinfo); > >   > > - switch (bsel & 0x7) { > > + switch ((bsel >> BOOTINFO_BSEL_SHIFT) & 0x7) { > >   case 0x1: /* FPGA (HPS2FPGA Bridge) */ > >   return BOOT_DEVICE_RAM; > >   case 0x2: /* NAND Flash (1.8V) */ > >   case 0x3: /* NAND Flash (3.0V) */ > > +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) > >   socfpga_per_reset(SOCFPGA_RESET(NAND), 0); > > +#endif > >   return BOOT_DEVICE_NAND; > >   case 0x4: /* SD/MMC External Transceiver (1.8V) */ > >   case 0x5: /* SD/MMC Internal Transceiver (3.0V) */ > > +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) > >   socfpga_per_reset(SOCFPGA_RESET(SDMMC), 0); > >   socfpga_per_reset(SOCFPGA_RESET(DMA), 0); > > +#endif > >   return BOOT_DEVICE_MMC1; > >   case 0x6: /* QSPI Flash (1.8V) */ > >   case 0x7: /* QSPI Flash (3.0V) */ > > +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) > >   socfpga_per_reset(SOCFPGA_RESET(QSPI), 0); > > +#endif > This looks awful, you might want to split this function into > A10-specific and Gen5 specific one(s) . Yes, will remove GEN5 switch here. > > > > >   return BOOT_DEVICE_SPI; > >   default: > >   printf("Invalid boot device (bsel=%08x)!\n", > > bsel); > > @@ -68,6 +86,7 @@ u32 spl_boot_mode(const u32 boot_device) > >  } > >  #endif > >   > > +#if defined(CONFIG_TARGET_SOCFPGA_GEN5) > >  static void socfpga_nic301_slave_ns(void) > >  { > >   writel(0x1, &nic301_regs->lwhps2fpgaregs); > > @@ -182,3 +201,72 @@ void board_init_f(ulong dummy) > >   /* Configure simple malloc base pointer into RAM. */ > >   gd->malloc_base = CONFIG_SYS_TEXT_BASE + (1024 * 1024); > >  } > > +#elif defined(CONFIG_TARGET_SOCFPGA_ARRIA10) > > +#ifdef CONFIG_SPL_BOARD_INIT > > +void spl_board_init(void) > > +{ > > + /* configuring the clock based on handoff */ > > + cm_basic_init(gd->fdt_blob); > > + WATCHDOG_RESET(); > > + > > + config_dedicated_pins(gd->fdt_blob); > > + WATCHDOG_RESET(); > > + > > + /* Release UART from reset */ > > + reset_deassert_uart(); > > + > > + /* enable console uart printing */ > > + preloader_console_init(); > > +} > > +#endif > > + > > +void board_init_f(ulong dummy) > > +{ > > + memset(__bss_start, 0, __bss_end - __bss_start); > Is this really needed ? Should be done by common code already ... Yes, common code will do memset after this function. Remove memset here. > > > > > + /* > > +  * Configure Clock Manager to use intosc clock instead > > external osc to > > +  * ensure success watchdog operation. We do it as early as > > possible. > > +  */ > > + cm_use_intosc(); > > + > > + watchdog_disable(); > > + > > + arch_early_init_r(); > > + > > +#ifdef CONFIG_HW_WATCHDOG > > + /* release osc1 watchdog timer 0 from reset */ > > + reset_deassert_osc1wd0(); > > + > > + /* reconfigure and enable the watchdog */ > > + hw_watchdog_init(); > > + WATCHDOG_RESET(); > > +#endif /* CONFIG_HW_WATCHDOG */ > > + > > +#ifdef CONFIG_OF_CONTROL > > + /* We need to access to FDT as this stage */ > > + /* FDT is at end of image */ > > + gd->fdt_blob = (void *)(__bss_end); > This looks like common code too ? Yes, will remove this. > > > > > + /* Check whether we have a valid FDT or not. */ > > + if (fdtdec_prepare_fdt()) { > > + panic("** CONFIG_OF_CONTROL defined but no FDT - > > please see " > > + "doc/README.fdt-control"); > > + } > > +#endif /* CONFIG_OF_CONTROL */ > > + > > + /* Initialize the timer */ > > + timer_init(); > > + > > + /* configuring the clock based on handoff */ > > + cm_basic_init(gd->fdt_blob); > > + WATCHDOG_RESET(); > > + > > + config_dedicated_pins(gd->fdt_blob); > > + WATCHDOG_RESET(); > > + > > + /* Release UART from reset */ > > + reset_deassert_uart(); > > + > > + /* enable console uart printing */ > > + preloader_console_init(); > > +} > > +#endif > > >