diff options
| author | Tom Rini <trini@konsulko.com> | 2019-12-06 10:35:18 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-06 10:35:18 -0500 |
| commit | bead4f2f2c85e1bf39d2c80ef733f1325eb336bb (patch) | |
| tree | ab462e322dffa41f8719a25eaa029b9900fe1e55 /include | |
| parent | edbb8e09183e6c232b14ed1a087f93b7f0b560ac (diff) | |
| parent | b2e373d16b0345d3c3f4beefdf0889e83faf173d (diff) | |
Merge tag 'u-boot-rockchip-20191206' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- rockchip pwm driver update to support all the SoCs
- RK3308 GMAC and pinctrl support
- More UART interface support on PX30 and pmugrf reg fix
- Fixup on misc for eth_addr/serial#
- Other updates on variant SoCs
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/rk3328_common.h | 2 | ||||
| -rw-r--r-- | include/configs/rk3399_common.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h index e51e1b0e0e..b14da3a626 100644 --- a/include/configs/rk3328_common.h +++ b/include/configs/rk3328_common.h @@ -36,7 +36,7 @@ "pxefile_addr_r=0x00600000\0" \ "fdt_addr_r=0x01f00000\0" \ "kernel_addr_r=0x02080000\0" \ - "ramdisk_addr_r=0x04000000\0" + "ramdisk_addr_r=0x06000000\0" #include <config_distro_bootcmd.h> #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 7331c6dc02..127ca1f09c 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -51,7 +51,7 @@ "pxefile_addr_r=0x00600000\0" \ "fdt_addr_r=0x01f00000\0" \ "kernel_addr_r=0x02080000\0" \ - "ramdisk_addr_r=0x04000000\0" + "ramdisk_addr_r=0x06000000\0" #ifndef ROCKCHIP_DEVICE_SETTINGS #define ROCKCHIP_DEVICE_SETTINGS |