Merge tag 'next-20220328' of https://source.denx.de/u-boot/custodians/u-boot-video...

[platform/kernel/u-boot.git] / include / configs / rk3399_common.h

diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index 89a8a44..ed72c8b 100644 (file)
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@@ -9,7 +9,6 @@
 #include "rockchip-common.h"
 
 #define CONFIG_SYS_CBSIZE              1024
-#define CONFIG_SKIP_LOWLEVEL_INIT
 
 #define COUNTER_FREQUENCY               24000000
 #define CONFIG_ROCKCHIP_STIMER_BASE    0xff8680a0
@@ -17,7 +16,6 @@
 #define CONFIG_IRAM_BASE               0xff8c0000
 
 #define CONFIG_SYS_INIT_SP_ADDR                0x00300000
-#define CONFIG_SYS_LOAD_ADDR           0x00800800
 
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_TPL_BOOTROM_SUPPORT)
 #define CONFIG_SPL_STACK               0x00400000
@@ -40,7 +38,6 @@
 /* RAW SD card / eMMC locations. */
 
 /* FAT sd card locations. */
-#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #define CONFIG_SYS_SDRAM_BASE          0
 #define SDRAM_MAX_SIZE                 0xf8000000
 
@@ -48,28 +45,33 @@
 
 #define ENV_MEM_LAYOUT_SETTINGS \
        "scriptaddr=0x00500000\0" \
+       "script_offset_f=0xffe000\0" \
+       "script_size_f=0x2000\0" \
        "pxefile_addr_r=0x00600000\0" \
        "fdt_addr_r=0x01f00000\0" \
+       "fdtoverlay_addr_r=0x02000000\0" \
        "kernel_addr_r=0x02080000\0" \
-       "ramdisk_addr_r=0x06000000\0"
+       "ramdisk_addr_r=0x06000000\0" \
+       "kernel_comp_addr_r=0x08000000\0" \
+       "kernel_comp_size=0x2000000\0"
 
 #ifndef ROCKCHIP_DEVICE_SETTINGS
 #define ROCKCHIP_DEVICE_SETTINGS
 #endif
 
 #include <config_distro_bootcmd.h>
+#include <environment/distro/sf.h>
 #define CONFIG_EXTRA_ENV_SETTINGS \
        ENV_MEM_LAYOUT_SETTINGS \
        "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
        "partitions=" PARTS_DEFAULT \
        ROCKCHIP_DEVICE_SETTINGS \
        BOOTENV \
+       BOOTENV_SF \
        "altbootcmd=" \
                "setenv boot_syslinux_conf extlinux/extlinux-rollback.conf;" \
                "run distro_bootcmd\0"
 
 #endif
 
-/* enable usb config for usb ether */
-
 #endif