Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 5d737010738c3a02ff346cae3d69cf20ab328d7f

Authored by York Sun
1 parent 95a809b918
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: T1040: Remove macro CONFIG_PPC_T1040 

Replace CONFIG_PPC_T1040 with ARCH_T1040 in Kconfig and clean up
existing macros.

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

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

arch/powerpc/cpu/mpc85xx/Kconfig
Diff comments   View file @ 5d73701
... ... @@ -209,10 +209,12 @@
209 209  
210 210 config TARGET_T1040QDS
211 211 bool "Support T1040QDS"
  212 + select ARCH_T1040
212 213 select PHYS_64BIT
213 214  
214 215 config TARGET_T1040RDB
215 216 bool "Support T1040RDB"
  217 + select ARCH_T1040
216 218 select SUPPORT_SPL
217 219 select PHYS_64BIT
218 220  
... ... @@ -366,6 +368,9 @@
366 368 bool
367 369  
368 370 config ARCH_T1024
  371 + bool
  372 +
  373 +config ARCH_T1040
369 374 bool
370 375  
371 376 source "board/freescale/b4860qds/Kconfig"
arch/powerpc/cpu/mpc85xx/Makefile
Diff comments   View file @ 5d73701
... ... @@ -49,7 +49,7 @@
49 49 obj-$(CONFIG_PPC_T4080) += t4240_ids.o
50 50 obj-$(CONFIG_ARCH_B4420) += b4860_ids.o
51 51 obj-$(CONFIG_ARCH_B4860) += b4860_ids.o
52   -obj-$(CONFIG_PPC_T1040) += t1040_ids.o
  52 +obj-$(CONFIG_ARCH_T1040) += t1040_ids.o
53 53 obj-$(CONFIG_PPC_T1042) += t1040_ids.o
54 54 obj-$(CONFIG_PPC_T1020) += t1040_ids.o
55 55 obj-$(CONFIG_PPC_T1022) += t1040_ids.o
... ... @@ -92,7 +92,7 @@
92 92 obj-$(CONFIG_ARCH_B4420) += b4860_serdes.o
93 93 obj-$(CONFIG_ARCH_B4860) += b4860_serdes.o
94 94 obj-$(CONFIG_ARCH_BSC9132) += bsc9132_serdes.o
95   -obj-$(CONFIG_PPC_T1040) += t1040_serdes.o
  95 +obj-$(CONFIG_ARCH_T1040) += t1040_serdes.o
96 96 obj-$(CONFIG_PPC_T1042) += t1040_serdes.o
97 97 obj-$(CONFIG_PPC_T1020) += t1040_serdes.o
98 98 obj-$(CONFIG_PPC_T1022) += t1040_serdes.o
arch/powerpc/cpu/mpc85xx/fdt.c
Diff comments   View file @ 5d73701
... ... @@ -556,7 +556,7 @@
556 556 #define fdt_fixup_dma3(x)
557 557 #endif
558 558  
559   -#if defined(CONFIG_PPC_T1040)
  559 +#if defined(CONFIG_ARCH_T1040)
560 560 static void fdt_fixup_l2_switch(void *blob)
561 561 {
562 562 uchar l2swaddr[6];
arch/powerpc/include/asm/config_mpc85xx.h
Diff comments   View file @ 5d73701
... ... @@ -679,7 +679,7 @@
679 679 #define CONFIG_NUM_DDR_CONTROLLERS 1
680 680 #endif
681 681  
682   -#elif defined(CONFIG_PPC_T1040) || defined(CONFIG_PPC_T1042) ||\
  682 +#elif defined(CONFIG_ARCH_T1040) || defined(CONFIG_PPC_T1042) ||\
683 683 defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022)
684 684 #define CONFIG_E5500
685 685 #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */
... ... @@ -689,7 +689,7 @@
689 689 #ifdef CONFIG_SYS_FSL_DDR4
690 690 #define CONFIG_SYS_FSL_DDRC_GEN4
691 691 #endif
692   -#if defined(CONFIG_PPC_T1040) || defined(CONFIG_PPC_T1042)
  692 +#if defined(CONFIG_ARCH_T1040) || defined(CONFIG_PPC_T1042)
