MIPS: convert CONFIG_SYS_MIPS_TIMER_FREQ to Kconfig

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

diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index 311ed43..5d6449c 100644 (file)
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -8,24 +8,11 @@
 
 #include <asm/arch/imx-regs.h>
 #include <linux/sizes.h>
-
-#define CONFIG_REMAKE_ELF
-
-#define CONFIG_DISPLAY_BOARDINFO_LATE
+#include <linux/stringify.h>
 
 #define CONFIG_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_OVERWRITE
-
-#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-
-/* Networking */
-#define FEC_QUIRK_ENET_MAC
-
-#define CONFIG_TFTP_TSIZE
 
 #define CONFIG_IPADDR                  192.168.10.2
 #define CONFIG_NETMASK                 255.255.255.0
@@ -61,7 +48,7 @@
 #define BOOTENV_RUN_NET_USB_START ""
 
 #define CONFIG_MFG_ENV_SETTINGS \
-       "mfgtool_args=setenv bootargs console=${console},${baudrate} " \
+       "mfgtool_args=setenv bootargs ${consoleargs} " \
                "rdinit=/linuxrc g_mass_storage.stall=0 " \
                "g_mass_storage.removable=1 g_mass_storage.idVendor=0x066F " \
                "g_mass_storage.idProduct=0x37FF " \
@@ -80,7 +67,8 @@
        M4_BOOT_ENV \
        MEM_LAYOUT_ENV_SETTINGS \
        "boot_file=Image\0" \
-       "console=ttyLP3 earlycon\0" \
+       "boot_script_dhcp=boot.scr\0" \
+       "consoleargs=console=ttyLP3,${baudrate} earlycon\0" \
        "fdt_addr=0x83000000\0" \
        "fdt_file=fsl-imx8qxp-colibri-dsihdmi-eval-v3.dtb\0" \
        "fdtfile=fsl-imx8qxp-colibri-dsihdmi-eval-v3.dtb\0" \
@@ -88,16 +76,10 @@
        "image=Image\0" \
        "initrd_addr=0x83800000\0" \
        "initrd_high=0xffffffffffffffff\0" \
-       "mmcargs=setenv bootargs console=${console},${baudrate} " \
+       "mmcargs=setenv bootargs ${consoleargs} " \
                "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 " \
-               "${vidargs}\0" \
-       "nfsboot=run netargs; dhcp ${loadaddr} ${image}; tftp ${fdt_addr} " \
-               "colibri-imx8x/${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)?; " \
@@ -108,48 +90,19 @@
        "vidargs=video=imxdpufb5:off video=imxdpufb6:off video=imxdpufb7:off\0"
 
 /* Link Definitions */
-#define CONFIG_LOADADDR                        0x80280000
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_LOADADDR
-
-#define CONFIG_SYS_INIT_SP_ADDR                0x80200000
-
-#define CONFIG_SYS_MEMTEST_START       0x88000000
-#define CONFIG_SYS_MEMTEST_END         0x89000000
 
 /* Environment in eMMC, before config block at the end of 1st "boot sector" */
-#define CONFIG_SYS_MMC_ENV_DEV         0       /* USDHC1 eMMC */
-#define CONFIG_SYS_MMC_ENV_PART                1
-
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
 
 /* On Colibri iMX8X USDHC1 is eMMC, USDHC2 is 4-bit SD */
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 
-#define CONFIG_SYS_BOOTM_LEN           SZ_64M /* Increase max gunzip size */
-
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN          ((CONFIG_ENV_SIZE + (32 * 1024)) * 1024)
-
 #define CONFIG_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              0x00000000      /* 0 GB */
 
-/* Serial */
-#define CONFIG_BAUDRATE                        115200
-
-/* Monitor Command Prompt */
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
-#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 */
 
 #define BOOTAUX_RESERVED_MEM_BASE 0x88000000
 #define BOOTAUX_RESERVED_MEM_SIZE SZ_128M /* Reserve from second 128MB */