From 2949add7ce583fac7c089e8f22fd2e8bc11715ff Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 10 Apr 2019 19:16:57 +0200 Subject: apalis-imx8: clean-up configuration Clean-up configuration moving some stuff from include header file to Kconfig defconfig. Signed-off-by: Max Krummenacher --- configs/apalis-imx8_defconfig | 22 ++++++------ include/configs/apalis-imx8.h | 79 +++++++++++++++---------------------------- 2 files changed, 38 insertions(+), 63 deletions(-) diff --git a/configs/apalis-imx8_defconfig b/configs/apalis-imx8_defconfig index 5113e31184..a4fdc9b3d4 100644 --- a/configs/apalis-imx8_defconfig +++ b/configs/apalis-imx8_defconfig @@ -6,30 +6,32 @@ CONFIG_SMC_FUSE=y CONFIG_TARGET_APALIS_IMX8=y CONFIG_IMX_BOOTAUX=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-apalis" +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_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_SF=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_FAT=y +CONFIG_CMD_EXT4_WRITE=y 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_DM_SPI_FLASH=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_4BYTES_ADDR=y -CONFIG_SPI_FLASH_STMICRO=y CONFIG_NETDEVICES=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX8=y @@ -40,8 +42,6 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_DM_SERIAL=y CONFIG_FSL_LPUART=y -CONFIG_DM_SPI=y -CONFIG_FSL_FSPI=y CONFIG_DM_THERMAL=y CONFIG_IMX_SC_THERMAL=y CONFIG_USB=y diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index 0603d2883e..d23dc11697 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -23,10 +23,10 @@ #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 USDHC3_BASE_ADDR 0x5B030000 +#define CONFIG_SYS_FSL_ESDHC_ADDR 0 +#define USDHC1_BASE_ADDR 0x5B010000 +#define USDHC2_BASE_ADDR 0x5B020000 +#define USDHC3_BASE_ADDR 0x5B030000 #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ #define CONFIG_ENV_OVERWRITE @@ -36,12 +36,12 @@ #define CONFIG_SCSI #define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 +#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 #define CONFIG_CMD_SCSI #define CONFIG_LIBATA -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * CONFIG_SYS_SCSI_MAX_LUN) -#define CONFIG_SYS_SCSI_MAXDEVICE CONFIG_SYS_SCSI_MAX_DEVICE +#define CONFIG_SYS_SCSI_MAX_LUN 1 +#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * CONFIG_SYS_SCSI_MAX_LUN) +#define CONFIG_SYS_SCSI_MAXDEVICE CONFIG_SYS_SCSI_MAX_DEVICE #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_SATA_IMX @@ -53,17 +53,12 @@ #endif #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG -/* FUSE command */ -#define CONFIG_CMD_FUSE - -/* GPIO configs */ -#define CONFIG_MXC_GPIO /* ENET Config */ #define CONFIG_MII #define CONFIG_FEC_MXC -#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_FEC_XCV_TYPE RGMII #define FEC_QUIRK_ENET_MAC #define CONFIG_PHY_GIGE /* Support for 1000BASE-X */ @@ -82,8 +77,6 @@ #define CONFIG_FEC_MXC_PHYADDR 7 #define CONFIG_ETHPRIME "FEC" -#define CONFIG_SUPPORT_RAW_INITRD - #define MEM_LAYOUT_ENV_SETTINGS \ "fdt_addr_r=0x84000000\0" \ "kernel_addr_r=0x82000000\0" \ @@ -98,19 +91,12 @@ "m4boot_0=run loadm4image_0; dcache flush; bootaux ${loadaddr} 0\0" \ "m4boot_1=run loadm4image_1; dcache flush; bootaux ${loadaddr} 1\0" \ -#ifdef CONFIG_NAND_BOOT -#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs) " -#else -#define MFG_NAND_PARTITION "" -#endif - #define CONFIG_MFG_ENV_SETTINGS \ "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ "rdinit=/linuxrc " \ "g_mass_storage.stall=0 g_mass_storage.removable=1 " \ "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\ "g_mass_storage.iSerialNumber=\"\" "\ - MFG_NAND_PARTITION \ "video=imxdpufb5:off video=imxdpufb6:off video=imxdpufb7:off " \ "clk_ignore_unused "\ "\0" \ @@ -181,6 +167,7 @@ "booti; " \ "fi;\0" +#undef CONFIG_BOOTCOMMAND #define CONFIG_BOOTCOMMAND \ "mmc dev ${mmcdev}; if mmc rescan; then " \ "if run loadbootscript; then " \ @@ -197,15 +184,17 @@ #define CONFIG_LOADADDR 0x80280000 #define CONFIG_SYS_TEXT_BASE 0x80020000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_SYS_INIT_SP_ADDR 0x80200000 +#define CONFIG_SYS_INIT_SP_ADDR 0x80200000 +#define CONFIG_SYS_MEMTEST_START 0x88000000 +#define CONFIG_SYS_MEMTEST_END 0x89000000 /* Default environment is in SD */ -#define CONFIG_ENV_SIZE 0x1000 +#define CONFIG_ENV_SIZE 0x2000 -#define CONFIG_ENV_OFFSET (64 * SZ_64K) +#define CONFIG_ENV_OFFSET (64 * SZ_64K) #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 @@ -229,11 +218,10 @@ #define CONFIG_BAUDRATE 115200 /* Monitor Command Prompt */ -#define CONFIG_HUSH_PARSER -#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -#define CONFIG_SYS_CBSIZE 1024 -#define CONFIG_SYS_MAXARGS 64 -#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE +#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " +#define CONFIG_SYS_CBSIZE 2048 +#define CONFIG_SYS_MAXARGS 64 +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16) @@ -242,22 +230,9 @@ #define CONFIG_IMX_SMMU -/* MT35XU512ABA1G12 has only one Die, so QSPI0 B won't work */ -#ifdef CONFIG_FSL_FSPI -#define CONFIG_SF_DEFAULT_BUS 0 -#define CONFIG_SF_DEFAULT_CS 0 -#define CONFIG_SF_DEFAULT_SPEED 40000000 -#define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -#define FSL_FSPI_FLASH_SIZE SZ_64M -#define FSL_FSPI_FLASH_NUM 1 -#define FSPI0_BASE_ADDR 0x5d120000 -#define FSPI0_AMBA_BASE 0 -#define CONFIG_SYS_FSL_FSPI_AHB -#endif - /* USB Config */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 +#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* USB OTG controller configs */ #ifdef CONFIG_USB_EHCI_HCD @@ -271,10 +246,6 @@ #define CONFIG_USBD_HS #endif -#if defined(CONFIG_ANDROID_SUPPORT) -#include "imx8qm_arm2_android.h" -#endif - /* Framebuffer */ #ifdef CONFIG_VIDEO #define CONFIG_VIDEO_IMXDPUV1 @@ -288,7 +259,11 @@ #endif #define CONFIG_OF_SYSTEM_SETUP -#define BOOTAUX_RESERVED_MEM_BASE 0x88000000 -#define BOOTAUX_RESERVED_MEM_SIZE 0x08000000 /* Reserve from second 128MB */ +#define BOOTAUX_RESERVED_MEM_BASE 0x88000000 +#define BOOTAUX_RESERVED_MEM_SIZE 0x08000000 /* Reserve from second 128MB */ + +#if defined(CONFIG_ANDROID_SUPPORT) +#include "imx8qm_arm2_android.h" +#endif #endif /* __APALIS_IMX8QM_H */ -- cgit v1.2.3