diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2018-11-29 14:12:47 +0100 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2018-11-29 14:12:47 +0100 |
commit | eb0ed0e4283385700db1e5080d78f9a2684f98a5 (patch) | |
tree | 58f0217456b154f6ce9578ccd277e64d7b2a545c | |
parent | 3a5cc1cf85b8e22da78d794a2d71c03490f500b6 (diff) |
apalis-imx8: forward port to 2018.03toradex_imx_v2018.03_4.14.62_1.0.0_beta-bringup
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r-- | board/toradex/apalis-imx8/apalis-imx8.c | 16 | ||||
-rw-r--r-- | configs/apalis-imx8_defconfig | 16 | ||||
-rw-r--r-- | include/configs/apalis-imx8.h | 9 |
3 files changed, 16 insertions, 25 deletions
diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c index fc52fabd6d..2246d27e5a 100644 --- a/board/toradex/apalis-imx8/apalis-imx8.c +++ b/board/toradex/apalis-imx8/apalis-imx8.c @@ -9,7 +9,6 @@ #include <netdev.h> #include <fsl_ifc.h> #include <fdt_support.h> -#include <libfdt.h> #include <environment.h> #include <fsl_esdhc.h> #include <i2c.h> @@ -17,14 +16,15 @@ #include <asm/io.h> #include <asm/gpio.h> #include <asm/arch/clock.h> -#include <asm/imx-common/sci/sci.h> +#include <asm/mach-imx/sci/sci.h> #include <asm/arch/imx8-pins.h> #include <dm.h> #include <imx8_hsio.h> +#include <linux/libfdt.h> #include <usb.h> #include <asm/arch/iomux.h> #include <asm/arch/sys_proto.h> -#include <asm/imx-common/video.h> +#include <asm/mach-imx/video.h> #include <asm/arch/video_common.h> #include <power-domain.h> @@ -440,7 +440,7 @@ int mmc_map_to_kernel_blk(int dev_no) static int check_mmc_autodetect(void) { - char *autodetect_str = getenv("mmcautodetect"); + char *autodetect_str = env_get("mmcautodetect"); if ((autodetect_str != NULL) && (strcmp(autodetect_str, "yes") == 0)) { @@ -459,12 +459,12 @@ void board_late_mmc_env_init(void) if (!check_mmc_autodetect()) return; - setenv_ulong("mmcdev", dev_no); + env_set_ulong("mmcdev", dev_no); /* Set mmcblk env */ sprintf(mmcblk, "/dev/mmcblk%dp2 rootwait rw", mmc_map_to_kernel_blk(dev_no)); - setenv("mmcroot", mmcblk); + env_set("mmcroot", mmcblk); sprintf(cmd, "mmc dev %d", dev_no); run_command(cmd, 0); @@ -473,8 +473,8 @@ void board_late_mmc_env_init(void) int board_late_init(void) { #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - setenv("board_name", "ARM2"); - setenv("board_rev", "iMX8QM"); + env_set("board_name", "ARM2"); + env_set("board_rev", "iMX8QM"); #endif #ifdef CONFIG_ENV_IS_IN_MMC diff --git a/configs/apalis-imx8_defconfig b/configs/apalis-imx8_defconfig index 6e7500145e..b86938ffc0 100644 --- a/configs/apalis-imx8_defconfig +++ b/configs/apalis-imx8_defconfig @@ -1,31 +1,30 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8=y +CONFIG_SYS_TEXT_BASE=0x80020000 CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_SMC_FUSE=y CONFIG_TARGET_APALIS_IMX8=y CONFIG_IMX_BOOTAUX=y -CONFIG_VIDEO=y CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-apalis" CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y # CONFIG_CMD_IMPORTENV is not set +CONFIG_CMD_GPIO=y +CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y -CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y -CONFIG_CMD_GPIO=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y -# CONFIG_BLK is not set CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_IMX_LPI2C=y CONFIG_DM_MMC=y -# CONFIG_DM_MMC_OPS is not set CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_4BYTES_ADDR=y @@ -50,10 +49,11 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_G_DNL_MANUFACTURER="FSL" -CONFIG_G_DNL_VENDOR_NUM=0x0525 -CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 +CONFIG_VIDEO=y CONFIG_VIDEO_IMX_HDP_LOAD=y # CONFIG_EFI_LOADER is not set diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index ec83779fc1..2cc6ae6fe4 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -232,16 +232,13 @@ #define CONFIG_BAUDRATE 115200 /* Monitor Command Prompt */ -#define CONFIG_SYS_LONGHELP #define CONFIG_HUSH_PARSER #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_MAXARGS 64 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ sizeof(CONFIG_SYS_PROMPT) + 16) -#define CONFIG_CMDLINE_EDITING /* Generic Timer Definitions */ #define COUNTER_FREQUENCY 8000000 /* 8MHz */ @@ -265,11 +262,6 @@ #ifdef CONFIG_CMD_USB #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -/* USB 3.0 controller configs */ -#ifdef CONFIG_USB_XHCI_IMX8 -#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 -#endif - /* USB OTG controller configs */ #ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_HOST_ETHER @@ -280,7 +272,6 @@ #ifdef CONFIG_USB_GADGET #define CONFIG_USBD_HS -#define CONFIG_USB_FUNCTION_MASS_STORAGE #endif #if defined(CONFIG_ANDROID_SUPPORT) |