693 693 #define CONFIG_MAX_CPUS 4
694 694 #elif defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022)
695 695 #define CONFIG_MAX_CPUS 2
arch/powerpc/include/asm/immap_85xx.h
Diff comments   View file @ 5d73701
... ... @@ -1776,7 +1776,7 @@
1776 1776 #define FSL_CORENET2_RCWSR4_SRDS2_PRTCL 0x00ff0000
1777 1777 #define FSL_CORENET2_RCWSR4_SRDS2_PRTCL_SHIFT 16
1778 1778 #define FSL_CORENET_RCWSR6_BOOT_LOC 0x0f800000
1779   -#elif defined(CONFIG_PPC_T1040) || defined(CONFIG_PPC_T1042) ||\
  1779 +#elif defined(CONFIG_ARCH_T1040) || defined(CONFIG_PPC_T1042) ||\
1780 1780 defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022)
1781 1781 #define FSL_CORENET2_RCWSR4_SRDS1_PRTCL 0xff000000
1782 1782 #define FSL_CORENET2_RCWSR4_SRDS1_PRTCL_SHIFT 24
board/freescale/t102xqds/spl.c
Diff comments   View file @ 5d73701
... ... @@ -66,7 +66,7 @@
66 66 u32 plat_ratio, sys_clk, ccb_clk;
67 67 ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC85xx_GUTS_ADDR;
68 68  
69   -#if defined(CONFIG_PPC_T1040) && defined(CONFIG_SPL_NAND_BOOT)
  69 +#if defined(CONFIG_ARCH_T1040) && defined(CONFIG_SPL_NAND_BOOT)
70 70 /*
71 71 * There is T1040 SoC issue where NOR, FPGA are inaccessible during
72 72 * NAND boot because IFC signals > IFC_AD7 are not enabled.
configs/T1040D4RDB_NAND_defconfig
Diff comments   View file @ 5d73701
... ... @@ -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="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND,T104XD4RDB,SYS_FSL_DDR4"
  15 +CONFIG_SYS_EXTRA_OPTIONS="T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND,T104XD4RDB,SYS_FSL_DDR4"
16 16 CONFIG_BOOTDELAY=10
17 17 CONFIG_SILENT_CONSOLE=y
18 18 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/T1040D4RDB_SDCARD_defconfig
Diff comments   View file @ 5d73701
... ... @@ -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="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD,T104XD4RDB,SYS_FSL_DDR4"
  15 +CONFIG_SYS_EXTRA_OPTIONS="T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD,T104XD4RDB,SYS_FSL_DDR4"
16 16 CONFIG_BOOTDELAY=10
17 17 CONFIG_SILENT_CONSOLE=y
18 18 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/T1040D4RDB_SECURE_BOOT_defconfig
Diff comments   View file @ 5d73701
... ... @@ -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="PPC_T1040,T1040D4RDB,T104XD4RDB,SYS_FSL_DDR4,SECURE_BOOT"
  9 +CONFIG_SYS_EXTRA_OPTIONS="T1040D4RDB,T104XD4RDB,SYS_FSL_DDR4,SECURE_BOOT"
10 10 CONFIG_BOOTDELAY=10
11 11 CONFIG_SILENT_CONSOLE=y
12 12 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/T1040D4RDB_SPIFLASH_defconfig
Diff comments   View file @ 5d73701
... ... @@ -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="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,T104XD4RDB,SYS_FSL_DDR4"
  16 +CONFIG_SYS_EXTRA_OPTIONS="T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,T104XD4RDB,SYS_FSL_DDR4"
17 17 CONFIG_BOOTDELAY=10
18 18 CONFIG_SILENT_CONSOLE=y
19 19 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/T1040D4RDB_defconfig
Diff comments   View file @ 5d73701
... ... @@ -5,7 +5,7 @@
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="PPC_T1040,T1040D4RDB,T104XD4RDB,SYS_FSL_DDR4"
  8 +CONFIG_SYS_EXTRA_OPTIONS="T1040D4RDB,T104XD4RDB,SYS_FSL_DDR4"
9 9 CONFIG_BOOTDELAY=10
10 10 CONFIG_SILENT_CONSOLE=y
11 11 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/T1040QDS_DDR4_defconfig
Diff comments   View file @ 5d73701
... ... @@ -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="PPC_T1040,SYS_FSL_DDR4"
  9 +CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4"
10 10 CONFIG_BOOTDELAY=10
11 11 CONFIG_SILENT_CONSOLE=y
12 12 # CONFIG_CONSOLE_MUX is not set
configs/T1040QDS_SECURE_BOOT_defconfig
Diff comments   View file @ 5d73701
... ... @@ -7,7 +7,7 @@
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="PPC_T1040,SECURE_BOOT"
  10 +CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
11 11 CONFIG_BOOTDELAY=10
12 12 CONFIG_SILENT_CONSOLE=y
13 13 # CONFIG_CONSOLE_MUX is not set
configs/T1040QDS_defconfig
Diff comments   View file @ 5d73701
... ... @@ -6,7 +6,6 @@
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="PPC_T1040"
10 9 CONFIG_BOOTDELAY=10
11 10 CONFIG_SILENT_CONSOLE=y
12 11 # CONFIG_CONSOLE_MUX is not set
configs/T1040RDB_NAND_defconfig
Diff comments   View file @ 5d73701
... ... @@ -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="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
  15 +CONFIG_SYS_EXTRA_OPTIONS="T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
16 16 CONFIG_BOOTDELAY=10
17 17 CONFIG_SILENT_CONSOLE=y
18 18 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/T1040RDB_SDCARD_defconfig
Diff comments   View file @ 5d73701
... ... @@ -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="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
  15 +CONFIG_SYS_EXTRA_OPTIONS="T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
16 16 CONFIG_BOOTDELAY=10
17 17 CONFIG_SILENT_CONSOLE=y
18 18 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/T1040RDB_SECURE_BOOT_defconfig
Diff comments   View file @ 5d73701
... ... @@ -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="PPC_T1040,SECURE_BOOT,T1040RDB"
  9 +CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,T1040RDB"
10 10 CONFIG_BOOTDELAY=10
11 11 CONFIG_SILENT_CONSOLE=y
12 12 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/T1040RDB_SPIFLASH_defconfig
Diff comments   View file @ 5d73701
... ... @@ -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="PPC_T1040,T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
  16 +CONFIG_SYS_EXTRA_OPTIONS="T1040RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
17 17 CONFIG_BOOTDELAY=10
18 18 CONFIG_SILENT_CONSOLE=y
19 19 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/T1040RDB_defconfig
Diff comments   View file @ 5d73701
... ... @@ -5,7 +5,7 @@
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="PPC_T1040,T1040RDB"
  8 +CONFIG_SYS_EXTRA_OPTIONS="T1040RDB"
9 9 CONFIG_BOOTDELAY=10
10 10 CONFIG_SILENT_CONSOLE=y
11 11 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
drivers/net/fm/Makefile
Diff comments   View file @ 5d73701
... ... @@ -24,7 +24,7 @@
24 24 obj-$(CONFIG_ARCH_P4080) += p4080.o
25 25 obj-$(CONFIG_ARCH_P5020) += p5020.o
26 26 obj-$(CONFIG_ARCH_P5040) += p5040.o
27   -obj-$(CONFIG_PPC_T1040) += t1040.o
  27 +obj-$(CONFIG_ARCH_T1040) += t1040.o
28 28 obj-$(CONFIG_PPC_T1042) += t1040.o
29 29 obj-$(CONFIG_PPC_T1020) += t1040.o
30 30 obj-$(CONFIG_PPC_T1022) += t1040.o
include/configs/T102xRDB.h
Diff comments   View file @ 5d73701
... ... @@ -556,7 +556,7 @@
556 556 #define CONFIG_PCIE1 /* PCIE controller 1 */
557 557 #define CONFIG_PCIE2 /* PCIE controller 2 */
558 558 #define CONFIG_PCIE3 /* PCIE controller 3 */
559   -#ifdef CONFIG_PPC_T1040
  559 +#ifdef CONFIG_ARCH_T1040
560 560 #define CONFIG_PCIE4 /* PCIE controller 4 */
561 561 #endif
562 562 #define CONFIG_FSL_PCI_INIT /* Use common FSL init code */
scripts/config_whitelist.txt
Diff comments   View file @ 5d73701
... ... @@ -3640,7 +3640,6 @@
3640 3640 CONFIG_PPC64BRIDGE
3641 3641 CONFIG_PPC_CLUSTER_START
3642 3642 CONFIG_PPC_SPINTABLE_COMPATIBLE
3643   -CONFIG_PPC_T1040
3644 3643 CONFIG_PPC_T1042
3645 3644 CONFIG_PPC_T2080
3646 3645 CONFIG_PPC_T2081