Convert CONFIG_SYS_BOOTM_LEN to Kconfig

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

diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h
index 1ec27f4..1301560 100644 (file)
--- a/include/configs/imx8mm_venice.h
+++ b/include/configs/imx8mm_venice.h
@@ -9,42 +9,32 @@
 #include <asm/arch/imx-regs.h>
 #include <linux/sizes.h>
 
-#define CONFIG_SPL_MAX_SIZE            (148 * 1024)
 #define CONFIG_SYS_MONITOR_LEN         SZ_512K
 #define CONFIG_SYS_UBOOT_BASE  \
        (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_SPL_STACK               0x920000
-#define CONFIG_SPL_BSS_START_ADDR      0x910000
-#define CONFIG_SPL_BSS_MAX_SIZE                SZ_8K
-#define CONFIG_SYS_SPL_MALLOC_START    0x42200000
-#define CONFIG_SYS_SPL_MALLOC_SIZE     SZ_1M
-
 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
 #define CONFIG_MALLOC_F_ADDR           0x930000
 /* For RAW image gives a error info not panic */
-#define CONFIG_SPL_ABORT_ON_RAW_IMAGE
 
 #endif
 
 #define MEM_LAYOUT_ENV_SETTINGS \
-       "fdt_addr_r=0x44000000\0" \
-       "kernel_addr_r=0x42000000\0" \
-       "ramdisk_addr_r=0x46400000\0" \
-       "scriptaddr=0x46000000\0"
+       "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
+       "fdt_addr_r=0x50200000\0" \
+       "scriptaddr=0x50280000\0" \
+       "ramdisk_addr_r=0x50300000\0" \
+       "kernel_comp_addr_r=0x40200000\0"
 
 /* Enable Distro Boot */
-#ifndef CONFIG_SPL_BUILD
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 1) \
        func(MMC, mmc, 2) \
+       func(USB, usb, 0) \
+       func(USB, usb, 1) \
        func(DHCP, dhcp, na)
 #include <config_distro_bootcmd.h>
-#undef CONFIG_ISO_PARTITION
-#else
-#define BOOTENV
-#endif
 
 /* Initial environment variables */
 #define CONFIG_EXTRA_ENV_SETTINGS \
@@ -61,9 +51,22 @@
                "setexpr blkcnt $blkcnt / 0x200 && " \
                "mmc dev $dev && " \
                "mmc write $loadaddr 0x42 $blkcnt\0" \
+       "loadfdt=" \
+               "if $fsload $fdt_addr_r $dir/$fdt_file1; " \
+                       "then echo loaded $fdt_file1; " \
+               "elif $fsload $fdt_addr_r $dir/$fdt_file2; " \
+                       "then echo loaded $fdt_file2; " \
+               "elif $fsload $fdt_addr_r $dir/$fdt_file3; " \
+                       "then echo loaded $fdt_file3; " \
+               "elif $fsload $fdt_addr_r $dir/$fdt_file4; " \
+                       "then echo loaded $fdt_file4; " \
+               "elif $fsload $fdt_addr_r $dir/$fdt_file5; " \
+                       "then echo loaded $fdt_file5; " \
+               "fi\0" \
        "boot_net=" \
-               "tftpboot $kernel_addr_r $image && " \
-               "booti $kernel_addr_r - $fdtcontroladdr\0" \
+               "setenv fsload tftpboot; " \
+               "run loadfdt && tftpboot $kernel_addr_r $dir/Image && " \
+               "booti $kernel_addr_r - $fdt_addr_r\0" \
        "update_rootfs=" \
                "tftpboot $loadaddr $image && " \
                "gzwrite mmc $dev $loadaddr $filesize 100000 1000000\0" \
@@ -74,31 +77,12 @@
 
 #define CONFIG_SYS_INIT_RAM_ADDR        0x40000000
 #define CONFIG_SYS_INIT_RAM_SIZE        SZ_2M
-#define CONFIG_SYS_INIT_SP_OFFSET \
-       (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR \
-       (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 #define CONFIG_SYS_SDRAM_BASE           0x40000000
 
 /* SDRAM configuration */
 #define PHYS_SDRAM                      0x40000000
-#define PHYS_SDRAM_SIZE                        SZ_1G /* 1GB DDR */
-#define CONFIG_SYS_BOOTM_LEN           SZ_256M
-
-/* UART */
-#define CONFIG_MXC_UART_BASE           UART2_BASE_ADDR
-
-/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE              SZ_2K
-#define CONFIG_SYS_MAXARGS             64
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
-                                       sizeof(CONFIG_SYS_PROMPT) + 16)
-
-/* USDHC */
-#define CONFIG_SYS_FSL_USDHC_NUM       2
-#define CONFIG_SYS_FSL_ESDHC_ADDR      0
+#define PHYS_SDRAM_SIZE                        SZ_4G
 
 /* FEC */
 #define CONFIG_FEC_MXC_PHYADDR          0