diff options
| author | Tom Rini <[email protected]> | 2020-01-02 10:28:26 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-01-02 10:28:26 -0500 |
| commit | 28aa6dc29a0f35c5c5d969c83428a50361932f5b (patch) | |
| tree | a3b728fa96a8e773791a46b1e9eb17542696f484 /include | |
| parent | 13ef116507df73b6e66cc18f04edd00ffdafd595 (diff) | |
| parent | c0a474b9d9a1c370f46b3f76ea0707f92d55b0b1 (diff) | |
Merge tag 'u-boot-rockchip-20191231' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- Fix latest mainline kernel for rk3308
- Update rk3288-evb config to suport OP-TEE
- Fix for firefly-px30 DEBUG_UART channel and make it standalone
- Script make_fit_atf add python3 support
- Fix rk3328 timer with correct COUNTER_FREQUENCY
- Fix rk3328 ATF support with enable spl-fifo-mode
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/rk3308_common.h | 2 | ||||
| -rw-r--r-- | include/configs/rk3328_common.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h index a67d3d7d1b7..bd9ac826f3d 100644 --- a/include/configs/rk3308_common.h +++ b/include/configs/rk3308_common.h @@ -42,7 +42,7 @@ #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x00500000\0" \ "pxefile_addr_r=0x00600000\0" \ - "fdt_addr_r=0x01f00000\0" \ + "fdt_addr_r=0x02800000\0" \ "kernel_addr_r=0x00680000\0" \ "ramdisk_addr_r=0x04000000\0" diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h index b14da3a6265..407e5d29311 100644 --- a/include/configs/rk3328_common.h +++ b/include/configs/rk3328_common.h @@ -11,6 +11,7 @@ #define CONFIG_IRAM_BASE 0xff090000 #define CONFIG_ROCKCHIP_STIMER_BASE 0xff1d0020 +#define COUNTER_FREQUENCY 24000000 #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SKIP_LOWLEVEL_INIT |