diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-03-20 10:01:24 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-03-20 10:01:24 +0100 |
| commit | 5f1c4772bb9124f18263fe8d3c73b1aa42e79745 (patch) | |
| tree | 91ccaa8e0ff98eb4471e788948f03f42fc14063c | |
| parent | 2d4dc6d01f2ce471a5cb6fa5e4ce3ffa2682e13d (diff) | |
colibri-imx8qxp: clean-up configuration
Clean-up configuration moving some stuff from include header file to
Kconfig defconfig.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
| -rw-r--r-- | configs/colibri-imx8qxp_defconfig | 17 | ||||
| -rw-r--r-- | include/configs/colibri-imx8qxp.h | 8 |
2 files changed, 9 insertions, 16 deletions
diff --git a/configs/colibri-imx8qxp_defconfig b/configs/colibri-imx8qxp_defconfig index 25f0a60527..fda5df781e 100644 --- a/configs/colibri-imx8qxp_defconfig +++ b/configs/colibri-imx8qxp_defconfig @@ -6,32 +6,31 @@ CONFIG_SMC_FUSE=y CONFIG_TARGET_COLIBRI_IMX8QXP=y CONFIG_IMX_BOOTAUX=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-colibri" +CONFIG_DISTRO_DEFAULTS=y +CONFIG_FIT=y CONFIG_BOOTDELAY=3 +CONFIG_LOG=y CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMPORTENV is not set CONFIG_CMD_MEMTEST=y +CONFIG_CMD_CLK=y +CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y -CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y -CONFIG_EFI_PARTITION=y -# CONFIG_PARTITION_UUIDS is not set CONFIG_ENV_IS_IN_MMC=y +CONFIG_CPU=y CONFIG_DM_GPIO=y +CONFIG_MXC_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_IMX_LPI2C=y +CONFIG_MISC=y CONFIG_DM_MMC=y CONFIG_NETDEVICES=y CONFIG_PINCTRL=y diff --git a/include/configs/colibri-imx8qxp.h b/include/configs/colibri-imx8qxp.h index 46dfaac81b..4a5b2b1fd2 100644 --- a/include/configs/colibri-imx8qxp.h +++ b/include/configs/colibri-imx8qxp.h @@ -32,11 +32,6 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG -/* FUSE command */ -#define CONFIG_CMD_FUSE - -/* GPIO configs */ -#define CONFIG_MXC_GPIO /* ENET Config */ #define CONFIG_MII @@ -61,8 +56,6 @@ #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_SERVERIP 192.168.10.1 -#define CONFIG_SUPPORT_RAW_INITRD - #define MEM_LAYOUT_ENV_SETTINGS \ "fdt_addr_r=0x84000000\0" \ "kernel_addr_r=0x82000000\0" \ @@ -161,6 +154,7 @@ "fi;\0" \ "nfsboot=run netargs;dhcp ${loadaddr} ${image}; tftp ${fdt_addr} colibri-imx8qxp/${fdt_file}; booti ${loadaddr} - ${fdt_addr}\0" +#undef CONFIG_BOOTCOMMAND #define CONFIG_BOOTCOMMAND \ "mmc dev ${mmcdev}; if mmc rescan; then " \ "if run loadbootscript; then " \ |