From 25aaf8bf8c38f2d2ae1ba4f261c3ec1d40b2e7c8 Mon Sep 17 00:00:00 2001 From: Philippe Schenker Date: Tue, 24 Sep 2019 10:41:54 +0200 Subject: include: apalis-imx8qxp.h: new fdt_file name and delete earlycon This commit uses the correct devicetree filename and makes sure, it doesn't use earlycon by default while at it make sure to use only tabs. Signed-off-by: Philippe Schenker --- include/configs/apalis-imx8qxp.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/configs/apalis-imx8qxp.h b/include/configs/apalis-imx8qxp.h index 099bdb4f2a..ed0cc10b24 100644 --- a/include/configs/apalis-imx8qxp.h +++ b/include/configs/apalis-imx8qxp.h @@ -18,9 +18,9 @@ #define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC -#define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#define USDHC1_BASE_ADDR 0x5B010000 -#define USDHC2_BASE_ADDR 0x5B020000 +#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 @@ -71,17 +71,17 @@ /* Enable Distro Boot */ #ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 1) \ - func(MMC, mmc, 0) \ - func(USB, usb, 0) \ - func(DHCP, dhcp, na) + func(MMC, mmc, 1) \ + func(MMC, mmc, 0) \ + func(USB, usb, 0) \ + func(DHCP, dhcp, na) #include #undef CONFIG_ISO_PARTITION #else #define BOOTENV #endif -#define FDT_FILE "fsl-imx8qxp-apalis-eval-v3.dtb" +#define FDT_FILE "fsl-imx8qxp-apalis-eval.dtb" /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -93,7 +93,7 @@ "script=boot.scr\0" \ "image=Image\0" \ "panel=NULL\0" \ - "console=ttyLP1,115200 earlycon=lpuart32,0x5a040000,115200\0" \ + "console=ttyLP1,115200\0" \ "fdt_addr=0x83000000\0" \ "boot_fdt=try\0" \ "fdt_file=" FDT_FILE "\0" \ @@ -129,7 +129,7 @@ #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 /* On Apalis iMX8X USDHC1 is eMMC and USDHC2 is 4-bit SD */ -#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 eMMC */ +#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 eMMC */ #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ -- cgit v1.2.3