diff options
Diffstat (limited to 'include/configs/mx6sll_arm2.h')
| -rw-r--r-- | include/configs/mx6sll_arm2.h | 54 |
1 files changed, 11 insertions, 43 deletions
diff --git a/include/configs/mx6sll_arm2.h b/include/configs/mx6sll_arm2.h index 9c5df2d..b25e7ed 100644 --- a/include/configs/mx6sll_arm2.h +++ b/include/configs/mx6sll_arm2.h @@ -11,26 +11,10 @@ #include "mx6_common.h" -#undef CONFIG_CMD_SET - -/* uncomment for PLUGIN mode support */ -/* #define CONFIG_USE_PLUGIN */ - -/* uncomment for SECURE mode support */ -/* #define CONFIG_SECURE_BOOT */ - -#ifdef CONFIG_SECURE_BOOT -#ifndef CONFIG_CSF_SIZE -#define CONFIG_CSF_SIZE 0x4000 -#endif -#endif /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M) -#define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_BOARD_LATE_INIT - #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART1_BASE @@ -40,19 +24,24 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 /* USDHC1 */ /* I2C Configs */ -#define CONFIG_CMD_I2C +#ifndef CONFIG_DM_I2C #define CONFIG_SYS_I2C +#endif +#ifdef CONFIG_CMD_I2C #define CONFIG_SYS_I2C_MXC #define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ #define CONFIG_SYS_I2C_SPEED 100000 +#endif /* PMIC */ +#ifndef CONFIG_DM_PMIC #define CONFIG_POWER #define CONFIG_POWER_I2C #define CONFIG_POWER_PFUZE100 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#endif #define CONFIG_MFG_ENV_SETTINGS \ "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ @@ -74,7 +63,7 @@ "console=ttymxc0\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ - "fdt_file=imx6sll-lpddr3-arm2.dtb\0" \ + "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_addr=0x83000000\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ @@ -145,7 +134,6 @@ "else run netboot; fi" /* Miscellaneous configurable options */ -#define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + SZ_128M) @@ -174,18 +162,16 @@ #define CONFIG_SYS_MMC_ENV_PART 0 /* user partition */ #define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */ -#ifdef CONFIG_SYS_BOOT_SPINOR -#define CONFIG_SYS_USE_SPINOR +#ifdef CONFIG_SPI_BOOT #define CONFIG_ENV_IS_IN_SPI_FLASH #else #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_VIDEO #endif #if defined(CONFIG_ENV_IS_IN_MMC) -#define CONFIG_ENV_OFFSET (12 * SZ_64K) +#define CONFIG_ENV_OFFSET (13 * SZ_64K) #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH) -#define CONFIG_ENV_OFFSET (768 * 1024) +#define CONFIG_ENV_OFFSET (864 * 1024) #define CONFIG_ENV_SECT_SIZE (64 * 1024) #define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS #define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS @@ -193,33 +179,19 @@ #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #endif -/* Network */ -#define CONFIG_CMD_PING -#define CONFIG_CMD_DHCP - /* USB Configs */ -#define CONFIG_CMD_USB #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI -#define CONFIG_USB_EHCI_MX6 -#define CONFIG_USB_STORAGE -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX #define CONFIG_USB_ETHER_RTL8152 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #endif #define CONFIG_IMX_THERMAL #define CONFIG_IOMUX_LPSR -#ifdef CONFIG_SYS_USE_SPINOR -#define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_STMICRO +#ifdef CONFIG_CMD_SF #define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_SPEED 20000000 @@ -228,12 +200,8 @@ #endif #ifdef CONFIG_VIDEO -#define CONFIG_CFB_CONSOLE #define CONFIG_VIDEO_MXS #define CONFIG_VIDEO_LOGO -#define CONFIG_VIDEO_SW_CURSOR -#define CONFIG_VGA_AS_SINGLE_DEVICE -#define CONFIG_SYS_CONSOLE_IS_IN_ENV #define CONFIG_SPLASH_SCREEN #define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_CMD_BMP |