Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 55ed8ae3674462be330a4d71af33e83afce462be

Authored by York Sun
1 parent 5449c98a2d
Exists in v2017.01-smarct4x and in 28 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf-6.6.52-2.2.0, emb_lf_v2022.04, emb_lf_v2023.04, emb_lf_v2024.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_PI: Split from T1042RDB in Kconfig 

Use separated TARGET_T1042RDB_PI to simplify config options.
Remove macro CONFIG_T1042RDB_PI.

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

Showing 9 changed files with 24 additions and 20 deletions Side-by-side Diff

arch/powerpc/cpu/mpc85xx/Kconfig
Diff comments   View file @ 55ed8ae
... ... @@ -230,6 +230,12 @@
230 230 select SUPPORT_SPL
231 231 select PHYS_64BIT
232 232  
  233 +config TARGET_T1042RDB_PI
  234 + bool "Support T1042RDB_PI"
  235 + select ARCH_T1042
  236 + select SUPPORT_SPL
  237 + select PHYS_64BIT
  238 +
233 239 config TARGET_T208XQDS
234 240 bool "Support T208xQDS"
235 241 select SUPPORT_SPL
board/freescale/t104xrdb/Kconfig
Diff comments   View file @ 55ed8ae
1   -if TARGET_T1040RDB || TARGET_T1040D4RDB || TARGET_T1042RDB
  1 +if TARGET_T1040RDB || TARGET_T1040D4RDB || TARGET_T1042RDB || TARGET_T1042RDB_PI
2 2  
3 3 config SYS_BOARD
4 4 default "t104xrdb"
configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig
Diff comments   View file @ 55ed8ae
... ... @@ -8,12 +8,12 @@
8 8 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
9 9 CONFIG_VIDEO=y
10 10 CONFIG_MPC85xx=y
11   -CONFIG_TARGET_T1042RDB=y
  11 +CONFIG_TARGET_T1042RDB_PI=y
12 12 CONFIG_FIT=y
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="T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,NAND,SECURE_BOOT"
  16 +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND,SECURE_BOOT"
17 17 CONFIG_BOOTDELAY=0
18 18 CONFIG_SILENT_CONSOLE=y
19 19 # CONFIG_CONSOLE_MUX is not set
configs/T1042RDB_PI_NAND_defconfig
Diff comments   View file @ 55ed8ae
... ... @@ -8,12 +8,12 @@
8 8 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
9 9 CONFIG_VIDEO=y
10 10 CONFIG_MPC85xx=y
11   -CONFIG_TARGET_T1042RDB=y
  11 +CONFIG_TARGET_T1042RDB_PI=y
12 12 CONFIG_FIT=y
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="T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
  16 +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,NAND"
17 17 CONFIG_BOOTDELAY=10
18 18 CONFIG_SILENT_CONSOLE=y
19 19 # CONFIG_CONSOLE_MUX is not set
configs/T1042RDB_PI_SDCARD_defconfig
Diff comments   View file @ 55ed8ae
... ... @@ -8,12 +8,12 @@
8 8 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
9 9 CONFIG_VIDEO=y
10 10 CONFIG_MPC85xx=y
11   -CONFIG_TARGET_T1042RDB=y
  11 +CONFIG_TARGET_T1042RDB_PI=y
12 12 CONFIG_FIT=y
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="T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
  16 +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
17 17 CONFIG_BOOTDELAY=10
18 18 CONFIG_SILENT_CONSOLE=y
19 19 # CONFIG_CONSOLE_MUX is not set
configs/T1042RDB_PI_SPIFLASH_defconfig
Diff comments   View file @ 55ed8ae
... ... @@ -9,12 +9,12 @@
9 9 CONFIG_SPL_SPI_SUPPORT=y
10 10 CONFIG_VIDEO=y
11 11 CONFIG_MPC85xx=y
12   -CONFIG_TARGET_T1042RDB=y
  12 +CONFIG_TARGET_T1042RDB_PI=y
13 13 CONFIG_FIT=y
14 14 CONFIG_FIT_VERBOSE=y
15 15 CONFIG_OF_BOARD_SETUP=y
16 16 CONFIG_OF_STDOUT_VIA_ALIAS=y
17   -CONFIG_SYS_EXTRA_OPTIONS="T1042RDB_PI,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
  17 +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
18 18 CONFIG_BOOTDELAY=10
19 19 CONFIG_SILENT_CONSOLE=y
20 20 # CONFIG_CONSOLE_MUX is not set
configs/T1042RDB_PI_defconfig
Diff comments   View file @ 55ed8ae
1 1 CONFIG_PPC=y
2 2 CONFIG_VIDEO=y
3 3 CONFIG_MPC85xx=y
4   -CONFIG_TARGET_T1042RDB=y
  4 +CONFIG_TARGET_T1042RDB_PI=y
5 5 CONFIG_FIT=y
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="T1042RDB_PI"
10 9 CONFIG_BOOTDELAY=10
11 10 CONFIG_SILENT_CONSOLE=y
12 11 # CONFIG_CONSOLE_MUX is not set
include/configs/T104xRDB.h
Diff comments   View file @ 55ed8ae
... ... @@ -60,7 +60,7 @@
60 60 #define CONFIG_SYS_FSL_PBL_RCW \
61 61 $(SRCTREE)/board/freescale/t104xrdb/t1040_nand_rcw.cfg
62 62 #endif
63   -#ifdef CONFIG_T1042RDB_PI
  63 +#ifdef CONFIG_TARGET_T1042RDB_PI
64 64 #define CONFIG_SYS_FSL_PBL_RCW \
65 65 $(SRCTREE)/board/freescale/t104xrdb/t1042_pi_nand_rcw.cfg
66 66 #endif
... ... @@ -94,7 +94,7 @@
94 94 #define CONFIG_SYS_FSL_PBL_RCW \
95 95 $(SRCTREE)/board/freescale/t104xrdb/t1040_spi_rcw.cfg
96 96 #endif
97   -#ifdef CONFIG_T1042RDB_PI
  97 +#ifdef CONFIG_TARGET_T1042RDB_PI
98 98 #define CONFIG_SYS_FSL_PBL_RCW \
99 99 $(SRCTREE)/board/freescale/t104xrdb/t1042_pi_spi_rcw.cfg
100 100 #endif
... ... @@ -128,7 +128,7 @@
128 128 #define CONFIG_SYS_FSL_PBL_RCW \
129 129 $(SRCTREE)/board/freescale/t104xrdb/t1040_sd_rcw.cfg
130 130 #endif
131   -#ifdef CONFIG_T1042RDB_PI
  131 +#ifdef CONFIG_TARGET_T1042RDB_PI
132 132 #define CONFIG_SYS_FSL_PBL_RCW \
133 133 $(SRCTREE)/board/freescale/t104xrdb/t1042_pi_sd_rcw.cfg
134 134 #endif
... ... @@ -342,7 +342,7 @@
342 342 #define CPLD_LBMAP_RESET 0xFF
343 343 #define CPLD_LBMAP_SHIFT 0x03
344 344  
345   -#if defined(CONFIG_T1042RDB_PI)
  345 +#if defined(CONFIG_TARGET_T1042RDB_PI)
346 346 #define CPLD_DIU_SEL_DFP 0x80
347 347 #elif defined(CONFIG_T1042D4RDB)
348 348 #define CPLD_DIU_SEL_DFP 0xc0
... ... @@ -516,7 +516,7 @@
516 516 #define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500)
517 517 #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600)
518 518  
519   -#if defined(CONFIG_T1042RDB_PI) || defined(CONFIG_T1042D4RDB)
  519 +#if defined(CONFIG_TARGET_T1042RDB_PI) || defined(CONFIG_T1042D4RDB)
520 520 /* Video */
521 521 #define CONFIG_FSL_DIU_FB
522 522  
... ... @@ -551,7 +551,7 @@
551 551 #define I2C_MUX_CH_DEFAULT 0x8
552 552 #endif
553 553  
554   -#if defined(CONFIG_T1042RDB_PI) || defined(CONFIG_T104XD4RDB)
  554 +#if defined(CONFIG_TARGET_T1042RDB_PI) || defined(CONFIG_T104XD4RDB)
555 555 /* LDI/DVI Encoder for display */
556 556 #define CONFIG_SYS_I2C_LDI_ADDR 0x38
557 557 #define CONFIG_SYS_I2C_DVI_ADDR 0x75
... ... @@ -803,7 +803,7 @@
803 803 /*
804 804 * Command line configuration.
805 805 */
806   -#ifdef CONFIG_T1042RDB_PI
  806 +#ifdef CONFIG_TARGET_T1042RDB_PI
807 807 #define CONFIG_CMD_DATE
808 808 #endif
809 809 #define CONFIG_CMD_ERRATA
... ... @@ -883,7 +883,7 @@
883 883  
884 884 #ifdef CONFIG_TARGET_T1040RDB
885 885 #define FDTFILE "t1040rdb/t1040rdb.dtb"
886   -#elif defined(CONFIG_T1042RDB_PI)
  886 +#elif defined(CONFIG_TARGET_T1042RDB_PI)
887 887 #define FDTFILE "t1042rdb_pi/t1042rdb_pi.dtb"
888 888 #elif defined(CONFIG_T1042RDB)
889 889 #define FDTFILE "t1042rdb/t1042rdb.dtb"
scripts/config_whitelist.txt
Diff comments   View file @ 55ed8ae
... ... @@ -7829,7 +7829,6 @@
7829 7829 CONFIG_T1040QDS
7830 7830 CONFIG_T1042D4RDB
7831 7831 CONFIG_T1042RDB
7832   -CONFIG_T1042RDB_PI
7833 7832 CONFIG_T104XD4RDB
7834 7833 CONFIG_T104xRDB
7835 7834 CONFIG_T2080QDS