diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-10-15 11:29:03 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-10-15 11:29:03 +0200 |
| commit | bf4f25d3b67be6d2005f39f3775288d6306d06ca (patch) | |
| tree | 2db884a548dbf1ea38e7809f9e11a390f5ce9dd3 | |
| parent | 2de968a4c28aaeaf002a7f4cd24a11369d944a8b (diff) | |
apalis-imx8/x/colibri-imx8qxp: skip resource checking
Define CONFIG_SKIP_RESOURCE_CHECING which skips the downstream
proprietary resource checking preventing us from booting any kind of
mainline device tree based Linux kernels.
While at it also fix some indentations/whitespaces.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
| -rw-r--r-- | include/configs/apalis-imx8.h | 14 | ||||
| -rw-r--r-- | include/configs/apalis-imx8x.h | 2 | ||||
| -rw-r--r-- | include/configs/colibri-imx8qxp.h | 22 |
3 files changed, 22 insertions, 16 deletions
diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index 25dd5367e2..9d926481ce 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -87,17 +87,19 @@ /* Enable Distro Boot */ #ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 1) \ - func(MMC, mmc, 2) \ - func(MMC, mmc, 0) \ - func(USB, usb, 0) \ - func(DHCP, dhcp, na) + func(MMC, mmc, 1) \ + func(MMC, mmc, 2) \ + func(MMC, mmc, 0) \ + func(USB, usb, 0) \ + func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> #undef CONFIG_ISO_PARTITION #else #define BOOTENV #endif +#define CONFIG_SKIP_RESOURCE_CHECING + #define FDT_FILE "fsl-imx8qm-apalis-eval.dtb" /* Initial environment variables */ @@ -150,7 +152,7 @@ #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 /* On Apalis iMX8 USDHC1 is eMMC, USDHC2 is 8-bit SD and USDHC3 is 4-bit SD */ -#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 eMMC */ +#define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 eMMC */ #define CONFIG_SYS_FSL_USDHC_NUM 3 #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ diff --git a/include/configs/apalis-imx8x.h b/include/configs/apalis-imx8x.h index ed0cc10b24..0f0db299fa 100644 --- a/include/configs/apalis-imx8x.h +++ b/include/configs/apalis-imx8x.h @@ -81,6 +81,8 @@ #define BOOTENV #endif +#define CONFIG_SKIP_RESOURCE_CHECING + #define FDT_FILE "fsl-imx8qxp-apalis-eval.dtb" /* Initial environment variables */ diff --git a/include/configs/colibri-imx8qxp.h b/include/configs/colibri-imx8qxp.h index d2a1468ebe..de8d09271e 100644 --- a/include/configs/colibri-imx8qxp.h +++ b/include/configs/colibri-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 @@ -37,7 +37,7 @@ #define CONFIG_FEC_MXC_PHYADDR 2 #define CONFIG_ETHPRIME "eth0" -#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_FEC_XCV_TYPE RMII #define FEC_QUIRK_ENET_MAC #define CONFIG_IP_DEFRAG @@ -69,16 +69,18 @@ /* 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 <config_distro_bootcmd.h> #undef CONFIG_ISO_PARTITION #else #define BOOTENV #endif +#define CONFIG_SKIP_RESOURCE_CHECING + #define FDT_FILE "fsl-imx8qxp-colibri-eval-v3.dtb" /* Initial environment variables */ @@ -110,7 +112,7 @@ /* Link Definitions */ #define CONFIG_LOADADDR 0x80280000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_INIT_SP_ADDR 0x80200000 @@ -127,7 +129,7 @@ #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 /* On Colibri 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 */ |