Merge tag 'dm-pull-18mar22' of https://source.denx.de/u-boot/custodians/u-boot-dm...

[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 ce56814..c87bcd4 100644 (file)
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -9,14 +9,9 @@
 #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 USDHC1_BASE_ADDR               0x5b010000
 #define USDHC2_BASE_ADDR               0x5b020000
-#define CONFIG_SUPPORT_EMMC_BOOT       /* eMMC specific */
 
 /* Networking */
 #define CONFIG_IPADDR                  192.168.10.2
@@ -53,7 +48,7 @@
        "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" \
+       "mmcpart=1\0" \
        "netargs=setenv bootargs console=${console},${baudrate} " \
                "root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp" \
                "\0" \
@@ -71,8 +66,6 @@
 
 #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