SHARE
TWEET

Untitled

a guest Jul 8th, 2017 94 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. ---
  2.  board/freescale/mx6qsabreauto/mx6qsabreauto.c | 9 ++++++++-
  3.  configs/mx6dlsabreauto_defconfig              | 1 -
  4.  configs/mx6qpsabreauto_defconfig              | 1 -
  5.  configs/mx6qsabreauto_defconfig               | 1 -
  6.  include/configs/mx6qsabreauto.h               | 2 ++
  7.  5 files changed, 10 insertions(+), 4 deletions(-)
  8.  
  9. diff --git a/board/freescale/mx6qsabreauto/mx6qsabreauto.c b/board/freescale/mx6qsabreauto/mx6qsabreauto.c
  10. index 51bbbc4..69d50ef 100644
  11. --- a/board/freescale/mx6qsabreauto/mx6qsabreauto.c
  12. +++ b/board/freescale/mx6qsabreauto/mx6qsabreauto.c
  13. @@ -171,6 +171,7 @@ static int port_exp_direction_output(unsigned gpio, int value)
  14.     return 0;
  15.  }
  16.  
  17. +#ifdef CONFIG_MTD_NOR_FLASH
  18.  static iomux_v3_cfg_t const eimnor_pads[] = {
  19.     MX6_PAD_EIM_D16__EIM_DATA16 | MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
  20.     MX6_PAD_EIM_D17__EIM_DATA17 | MUX_PAD_CTRL(WEIM_NOR_PAD_CTRL),
  21. @@ -266,6 +267,7 @@ static void setup_iomux_eimnor(void)
  22.  
  23.     eimnor_cs_setup();
  24.  }
  25. +#endif
  26.  
  27.  static void setup_iomux_enet(void)
  28.  {
  29. @@ -546,8 +548,10 @@ int board_early_init_f(void)
  30.  #ifdef CONFIG_NAND_MXS
  31.     setup_gpmi_nand();
  32.  #endif
  33. -   eim_clk_setup();
  34.  
  35. +#ifdef CONFIG_MTD_NOR_FLASH
  36. +   eim_clk_setup();
  37. +#endif
  38.     return 0;
  39.  }
  40.  
  41. @@ -570,7 +574,10 @@ int board_init(void)
  42.  #ifdef CONFIG_VIDEO_IPUV3
  43.     setup_display();
  44.  #endif
  45. +
  46. +#ifdef CONFIG_MTD_NOR_FLASH
  47.     setup_iomux_eimnor();
  48. +#endif
  49.     return 0;
  50.  }
  51.  
  52. diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig
  53. index ba5ab8a..b81b5ee 100644
  54. --- a/configs/mx6dlsabreauto_defconfig
  55. +++ b/configs/mx6dlsabreauto_defconfig
  56. @@ -29,7 +29,6 @@ CONFIG_CMD_FAT=y
  57.  CONFIG_CMD_FS_GENERIC=y
  58.  CONFIG_DFU_MMC=y
  59.  CONFIG_DFU_SF=y
  60. -CONFIG_MTD_NOR_FLASH=y
  61.  CONFIG_SPI_FLASH=y
  62.  CONFIG_SPI_FLASH_STMICRO=y
  63.  CONFIG_USB=y
  64. diff --git a/configs/mx6qpsabreauto_defconfig b/configs/mx6qpsabreauto_defconfig
  65. index 96a248e..8f2c8c5 100644
  66. --- a/configs/mx6qpsabreauto_defconfig
  67. +++ b/configs/mx6qpsabreauto_defconfig
  68. @@ -28,7 +28,6 @@ CONFIG_CMD_FAT=y
  69.  CONFIG_CMD_FS_GENERIC=y
  70.  CONFIG_DFU_MMC=y
  71.  CONFIG_DFU_SF=y
  72. -CONFIG_MTD_NOR_FLASH=y
  73.  CONFIG_SPI_FLASH=y
  74.  CONFIG_SPI_FLASH_STMICRO=y
  75.  CONFIG_USB=y
  76. diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig
  77. index 015207d..2281522 100644
  78. --- a/configs/mx6qsabreauto_defconfig
  79. +++ b/configs/mx6qsabreauto_defconfig
  80. @@ -29,7 +29,6 @@ CONFIG_CMD_FAT=y
  81.  CONFIG_CMD_FS_GENERIC=y
  82.  CONFIG_DFU_MMC=y
  83.  CONFIG_DFU_SF=y
  84. -CONFIG_MTD_NOR_FLASH=y
  85.  CONFIG_SPI_FLASH=y
  86.  CONFIG_SPI_FLASH_STMICRO=y
  87.  CONFIG_USB=y
  88. diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
  89. index ef7675c..63f3e96 100644
  90. --- a/include/configs/mx6qsabreauto.h
  91. +++ b/include/configs/mx6qsabreauto.h
  92. @@ -29,6 +29,7 @@
  93.  
  94.  #include "mx6sabre_common.h"
  95.  
  96. +#ifdef CONFIG_MTD_NOR_FLASH
  97.  #define CONFIG_SYS_FLASH_BASE           WEIM_ARB_BASE_ADDR
  98.  #define CONFIG_SYS_FLASH_SECT_SIZE      (128 * 1024)
  99.  #define CONFIG_SYS_MAX_FLASH_BANKS 1    /* max number of memory banks */
  100. @@ -38,6 +39,7 @@
  101.  #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE /* Use buffered writes*/
  102.  #define CONFIG_SYS_FLASH_EMPTY_INFO
  103.  #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT
  104. +#endif
  105.  
  106.  #define CONFIG_SYS_FSL_USDHC_NUM   2
  107.  #if defined(CONFIG_ENV_IS_IN_MMC)
  108. --
  109. 2.7.4
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
 
Top