Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 5ea6d7c8fc05ad73d930a6fdb430188ff17a70e5

Authored by Troy Kisky
Committed by Stefano Babic
1 parent 20332a066a
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

mx6: use CONFIG_MX6 instead of CONFIG_MX6Q 

Use CONFIG_MX6 when the particular processor
variant isn't important.

Reserve the use of CONFIG_MX6Q to
specifically test for quad cores variant.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>

Showing 5 changed files with 7 additions and 4 deletions Side-by-side Diff

drivers/gpio/mxc_gpio.c
Diff comments   View file @ 5ea6d7c
... ... @@ -42,14 +42,14 @@
42 42 [1] = GPIO2_BASE_ADDR,
43 43 [2] = GPIO3_BASE_ADDR,
44 44 #if defined(CONFIG_MX25) || defined(CONFIG_MX27) || defined(CONFIG_MX51) || \
45   - defined(CONFIG_MX53) || defined(CONFIG_MX6Q)
  45 + defined(CONFIG_MX53) || defined(CONFIG_MX6)
46 46 [3] = GPIO4_BASE_ADDR,
47 47 #endif
48   -#if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6Q)
  48 +#if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6)
49 49 [4] = GPIO5_BASE_ADDR,
50 50 [5] = GPIO6_BASE_ADDR,
51 51 #endif
52   -#if defined(CONFIG_MX53) || defined(CONFIG_MX6Q)
  52 +#if defined(CONFIG_MX53) || defined(CONFIG_MX6)
53 53 [6] = GPIO7_BASE_ADDR,
54 54 #endif
55 55 };
drivers/video/ipu_regs.h
Diff comments   View file @ 5ea6d7c
... ... @@ -55,7 +55,7 @@
55 55 #define IPU_TPM_REG_BASE 0x01060000
56 56 #define IPU_DC_TMPL_REG_BASE 0x01080000
57 57 #define IPU_ISP_TBPR_REG_BASE 0x010C0000
58   -#elif defined(CONFIG_MX6Q)
  58 +#elif defined(CONFIG_MX6)
59 59 #define IPU_CPMEM_REG_BASE 0x00100000
60 60 #define IPU_LUT_REG_BASE 0x00120000
61 61 #define IPU_SRM_REG_BASE 0x00140000
include/configs/mx6qarm2.h
Diff comments   View file @ 5ea6d7c
... ... @@ -22,6 +22,7 @@
22 22 #ifndef __CONFIG_H
23 23 #define __CONFIG_H
24 24  
  25 +#define CONFIG_MX6
25 26 #define CONFIG_MX6Q
26 27 #define CONFIG_DISPLAY_CPUINFO
27 28 #define CONFIG_DISPLAY_BOARDINFO
include/configs/mx6qsabre_common.h
Diff comments   View file @ 5ea6d7c
... ... @@ -17,6 +17,7 @@
17 17 #ifndef __MX6QSABRE_COMMON_CONFIG_H
18 18 #define __MX6QSABRE_COMMON_CONFIG_H
19 19  
  20 +#define CONFIG_MX6
20 21 #define CONFIG_MX6Q
21 22 #define CONFIG_DISPLAY_CPUINFO
22 23 #define CONFIG_DISPLAY_BOARDINFO
include/configs/mx6qsabrelite.h
Diff comments   View file @ 5ea6d7c
... ... @@ -22,6 +22,7 @@
22 22 #ifndef __CONFIG_H
23 23 #define __CONFIG_H
24 24  
  25 +#define CONFIG_MX6
25 26 #define CONFIG_MX6Q
26 27 #define CONFIG_DISPLAY_CPUINFO
27 28 #define CONFIG_DISPLAY_BOARDINFO