Commit cdb714d7 authored by Tom Rini's avatar Tom Rini

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

parents fec26e72 e6e34ca3
......@@ -82,8 +82,10 @@
&qspi {
status = "okay";
u-boot,dm-pre-reloc;
flash0: n25q00@0 {
u-boot,dm-pre-reloc;
#address-cells = <1>;
#size-cells = <1>;
compatible = "n25q00";
......
......@@ -84,8 +84,10 @@
&qspi {
status = "okay";
u-boot,dm-pre-reloc;
flash0: n25q00@0 {
u-boot,dm-pre-reloc;
#address-cells = <1>;
#size-cells = <1>;
compatible = "n25q00";
......
......@@ -104,7 +104,7 @@ static void dwmac_deassert_reset(const unsigned int of_reset_id)
socfpga_per_reset(reset, 0);
}
int cpu_eth_init(bd_t *bis)
static int socfpga_eth_reset(void)
{
const void *fdt = gd->fdt_blob;
struct fdtdec_phandle_args args;
......@@ -137,6 +137,11 @@ int cpu_eth_init(bd_t *bis)
return 0;
}
#else
static int socfpga_eth_reset(void)
{
return 0
};
#endif
struct {
......@@ -232,7 +237,7 @@ int arch_misc_init(void)
setenv("bootmode", bsel_str[bsel].mode);
if (fpga_id >= 0)
setenv("fpgatype", socfpga_fpga_model[fpga_id].var);
return 0;
return socfpga_eth_reset();
}
#endif
......
......@@ -187,13 +187,13 @@ usage() {
echo "$0 [soc_type] [input_qts_dir] [input_bsp_dir] [output_dir]"
echo "Process QTS-generated headers into U-Boot compatible ones."
echo ""
echo -e " soc_type\t-\tType of SoC, either 'cyclone5' or 'arria5'."
echo -e " input_qts_dir\t-\tDirectory with compiled Quartus project"
echo -e "\t\t\t\tand containing the Quartus project file (QPF)."
echo -e " input_bsp_dir\t-\tDirectory with generated bsp containing"
echo -e "\t\t\t\tthe settings.bsp file."
echo -e " output_dir\t-\tDirectory to store the U-Boot compatible"
echo -e "\t\t\t\theaders."
echo " soc_type - Type of SoC, either 'cyclone5' or 'arria5'."
echo " input_qts_dir - Directory with compiled Quartus project"
echo " and containing the Quartus project file (QPF)."
echo " input_bsp_dir - Directory with generated bsp containing"
echo " the settings.bsp file."
echo " output_dir - Directory to store the U-Boot compatible"
echo " headers."
echo ""
}
......
......@@ -30,6 +30,9 @@
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
/* add target to build it automatically upon "make" */
#define CONFIG_BUILD_TARGET "u-boot-with-spl.sfp"
/*
* Memory configurations
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment