Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 9082405d47438b5b417b38f69eb3a31c66669300

Authored by York Sun
Committed by Tom Rini
1 parent 08a37fd13b
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: T1023RDB: Remove macro CONFIG_T1023RDB 

Use TARGET_T1023RDB from Kconfig instead.

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

Showing 11 changed files with 23 additions and 26 deletions Side-by-side Diff

board/freescale/t102xrdb/ddr.c
Diff comments   View file @ 9082405
... ... @@ -136,7 +136,7 @@
136 136 popts->data_bus_width = DDR_DATA_BUS_WIDTH_32;
137 137 #endif
138 138  
139   -#ifdef CONFIG_T1023RDB
  139 +#ifdef CONFIG_TARGET_T1023RDB
140 140 popts->wrlvl_ctl_2 = 0x07070606;
141 141 popts->half_strength_driver_enable = 1;
142 142 popts->cpo_sample = 0x43;
board/freescale/t102xrdb/eth_t102xrdb.c
Diff comments   View file @ 9082405
... ... @@ -73,7 +73,7 @@
73 73 case 0x135:
74 74 /* set the on-board 2.5G SGMII AQR105 PHY */
75 75 fm_info_set_phy_address(FM1_DTSEC3, SGMII_AQR_PHY_ADDR);
76   -#ifdef CONFIG_T1023RDB
  76 +#ifdef CONFIG_TARGET_T1023RDB
77 77 /* set the on-board 1G SGMII RTL8211F PHY */
78 78 fm_info_set_phy_address(FM1_DTSEC1, SGMII_RTK_PHY_ADDR);
79 79 #endif
... ... @@ -92,7 +92,7 @@
92 92 fm_info_set_mdio(i, dev);
93 93 break;
94 94 case PHY_INTERFACE_MODE_SGMII:
95   -#if defined(CONFIG_T1023RDB)
  95 +#if defined(CONFIG_TARGET_T1023RDB)
96 96 dev = miiphy_get_dev_by_name(DEFAULT_FM_MDIO_NAME);
97 97 #elif defined(CONFIG_T1024RDB)
98 98 dev = miiphy_get_dev_by_name(DEFAULT_FM_TGEC_MDIO_NAME);
board/freescale/t102xrdb/t102xrdb.c
Diff comments   View file @ 9082405
... ... @@ -19,7 +19,7 @@
19 19 #include "t102xrdb.h"
20 20 #ifdef CONFIG_T1024RDB
21 21 #include "cpld.h"
22   -#elif defined(CONFIG_T1023RDB)
  22 +#elif defined(CONFIG_TARGET_T1023RDB)
23 23 #include <i2c.h>
24 24 #include <mmc.h>
25 25 #endif
... ... @@ -27,7 +27,7 @@
27 27  
28 28 DECLARE_GLOBAL_DATA_PTR;
29 29  
30   -#ifdef CONFIG_T1023RDB
  30 +#ifdef CONFIG_TARGET_T1023RDB
31 31 enum {
32 32 GPIO1_SD_SEL = 0x00020000, /* GPIO1_14, 0: eMMC, 1:SD/MMC */
33 33 GPIO1_EMMC_SEL,
... ... @@ -54,7 +54,7 @@
54 54 #if defined(CONFIG_T1024RDB)
55 55 printf("Board rev: 0x%02x CPLD ver: 0x%02x, ",
56 56 CPLD_READ(hw_ver), CPLD_READ(sw_ver));
57   -#elif defined(CONFIG_T1023RDB)
  57 +#elif defined(CONFIG_TARGET_T1023RDB)
58 58 printf("Rev%c, ", t1023rdb_ctrl(GPIO3_GET_VERSION) + 'B');
59 59 #endif
60 60 printf("boot from ");
... ... @@ -74,7 +74,7 @@
74 74 reg = ((reg & CPLD_LBMAP_MASK) >> CPLD_LBMAP_SHIFT);
75 75 printf("NOR vBank%d\n", reg);
76 76 }
77   -#elif defined(CONFIG_T1023RDB)
  77 +#elif defined(CONFIG_TARGET_T1023RDB)
78 78 #ifdef CONFIG_NAND
79 79 puts("NAND\n");
80 80 #else
... ... @@ -196,7 +196,7 @@
196 196 fdt_fixup_board_enet(blob);
197 197 #endif
198 198  
199   -#ifdef CONFIG_T1023RDB
  199 +#ifdef CONFIG_TARGET_T1023RDB
200 200 if (t1023rdb_ctrl(GPIO3_GET_VERSION) > 0)
201 201 fdt_enable_nor(blob);
202 202 #endif
... ... @@ -204,7 +204,7 @@
204 204 return 0;
205 205 }
206 206  
207   -#ifdef CONFIG_T1023RDB
  207 +#ifdef CONFIG_TARGET_T1023RDB
