Commit a43a70e59763ec0c019dbbfc73a25c614501bf69

Authored by Allen Xu
1 parent e96969162f

MLK-9854 mtd index change for imx6 sabreauto

Modified the mtd index for imx6 sabreauto board, split the parallel nor
to two partitions and the NAND index could be align with imx6sx board for
mfgtool download.

Signed-off-by: Allen Xu <b45815@freescale.com>

Showing 1 changed file with 7 additions and 0 deletions Inline Diff

include/configs/mx6qsabreauto.h
1 /* 1 /*
2 * Copyright (C) 2012-2014 Freescale Semiconductor, Inc. 2 * Copyright (C) 2012-2014 Freescale Semiconductor, Inc.
3 * 3 *
4 * Configuration settings for the Freescale i.MX6Q SabreAuto board. 4 * Configuration settings for the Freescale i.MX6Q SabreAuto board.
5 * 5 *
6 * SPDX-License-Identifier: GPL-2.0+ 6 * SPDX-License-Identifier: GPL-2.0+
7 */ 7 */
8 8
9 #ifndef __MX6QSABREAUTO_CONFIG_H 9 #ifndef __MX6QSABREAUTO_CONFIG_H
10 #define __MX6QSABREAUTO_CONFIG_H 10 #define __MX6QSABREAUTO_CONFIG_H
11 11
12 #define CONFIG_MACH_TYPE 3529 12 #define CONFIG_MACH_TYPE 3529
13 #define CONFIG_MXC_UART_BASE UART4_BASE 13 #define CONFIG_MXC_UART_BASE UART4_BASE
14 #define CONFIG_CONSOLE_DEV "ttymxc3" 14 #define CONFIG_CONSOLE_DEV "ttymxc3"
15 #define CONFIG_MMCROOT "/dev/mmcblk2p2" /* SDHC3 */ 15 #define CONFIG_MMCROOT "/dev/mmcblk2p2" /* SDHC3 */
16 16
17 #define CONFIG_SYS_USE_NAND 17 #define CONFIG_SYS_USE_NAND
18 18
19 #include "mx6sabre_common.h" 19 #include "mx6sabre_common.h"
20 #include <asm/imx-common/gpio.h> 20 #include <asm/imx-common/gpio.h>
21 21
22 #undef CONFIG_MFG_NAND_PARTITION
23 #ifdef CONFIG_SYS_BOOT_NAND
24 #define CONFIG_MFG_NAND_PARTITION "mtdparts=8000000.nor:1m(boot),-(rootfs)\\\\;gpmi-nand:16m(boot),16m(kernel),16m(dtb),-(rootfs) "
25 #else
26 #define CONFIG_MFG_NAND_PARTITION ""
27 #endif
28
22 /*Since the pin conflicts on EIM D18, disable the USB host if the NOR flash is enabled */ 29 /*Since the pin conflicts on EIM D18, disable the USB host if the NOR flash is enabled */
23 #if !defined(CONFIG_SYS_USE_SPINOR) && !defined(CONFIG_SYS_USE_EIMNOR) 30 #if !defined(CONFIG_SYS_USE_SPINOR) && !defined(CONFIG_SYS_USE_EIMNOR)
24 /* USB Configs */ 31 /* USB Configs */
25 #define CONFIG_CMD_USB 32 #define CONFIG_CMD_USB
26 #define CONFIG_USB_EHCI 33 #define CONFIG_USB_EHCI
27 #define CONFIG_USB_EHCI_MX6 34 #define CONFIG_USB_EHCI_MX6
28 #define CONFIG_USB_STORAGE 35 #define CONFIG_USB_STORAGE
29 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET 36 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
30 #define CONFIG_USB_HOST_ETHER 37 #define CONFIG_USB_HOST_ETHER
31 #define CONFIG_USB_ETHER_ASIX 38 #define CONFIG_USB_ETHER_ASIX
32 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) 39 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
33 #define CONFIG_MXC_USB_FLAGS 0 40 #define CONFIG_MXC_USB_FLAGS 0
34 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* Enabled USB controller number */ 41 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* Enabled USB controller number */
35 42
36 /* MAX7310 configs*/ 43 /* MAX7310 configs*/
37 #define CONFIG_MAX7310_IOEXP 44 #define CONFIG_MAX7310_IOEXP
38 #define CONFIG_IOEXP_DEVICES_NUM 3 45 #define CONFIG_IOEXP_DEVICES_NUM 3
39 #define CONFIG_IOEXP_DEV_PINS_NUM 8 46 #define CONFIG_IOEXP_DEV_PINS_NUM 8
40 #endif 47 #endif
41 48
42 #define CONFIG_SYS_FSL_USDHC_NUM 2 49 #define CONFIG_SYS_FSL_USDHC_NUM 2
43 #define CONFIG_SYS_MMC_ENV_DEV 1 /* SDHC3 */ 50 #define CONFIG_SYS_MMC_ENV_DEV 1 /* SDHC3 */
44 #define CONFIG_SYS_MMC_ENV_PART 0 /* user partition */ 51 #define CONFIG_SYS_MMC_ENV_PART 0 /* user partition */
45 52
46 #ifdef CONFIG_SYS_USE_SPINOR 53 #ifdef CONFIG_SYS_USE_SPINOR
47 #define CONFIG_SF_DEFAULT_CS (1|(IMX_GPIO_NR(3, 19)<<8)) 54 #define CONFIG_SF_DEFAULT_CS (1|(IMX_GPIO_NR(3, 19)<<8))
48 #endif 55 #endif
49 56
50 #endif /* __MX6QSABREAUTO_CONFIG_H */ 57 #endif /* __MX6QSABREAUTO_CONFIG_H */
51 58