diff options
| author | Tom Rini <trini@konsulko.com> | 2019-06-15 13:02:26 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-06-15 13:02:26 -0400 |
| commit | f681eacbfeb2598c135ef8e8ba8d5b9298a52a38 (patch) | |
| tree | 8c015161a391c11bd3385cc97d224a76a54a25cf | |
| parent | 8f9321322724ad425ee8b790cfb5ab6a14f97b1a (diff) | |
| parent | d6d383ca27c8121f19cb5fe1b047de330833ce6f (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
- SPL size check for Gen5, i2c enablement for S10
| -rwxr-xr-x | arch/arm/dts/socfpga_stratix10_socdk.dts | 5 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/Kconfig | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/dts/socfpga_stratix10_socdk.dts b/arch/arm/dts/socfpga_stratix10_socdk.dts index 2745050810..c5409df026 100755 --- a/arch/arm/dts/socfpga_stratix10_socdk.dts +++ b/arch/arm/dts/socfpga_stratix10_socdk.dts @@ -9,6 +9,7 @@ model = "SoCFPGA Stratix 10 SoCDK"; aliases { + i2c0 = &i2c1; serial0 = &uart0; }; @@ -77,6 +78,10 @@ }; }; +&i2c1 { + status = "okay"; +}; + &mmc { status = "okay"; cap-sd-highspeed; diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig index 48f02f08d4..1d914648e3 100644 --- a/arch/arm/mach-socfpga/Kconfig +++ b/arch/arm/mach-socfpga/Kconfig @@ -3,6 +3,12 @@ if ARCH_SOCFPGA config NR_DRAM_BANKS default 1 +config SPL_SIZE_LIMIT + default 65536 if TARGET_SOCFPGA_GEN5 + +config SPL_SIZE_LIMIT_PROVIDE_STACK + default 0x200 if TARGET_SOCFPGA_GEN5 + config SPL_STACK_R_ADDR default 0x00800000 if TARGET_SOCFPGA_GEN5 @@ -49,6 +55,8 @@ config TARGET_SOCFPGA_GEN5 bool select SPL_ALTERA_SDRAM imply FPGA_SOCFPGA + imply SPL_SIZE_LIMIT_SUBTRACT_GD + imply SPL_SIZE_LIMIT_SUBTRACT_MALLOC imply SPL_STACK_R imply SPL_SYS_MALLOC_SIMPLE imply USE_TINY_PRINTF |