208 208 /* Enable NOR flash for RevC */
209 209 static void fdt_enable_nor(void *blob)
210 210 {
board/freescale/t102xrdb/t102xrdb.h
Diff comments   View file @ 9082405
... ... @@ -9,7 +9,7 @@
9 9  
10 10 void fdt_fixup_board_enet(void *blob);
11 11 void pci_of_setup(void *blob, bd_t *bd);
12   -#ifdef CONFIG_T1023RDB
  12 +#ifdef CONFIG_TARGET_T1023RDB
13 13 static u32 t1023rdb_ctrl(u32 ctrl_type);
14 14 static void fdt_enable_nor(void *blob);
15 15 #endif
configs/T1023RDB_NAND_defconfig
Diff comments   View file @ 9082405
... ... @@ -12,7 +12,7 @@
12 12 CONFIG_FIT_VERBOSE=y
13 13 CONFIG_OF_BOARD_SETUP=y
14 14 CONFIG_OF_STDOUT_VIA_ALIAS=y
15   -CONFIG_SYS_EXTRA_OPTIONS="T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
  15 +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND"
16 16 CONFIG_BOOTDELAY=10
17 17 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
18 18 CONFIG_SPL=y
configs/T1023RDB_SDCARD_defconfig
Diff comments   View file @ 9082405
... ... @@ -12,7 +12,7 @@
12 12 CONFIG_FIT_VERBOSE=y
13 13 CONFIG_OF_BOARD_SETUP=y
14 14 CONFIG_OF_STDOUT_VIA_ALIAS=y
15   -CONFIG_SYS_EXTRA_OPTIONS="T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
  15 +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
16 16 CONFIG_BOOTDELAY=10
17 17 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
18 18 CONFIG_SPL=y
configs/T1023RDB_SECURE_BOOT_defconfig
Diff comments   View file @ 9082405
... ... @@ -7,7 +7,6 @@
7 7 CONFIG_FIT_VERBOSE=y
8 8 CONFIG_OF_BOARD_SETUP=y
9 9 CONFIG_OF_STDOUT_VIA_ALIAS=y
10   -CONFIG_SYS_EXTRA_OPTIONS="T1023RDB"
11 10 CONFIG_BOOTDELAY=10
12 11 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
13 12 CONFIG_HUSH_PARSER=y
configs/T1023RDB_SPIFLASH_defconfig
Diff comments   View file @ 9082405
... ... @@ -13,7 +13,7 @@
13 13 CONFIG_FIT_VERBOSE=y
14 14 CONFIG_OF_BOARD_SETUP=y
15 15 CONFIG_OF_STDOUT_VIA_ALIAS=y
16   -CONFIG_SYS_EXTRA_OPTIONS="T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
  16 +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
17 17 CONFIG_BOOTDELAY=10
18 18 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
19 19 CONFIG_SPL=y
configs/T1023RDB_defconfig
Diff comments   View file @ 9082405
... ... @@ -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="T1023RDB"
9 8 CONFIG_BOOTDELAY=10
10 9 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
11 10 CONFIG_HUSH_PARSER=y
include/configs/T102xRDB.h
Diff comments   View file @ 9082405
... ... @@ -62,7 +62,7 @@
62 62 #define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot-nand.lds"
63 63 #if defined(CONFIG_T1024RDB)
64 64 #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1024_nand_rcw.cfg
65   -#elif defined(CONFIG_T1023RDB)
  65 +#elif defined(CONFIG_TARGET_T1023RDB)
66 66 #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1023_nand_rcw.cfg
67 67 #endif
68 68 #define CONFIG_SPL_NAND_BOOT
... ... @@ -81,7 +81,7 @@
81 81 #endif
82 82 #if defined(CONFIG_T1024RDB)
83 83 #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1024_spi_rcw.cfg
84   -#elif defined(CONFIG_T1023RDB)
  84 +#elif defined(CONFIG_TARGET_T1023RDB)
85 85 #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1023_spi_rcw.cfg
86 86 #endif
87 87 #define CONFIG_SPL_SPI_BOOT
... ... @@ -100,7 +100,7 @@
100 100 #endif
101 101 #if defined(CONFIG_T1024RDB)
102 102 #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1024_sd_rcw.cfg
103   -#elif defined(CONFIG_T1023RDB)
  103 +#elif defined(CONFIG_TARGET_T1023RDB)
104 104 #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xrdb/t1023_sd_rcw.cfg
105 105 #endif
106 106 #define CONFIG_SPL_MMC_BOOT
... ... @@ -177,7 +177,7 @@
177 177 #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */
178 178 #if defined(CONFIG_T1024RDB)
179 179 #define CONFIG_ENV_SECT_SIZE 0x10000
180   -#elif defined(CONFIG_T1023RDB)
  180 +#elif defined(CONFIG_TARGET_T1023RDB)
181 181 #define CONFIG_ENV_SECT_SIZE 0x40000
182 182 #endif
183 183 #elif defined(CONFIG_SDCARD)
... ... @@ -192,7 +192,7 @@
192 192 #define CONFIG_ENV_SIZE 0x2000
193 193 #if defined(CONFIG_T1024RDB)
194 194 #define CONFIG_ENV_OFFSET (2 * CONFIG_SYS_NAND_BLOCK_SIZE)
195   -#elif defined(CONFIG_T1023RDB)
  195 +#elif defined(CONFIG_TARGET_T1023RDB)
196 196 #define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE)
197 197 #endif
198 198 #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE)
... ... @@ -277,7 +277,7 @@
277 277 #define CONFIG_SYS_SPD_BUS_NUM 0
278 278 #define SPD_EEPROM_ADDRESS 0x51
279 279 #define CONFIG_SYS_SDRAM_SIZE 4096 /* for fixed parameter use */
280   -#elif defined(CONFIG_T1023RDB)
  280 +#elif defined(CONFIG_TARGET_T1023RDB)
281 281 #define CONFIG_SYS_FSL_DDR4
282 282 #define CONFIG_SYS_DDR_RAW_TIMING
283 283 #define CONFIG_SYS_SDRAM_SIZE 2048
... ... @@ -303,7 +303,7 @@
303 303 /* NOR Flash Timing Params */
304 304 #if defined(CONFIG_T1024RDB)
305 305 #define CONFIG_SYS_NOR_CSOR CSOR_NAND_TRHZ_80
306   -#elif defined(CONFIG_T1023RDB)
  306 +#elif defined(CONFIG_TARGET_T1023RDB)
307 307 #define CONFIG_SYS_NOR_CSOR (CSOR_NOR_ADM_SHIFT(0) | \
308 308 CSOR_NAND_TRHZ_80 | CSOR_NOR_ADM_SHFT_MODE_EN)
309 309 #endif
... ... @@ -378,7 +378,7 @@
378 378 | CSOR_NAND_SPRZ_224 /* Spare size = 224 */ \
379 379 | CSOR_NAND_PB(64)) /*Pages Per Block = 64*/
380 380 #define CONFIG_SYS_NAND_BLOCK_SIZE (512 * 1024)
381   -#elif defined(CONFIG_T1023RDB)
  381 +#elif defined(CONFIG_TARGET_T1023RDB)
