global: Move remaining CONFIG_SYS_SDRAM_* to CFG_SYS_SDRAM_*

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

diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index b474b2f..cf23837 100644 (file)
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright 2019 Toradex
+ * Copyright 2019-2021 Toradex
  */
 
 #ifndef __APALIS_IMX8_H
@@ -9,23 +9,11 @@
 #include <asm/arch/imx-regs.h>
 #include <linux/sizes.h>
 
-#define CONFIG_REMAKE_ELF
-
-#define CONFIG_DISPLAY_BOARDINFO_LATE
-
-#define CONFIG_SYS_FSL_ESDHC_ADDR      0
+#define CFG_SYS_FSL_ESDHC_ADDR 0
 #define USDHC1_BASE_ADDR               0x5b010000
 #define USDHC2_BASE_ADDR               0x5b020000
-#define CONFIG_SUPPORT_EMMC_BOOT       /* eMMC specific */
-
-#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 
 /* Networking */
-#define FEC_QUIRK_ENET_MAC
-#define FEC_ENET_ENABLE_TXC_DELAY
-
-#define CONFIG_TFTP_TSIZE
-
 #define CONFIG_IPADDR                  192.168.10.2
 #define CONFIG_NETMASK                 255.255.255.0
 #define CONFIG_SERVERIP                        192.168.10.1
@@ -49,23 +37,19 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        BOOTENV \
        MEM_LAYOUT_ENV_SETTINGS \
+       "boot_file=Image\0" \
+       "boot_script_dhcp=boot.scr\0" \
        "console=ttyLP1 earlycon\0" \
        "fdt_addr=0x83000000\0" \
        "fdt_file=fsl-imx8qm-apalis-eval.dtb\0" \
        "fdtfile=fsl-imx8qm-apalis-eval.dtb\0" \
        "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
-       "image=Image\0" \
        "initrd_addr=0x83800000\0" \
        "initrd_high=0xffffffffffffffff\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} " \
                "root=PARTUUID=${uuid} rootwait " \
        "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
-       "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
-       "netargs=setenv bootargs console=${console},${baudrate} " \
-               "root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp" \
-               "\0" \
-       "nfsboot=run netargs; dhcp ${loadaddr} ${image}; tftp ${fdt_addr} " \
-               "apalis-imx8/${fdt_file}; booti ${loadaddr} - ${fdt_addr}\0" \
+       "mmcpart=1\0" \
        "panel=NULL\0" \
        "script=boot.scr\0" \
        "update_uboot=askenv confirm Did you load u-boot-dtb.imx (y/N)?; " \
@@ -75,36 +59,14 @@
                "${blkcnt}; fi\0"
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                        0x80280000
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
-#define CONFIG_SYS_INIT_SP_ADDR                0x80200000
-
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 
 /* On Apalis iMX8 USDHC1 is eMMC, USDHC2 is 8-bit and USDHC3 is 4-bit MMC/SD */
-#define CONFIG_SYS_FSL_USDHC_NUM       3
-
-#define CONFIG_SYS_BOOTM_LEN           SZ_64M /* Increase max gunzip size */
+#define CFG_SYS_FSL_USDHC_NUM  3
 
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN          ((CONFIG_ENV_SIZE + (32 * 1024)) * 1024)
-
-#define CONFIG_SYS_SDRAM_BASE          0x80000000
+#define CFG_SYS_SDRAM_BASE             0x80000000
 #define PHYS_SDRAM_1                   0x80000000
 #define PHYS_SDRAM_2                   0x880000000
 #define PHYS_SDRAM_1_SIZE              SZ_2G           /* 2 GB */
 #define PHYS_SDRAM_2_SIZE              SZ_2G           /* 2 GB */
 
-/* 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)
-
-/* Generic Timer Definitions */
-#define COUNTER_FREQUENCY              8000000 /* 8MHz */
-
 #endif /* __APALIS_IMX8_H */