Commit 810ae23f authored by Tom Rini's avatar Tom Rini

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

parents 7eddda45 92a47459
...@@ -95,6 +95,7 @@ ...@@ -95,6 +95,7 @@
mac-address = [00 00 00 00 00 00]; mac-address = [00 00 00 00 00 00];
resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>; resets = <&rst EMAC0_RESET>, <&rst EMAC0_OCP_RESET>;
reset-names = "stmmaceth"; reset-names = "stmmaceth";
altr,sysmgr-syscon = <&sysmgr 0x44 0>;
status = "disabled"; status = "disabled";
}; };
...@@ -106,6 +107,7 @@ ...@@ -106,6 +107,7 @@
mac-address = [00 00 00 00 00 00]; mac-address = [00 00 00 00 00 00];
resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>; resets = <&rst EMAC1_RESET>, <&rst EMAC1_OCP_RESET>;
reset-names = "stmmaceth"; reset-names = "stmmaceth";
altr,sysmgr-syscon = <&sysmgr 0x48 0>;
status = "disabled"; status = "disabled";
}; };
...@@ -117,6 +119,7 @@ ...@@ -117,6 +119,7 @@
mac-address = [00 00 00 00 00 00]; mac-address = [00 00 00 00 00 00];
resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>; resets = <&rst EMAC2_RESET>, <&rst EMAC2_OCP_RESET>;
reset-names = "stmmaceth"; reset-names = "stmmaceth";
altr,sysmgr-syscon = <&sysmgr 0x4c 0>;
status = "disabled"; status = "disabled";
}; };
......
...@@ -248,8 +248,10 @@ unsigned int cm_get_qspi_controller_clk_hz(void); ...@@ -248,8 +248,10 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
* 0xFFEz_zzzz ...... Malloc area (grows up to top) * 0xFFEz_zzzz ...... Malloc area (grows up to top)
* 0xFFE3_FFFF ...... End of SRAM (top) * 0xFFE3_FFFF ...... End of SRAM (top)
*/ */
#ifndef CONFIG_SPL_TEXT_BASE
#define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR
#define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE #define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE
#endif
#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10) #if defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
/* SPL memory allocation configuration, this is for FAT implementation */ /* SPL memory allocation configuration, this is for FAT implementation */
......
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