Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 0167369cff10cc0662052127304f82e1cce8f62f

Authored by York Sun
1 parent 319ed24a8a
Exists in v2017.01-smarct4x and in 25 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, 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-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_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-n7.1.2_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, v2017.01-smarct3x, v2017.01-smarct3x-emmc

powerpc: T1042RDB: Remove macro CONFIG_T1042RDB 

Use TARGET_T1042RDB instead.

Signed-off-by: York Sun <york.sun@nxp.com>

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

board/freescale/t104xrdb/eth.c
Diff comments   View file @ 0167369
... ... @@ -52,7 +52,7 @@
52 52 CONFIG_SYS_SGMII1_PHY_ADDR);
53 53 break;
54 54 #endif
55   -#ifdef CONFIG_T1042RDB
  55 +#ifdef CONFIG_TARGET_T1042RDB
56 56 case PHY_INTERFACE_MODE_SGMII:
57 57 /* T1042RDB doesn't supports SGMII on DTSEC1 & DTSEC2 */
58 58 if ((FM1_DTSEC1 == i) || (FM1_DTSEC2 == i))
configs/T1042RDB_SECURE_BOOT_defconfig
Diff comments   View file @ 0167369
... ... @@ -6,7 +6,7 @@
6 6 CONFIG_FIT_VERBOSE=y
7 7 CONFIG_OF_BOARD_SETUP=y
8 8 CONFIG_OF_STDOUT_VIA_ALIAS=y
9   -CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,T1042RDB"
  9 +CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
10 10 CONFIG_BOOTDELAY=10
11 11 CONFIG_SILENT_CONSOLE=y
12 12 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/T1042RDB_defconfig
Diff comments   View file @ 0167369
... ... @@ -5,7 +5,6 @@
5 5 CONFIG_FIT_VERBOSE=y
6 6 CONFIG_OF_BOARD_SETUP=y
7 7 CONFIG_OF_STDOUT_VIA_ALIAS=y
8   -CONFIG_SYS_EXTRA_OPTIONS="T1042RDB"
9 8 CONFIG_BOOTDELAY=10
10 9 CONFIG_SILENT_CONSOLE=y
11 10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
include/configs/T104xRDB.h
Diff comments   View file @ 0167369
... ... @@ -64,7 +64,7 @@
64 64 #define CONFIG_SYS_FSL_PBL_RCW \
65 65 $(SRCTREE)/board/freescale/t104xrdb/t1042_pi_nand_rcw.cfg
66 66 #endif
67   -#ifdef CONFIG_T1042RDB
  67 +#ifdef CONFIG_TARGET_T1042RDB
68 68 #define CONFIG_SYS_FSL_PBL_RCW \
69 69 $(SRCTREE)/board/freescale/t104xrdb/t1042_nand_rcw.cfg
70 70 #endif
... ... @@ -98,7 +98,7 @@
98 98 #define CONFIG_SYS_FSL_PBL_RCW \
99 99 $(SRCTREE)/board/freescale/t104xrdb/t1042_pi_spi_rcw.cfg
100 100 #endif
101   -#ifdef CONFIG_T1042RDB
  101 +#ifdef CONFIG_TARGET_T1042RDB
102 102 #define CONFIG_SYS_FSL_PBL_RCW \
103 103 $(SRCTREE)/board/freescale/t104xrdb/t1042_spi_rcw.cfg
104 104 #endif
... ... @@ -132,7 +132,7 @@
132 132 #define CONFIG_SYS_FSL_PBL_RCW \
133 133 $(SRCTREE)/board/freescale/t104xrdb/t1042_pi_sd_rcw.cfg
134 134 #endif
135   -#ifdef CONFIG_T1042RDB
  135 +#ifdef CONFIG_TARGET_T1042RDB
136 136 #define CONFIG_SYS_FSL_PBL_RCW \
137 137 $(SRCTREE)/board/freescale/t104xrdb/t1042_sd_rcw.cfg
138 138 #endif
... ... @@ -758,7 +758,7 @@
758 758 #endif
759 759  
760 760 #ifdef CONFIG_FMAN_ENET
761   -#if defined(CONFIG_TARGET_T1040RDB) || defined(CONFIG_T1042RDB)
  761 +#if defined(CONFIG_TARGET_T1040RDB) || defined(CONFIG_TARGET_T1042RDB)
762 762 #define CONFIG_SYS_SGMII1_PHY_ADDR 0x03
763 763 #elif defined(CONFIG_TARGET_T1040D4RDB)
764 764 #define CONFIG_SYS_SGMII1_PHY_ADDR 0x01
... ... @@ -885,7 +885,7 @@
885 885 #define FDTFILE "t1040rdb/t1040rdb.dtb"
886 886 #elif defined(CONFIG_TARGET_T1042RDB_PI)
887 887 #define FDTFILE "t1042rdb_pi/t1042rdb_pi.dtb"
888   -#elif defined(CONFIG_T1042RDB)
  888 +#elif defined(CONFIG_TARGET_T1042RDB)
889 889 #define FDTFILE "t1042rdb/t1042rdb.dtb"
890 890 #elif defined(CONFIG_TARGET_T1040D4RDB)
891 891 #define FDTFILE "t1042rdb/t1040d4rdb.dtb"
scripts/config_whitelist.txt
Diff comments   View file @ 0167369
... ... @@ -7827,7 +7827,6 @@
7827 7827 CONFIG_T1023RDB
7828 7828 CONFIG_T1024RDB
7829 7829 CONFIG_T1040QDS
7830   -CONFIG_T1042RDB
7831 7830 CONFIG_T104XD4RDB
7832 7831 CONFIG_T104xRDB
7833 7832 CONFIG_T2080QDS