diff options
| author | Tom Rini <[email protected]> | 2021-03-29 17:53:19 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-03-29 18:00:21 -0400 |
| commit | 1057b1be75386e3513dca392d8258e01e5cccc01 (patch) | |
| tree | a1cbdc677c070064177e1d9defeb1fb4ab30ad6e /arch | |
| parent | 4906238191b90be7aec2269ba8cd6aeb161cd312 (diff) | |
| parent | d8eafb16c85bc3b5d85d7ba8ebb1438cc0ae168f (diff) | |
Merge tag 'v2021.04-rc5' into next
Prepare v2021.04-rc5
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-socfpga/board.c | 3 | ||||
| -rw-r--r-- | arch/powerpc/dts/t2080rdb.dts | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c index 81aa07c9025..650122fcd4f 100644 --- a/arch/arm/mach-socfpga/board.c +++ b/arch/arm/mach-socfpga/board.c @@ -115,7 +115,8 @@ void board_fit_image_post_process(void **p_image, size_t *p_size) #if !IS_ENABLED(CONFIG_SPL_BUILD) && IS_ENABLED(CONFIG_FIT) void board_prep_linux(bootm_headers_t *images) { - if (!IS_ENABLED(CONFIG_SECURE_VAB_AUTH_ALLOW_NON_FIT_IMAGE)) { + if (IS_ENABLED(CONFIG_SOCFPGA_SECURE_VAB_AUTH) && + !IS_ENABLED(CONFIG_SOCFPGA_SECURE_VAB_AUTH_ALLOW_NON_FIT_IMAGE)) { /* * Ensure the OS is always booted from FIT and with * VAB signed certificate diff --git a/arch/powerpc/dts/t2080rdb.dts b/arch/powerpc/dts/t2080rdb.dts index 34ec6a74cb1..74bbb20e2a1 100644 --- a/arch/powerpc/dts/t2080rdb.dts +++ b/arch/powerpc/dts/t2080rdb.dts @@ -30,3 +30,11 @@ spi-max-frequency = <10000000>; /* input clock */ }; }; + +&i2c0 { + status = "okay"; + rtc@68 { + compatible = "dallas,ds1339"; + reg = <0x68>; + }; +}; |