diff options
author | Christoph Muellner <christoph.muellner@theobroma-systems.com> | 2019-06-05 20:31:48 +0200 |
---|---|---|
committer | Christoph Muellner <christoph.muellner@theobroma-systems.com> | 2019-10-13 14:32:47 +0200 |
commit | 0b65c1a8ca24ef32da6ce5e4bc3f343d64549185 (patch) | |
tree | 92de3ebe6305045fd62b25df418f064f57bac3e8 | |
parent | 11c20645c668cc7c3d3c3ddbf41eb9dc3446955b (diff) |
rk3368: Streamline default environment.
The RK3368 did not receive much updates recently,
therefore this patch updates the default environment
setting to match the ones from the RK3399.
Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com>
-rw-r--r-- | include/configs/rk3368_common.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h index 88c1af0974..f0328156a9 100644 --- a/include/configs/rk3368_common.h +++ b/include/configs/rk3368_common.h @@ -10,9 +10,6 @@ #define CONFIG_SYS_CACHELINE_SIZE 64 -#include <asm/arch/hardware.h> -#include <linux/sizes.h> - #define CONFIG_SYS_SDRAM_BASE 0 #define SDRAM_MAX_SIZE 0xff000000 #define CONFIG_BAUDRATE 115200 @@ -36,15 +33,20 @@ #define ENV_MEM_LAYOUT_SETTINGS \ "scriptaddr=0x00500000\0" \ "pxefile_addr_r=0x00600000\0" \ - "fdt_addr_r=0x5600000\0" \ - "kernel_addr_r=0x280000\0" \ - "ramdisk_addr_r=0x5bf0000\0" + "fdt_addr_r=0x01f00000\0" \ + "kernel_addr_r=0x02080000\0" \ + "ramdisk_addr_r=0x04000000\0" -#include <config_distro_bootcmd.h> +#ifndef ROCKCHIP_DEVICE_SETTINGS +#define ROCKCHIP_DEVICE_SETTINGS +#endif +#include <config_distro_bootcmd.h> #define CONFIG_EXTRA_ENV_SETTINGS \ - "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ - ENV_MEM_LAYOUT_SETTINGS \ + ENV_MEM_LAYOUT_SETTINGS \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "partitions=" PARTS_DEFAULT \ + ROCKCHIP_DEVICE_SETTINGS \ BOOTENV #endif |