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

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

diff --git a/include/configs/apalis-imx8x.h b/include/configs/apalis-imx8x.h
index cd00223..71a80f3 100644 (file)
--- a/include/configs/apalis-imx8x.h
+++ b/include/configs/apalis-imx8x.h
@@ -10,12 +10,9 @@
 #include <linux/sizes.h>
 #include <linux/stringify.h>
 
-#define CONFIG_REMAKE_ELF
-
 #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_IPADDR                  192.168.10.2
 #define CONFIG_NETMASK                 255.255.255.0
@@ -78,7 +75,7 @@
        "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" \
+       "mmcpart=1\0" \
        "netargs=setenv bootargs ${consoleargs} " \
                "root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp " \
                "${vidargs}\0" \
@@ -100,8 +97,6 @@
 
 /* Environment in eMMC, before config block at the end of 1st "boot sector" */
 
-#define CONFIG_SYS_MMC_IMG_LOAD_PART   1
-
 /* On Apalis iMX8X USDHC1 is eMMC, USDHC2 is 4-bit SD */
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 
@@ -114,7 +109,6 @@
 #define PHYS_SDRAM_2_SIZE              0x00000000      /* 0 GB */
 
 /* 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
@@ -128,8 +122,6 @@
 #define CONFIG_FEC_ENET_DEV 0
 #define IMX_FEC_BASE                   0x5b040000
 #define CONFIG_FEC_MXC_PHYADDR          0x4
-#define CONFIG_ETHPRIME                 "eth0"
-#define CONFIG_FEC_XCV_TYPE            RGMII
 #define PHY_ANEG_TIMEOUT 20000
 
 #endif /* __APALIS_IMX8X_H */