From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chee, Tien Fong Date: Thu, 14 Feb 2019 06:50:35 +0000 Subject: [U-Boot] [PATCH v8 6/8] spl : socfpga: Implement fpga bitstream loading with socfpga loadfs In-Reply-To: <135a82d0-020a-0c76-ff63-22763eb57ea5@denx.de> References: <1550067518-2542-1-git-send-email-tien.fong.chee@intel.com> <1550067518-2542-7-git-send-email-tien.fong.chee@intel.com> <135a82d0-020a-0c76-ff63-22763eb57ea5@denx.de> Message-ID: <1550127034.10728.39.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 Wed, 2019-02-13 at 17:25 +0100, Marek Vasut wrote: > On 2/13/19 3:18 PM, tien.fong.chee at intel.com wrote: > > > > From: Tien Fong Chee > > > > Add support for loading FPGA bitstream to get DDR up running before > > U-Boot is loaded into DDR. Boot device initialization, generic > > firmware > > loader and SPL FAT support are required for this whole mechanism to > > work. > > > > Signed-off-by: Tien Fong Chee > > > > --- > > > > changes for v7 > > - Removed casting for get_fpga_filename > > - Removed hard coding DDR address for loading core bistream, using > > loadable > >   property from FIT. > > - Added checking for config_pins, return if error. > > --- > >  arch/arm/mach-socfpga/spl_a10.c | 41 > > ++++++++++++++++++++++++++++++++++++++++- > >  1 file changed, 40 insertions(+), 1 deletion(-) > > > > diff --git a/arch/arm/mach-socfpga/spl_a10.c b/arch/arm/mach- > > socfpga/spl_a10.c > > index c97eacb..36003b1 100644 > > --- a/arch/arm/mach-socfpga/spl_a10.c > > +++ b/arch/arm/mach-socfpga/spl_a10.c > > @@ -1,6 +1,6 @@ > >  // SPDX-License-Identifier: GPL-2.0+ > >  /* > > - *  Copyright (C) 2012 Altera Corporation > > + *  Copyright (C) 2012-2019 Altera Corporation > >   */ > >   > >  #include > > @@ -23,6 +23,8 @@ > >  #include > >  #include > >  #include > > +#include > > +#include > >   > >  DECLARE_GLOBAL_DATA_PTR; > >   > > @@ -68,11 +70,48 @@ u32 spl_boot_mode(const u32 boot_device) > >   > >  void spl_board_init(void) > >  { > > + char buf[16 * 1024] __aligned(ARCH_DMA_MINALIGN); > ALLOC_CACHE_ALIGN_BUFFER() #define ARCH_DMA_MINALIGN CONFIG_SYS_CACHELINE_SIZE They are not same thing? > > > > > + > >   /* enable console uart printing */ > >   preloader_console_init(); > >   WATCHDOG_RESET(); > >   > >   arch_early_init_r(); > > + > > + /* If the full FPGA is already loaded, ie.from EPCQ, > > config fpga pins */ > > + if (is_fpgamgr_user_mode()) { > > + int ret = config_pins(gd->fdt_blob, "shared"); > > + > > + if (ret) > > + return; > > + > > + ret = config_pins(gd->fdt_blob, "fpga"); > > + if (ret) > > + return; > > + } else if (!is_fpgamgr_early_user_mode()) { > > + /* Program IOSSM(early IO release) or full FPGA */ > > + fpga_fs_info fpga_fsinfo; > > + int len; > > + > > + fpga_fsinfo.filename = get_fpga_filename(gd- > > >fdt_blob, &len); > > + > > + if (fpga_fsinfo.filename) > > + socfpga_loadfs(&fpga_fsinfo, buf, > > sizeof(buf), 0); > Why is this code here twice ? The same code seems to be below ... The 1st calling for periph program, then running ddr calibration, then 2nd calling for core program. > > > > > + } > > + > > + /* If the IOSSM/full FPGA is already loaded, start DDR */ > > + if (is_fpgamgr_early_user_mode() || > > is_fpgamgr_user_mode()) > > + ddr_calibration_sequence(); > > + > > + if (!is_fpgamgr_user_mode()) { > > + fpga_fs_info fpga_fsinfo; > > + int len; > > + > > + fpga_fsinfo.filename = get_fpga_filename(gd- > > >fdt_blob, &len); > > + > > + if (fpga_fsinfo.filename) > > + socfpga_loadfs(&fpga_fsinfo, buf, > > sizeof(buf), 0); > > + } > >  } > >   > >  void board_init_f(ulong dummy) > > >