382 382 #define CONFIG_SYS_NAND_CSOR (CSOR_NAND_ECC_ENC_EN /* ECC on encode */ \
383 383 | CSOR_NAND_ECC_DEC_EN /* ECC on decode */ \
384 384 | CSOR_NAND_ECC_MODE_4 /* 4-bit ECC */ \
... ... @@ -733,7 +733,7 @@
733 733 #if defined(CONFIG_T1024RDB)
734 734 #define CONFIG_SYS_FMAN_FW_ADDR (3 * CONFIG_SYS_NAND_BLOCK_SIZE)
735 735 #define CONFIG_SYS_QE_FW_ADDR (4 * CONFIG_SYS_NAND_BLOCK_SIZE)
736   -#elif defined(CONFIG_T1023RDB)
  736 +#elif defined(CONFIG_TARGET_T1023RDB)
737 737 #define CONFIG_SYS_FMAN_FW_ADDR (11 * CONFIG_SYS_NAND_BLOCK_SIZE)
738 738 #define CONFIG_SYS_QE_FW_ADDR (12 * CONFIG_SYS_NAND_BLOCK_SIZE)
739 739 #endif
... ... @@ -766,7 +766,7 @@
766 766 #define RGMII_PHY2_ADDR 0x6
767 767 #define SGMII_AQR_PHY_ADDR 0x2
768 768 #define FM1_10GEC1_PHY_ADDR 0x1
769   -#elif defined(CONFIG_T1023RDB)
  769 +#elif defined(CONFIG_TARGET_T1023RDB)
770 770 #define RGMII_PHY1_ADDR 0x1
771 771 #define SGMII_RTK_PHY_ADDR 0x3
772 772 #define SGMII_AQR_PHY_ADDR 0x2
scripts/config_whitelist.txt
Diff comments   View file @ 9082405
... ... @@ -7792,7 +7792,6 @@
7792 7792 CONFIG_SYS_ZYNQ_QSPI_WAIT
7793 7793 CONFIG_SYS_ZYNQ_SPI_WAIT
7794 7794 CONFIG_SYS_i2C_FSL
7795   -CONFIG_T1023RDB
7796 7795 CONFIG_T1024RDB
7797 7796 CONFIG_T1040QDS
7798 7797 CONFIG_T2080QDS