Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 5ff3f41d044bd286caed0886b94d78a7a85365da

Authored by York Sun
1 parent 08c752920d
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: T1023: Remove macro CONFIG_PPC_T1023 

Replace CONFIG_PPC_T1023 with ARCH_T1023 in Kconfig and clean up
existing macros.

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

Showing 13 changed files with 18 additions and 15 deletions Side-by-side Diff

arch/powerpc/cpu/mpc85xx/Kconfig
Diff comments   View file @ 5ff3f41
... ... @@ -196,6 +196,7 @@
196 196  
197 197 config TARGET_T1023RDB
198 198 bool "Support T1023RDB"
  199 + select ARCH_T1023
199 200 select SUPPORT_SPL
200 201 select PHYS_64BIT
201 202  
... ... @@ -352,6 +353,9 @@
352 353 bool
353 354  
354 355 config ARCH_QEMU_E500
  356 + bool
  357 +
  358 +config ARCH_T1023
355 359 bool
356 360  
357 361 source "board/freescale/b4860qds/Kconfig"
arch/powerpc/cpu/mpc85xx/Makefile
Diff comments   View file @ 5ff3f41
... ... @@ -53,7 +53,7 @@
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
56   -obj-$(CONFIG_PPC_T1023) += t1024_ids.o
  56 +obj-$(CONFIG_ARCH_T1023) += t1024_ids.o
57 57 obj-$(CONFIG_PPC_T1024) += t1024_ids.o
58 58 obj-$(CONFIG_PPC_T2080) += t2080_ids.o
59 59 obj-$(CONFIG_PPC_T2081) += t2080_ids.o
... ... @@ -96,7 +96,7 @@
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
99   -obj-$(CONFIG_PPC_T1023) += t1024_serdes.o
  99 +obj-$(CONFIG_ARCH_T1023) += t1024_serdes.o
100 100 obj-$(CONFIG_PPC_T1024) += t1024_serdes.o
101 101 obj-$(CONFIG_PPC_T2080) += t2080_serdes.o
102 102 obj-$(CONFIG_PPC_T2081) += t2080_serdes.o
arch/powerpc/cpu/mpc85xx/speed.c
Diff comments   View file @ 5ff3f41
... ... @@ -206,7 +206,7 @@
206 206 defined(CONFIG_PPC_T2080) || defined(CONFIG_PPC_T2081)
207 207 #define FM1_CLK_SEL 0xe0000000
208 208 #define FM1_CLK_SHIFT 29
209   -#elif defined(CONFIG_PPC_T1024) || defined(CONFIG_PPC_T1023)
  209 +#elif defined(CONFIG_PPC_T1024) || defined(CONFIG_ARCH_T1023)
210 210 #define FM1_CLK_SEL 0x00000007
211 211 #define FM1_CLK_SHIFT 0
212 212 #else
... ... @@ -216,7 +216,7 @@
216 216 #define FM1_CLK_SHIFT 26
217 217 #endif
218 218 #if !defined(CONFIG_FM_PLAT_CLK_DIV) || !defined(CONFIG_PME_PLAT_CLK_DIV)
219   -#if defined(CONFIG_PPC_T1024) || defined(CONFIG_PPC_T1023)
  219 +#if defined(CONFIG_PPC_T1024) || defined(CONFIG_ARCH_T1023)
220 220 rcw_tmp = in_be32(&gur->rcwsr[15]) - 4;
221 221 #else
222 222 rcw_tmp = in_be32(&gur->rcwsr[7]);
arch/powerpc/include/asm/config_mpc85xx.h
Diff comments   View file @ 5ff3f41
... ... @@ -730,7 +730,7 @@
730 730 #define CONFIG_SYS_FSL_ERRATUM_A008378
731 731 #define CONFIG_SYS_FSL_ERRATUM_A009663
732 732  
733   -#elif defined(CONFIG_PPC_T1024) || defined(CONFIG_PPC_T1023) ||\
  733 +#elif defined(CONFIG_PPC_T1024) || defined(CONFIG_ARCH_T1023) ||\
734 734 defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013)
735 735 #define CONFIG_E5500
736 736 #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */
... ... @@ -741,7 +741,7 @@
741 741 #ifdef CONFIG_SYS_FSL_DDR4
742 742 #define CONFIG_SYS_FSL_DDRC_GEN4
743 743 #endif
744   -#if defined(CONFIG_PPC_T1024) || defined(CONFIG_PPC_T1023)
  744 +#if defined(CONFIG_PPC_T1024) || defined(CONFIG_ARCH_T1023)
745 745 #define CONFIG_MAX_CPUS 2
746 746 #elif defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013)
747 747 #define CONFIG_MAX_CPUS 1
arch/powerpc/include/asm/fsl_secure_boot.h
Diff comments   View file @ 5ff3f41
... ... @@ -34,7 +34,7 @@
34 34 defined(CONFIG_T104xD4QDS) || \
35 35 defined(CONFIG_T104xRDB) || \
36 36 defined(CONFIG_T104xD4RDB) || \
37   - defined(CONFIG_PPC_T1023) || \
  37 + defined(CONFIG_ARCH_T1023) || \
38 38 defined(CONFIG_PPC_T1024)
39 39 #ifndef CONFIG_SYS_RAMBOOT
40 40 #define CONFIG_SYS_CPC_REINIT_F
arch/powerpc/include/asm/immap_85xx.h
Diff comments   View file @ 5ff3f41
... ... @@ -1797,7 +1797,7 @@
1797 1797 #define PXCKEN_MASK 0x80000000
1798 1798 #define PXCK_MASK 0x00FF0000
1799 1799 #define PXCK_BITS_START 16
1800   -#elif defined(CONFIG_PPC_T1024) || defined(CONFIG_PPC_T1023) || \
  1800 +#elif defined(CONFIG_PPC_T1024) || defined(CONFIG_ARCH_T1023) || \
1801 1801 defined(CONFIG_PPC_T1014) || defined(CONFIG_PPC_T1013)
1802 1802 #define FSL_CORENET2_RCWSR4_SRDS1_PRTCL 0xff800000
1803 1803 #define FSL_CORENET2_RCWSR4_SRDS1_PRTCL_SHIFT 23
configs/T1023RDB_NAND_defconfig
Diff comments   View file @ 5ff3f41
... ... @@ -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_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND"
  15 +CONFIG_SYS_EXTRA_OPTIONS="T1023RDB,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 @ 5ff3f41
... ... @@ -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_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD"
  15 +CONFIG_SYS_EXTRA_OPTIONS="T1023RDB,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 @ 5ff3f41
... ... @@ -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_T1023,T1023RDB,SECURE_BOOT"
  9 +CONFIG_SYS_EXTRA_OPTIONS="T1023RDB,SECURE_BOOT"
10 10 CONFIG_BOOTDELAY=10
11 11 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
12 12 CONFIG_HUSH_PARSER=y
configs/T1023RDB_SPIFLASH_defconfig
Diff comments   View file @ 5ff3f41
... ... @@ -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_T1023,T1023RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH"
  16 +CONFIG_SYS_EXTRA_OPTIONS="T1023RDB,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 @ 5ff3f41
... ... @@ -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_T1023,T1023RDB"
  8 +CONFIG_SYS_EXTRA_OPTIONS="T1023RDB"
9 9 CONFIG_BOOTDELAY=10
10 10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
11 11 CONFIG_HUSH_PARSER=y
drivers/net/fm/Makefile
Diff comments   View file @ 5ff3f41
... ... @@ -28,7 +28,7 @@
28 28 obj-$(CONFIG_PPC_T1042) += t1040.o
29 29 obj-$(CONFIG_PPC_T1020) += t1040.o
30 30 obj-$(CONFIG_PPC_T1022) += t1040.o
31   -obj-$(CONFIG_PPC_T1023) += t1024.o
  31 +obj-$(CONFIG_ARCH_T1023) += t1024.o
32 32 obj-$(CONFIG_PPC_T1024) += t1024.o
33 33 obj-$(CONFIG_PPC_T2080) += t2080.o
34 34 obj-$(CONFIG_PPC_T2081) += t2080.o
scripts/config_whitelist.txt
Diff comments   View file @ 5ff3f41
... ... @@ -3640,7 +3640,6 @@
3640 3640 CONFIG_PPC64BRIDGE
3641 3641 CONFIG_PPC_CLUSTER_START
3642 3642 CONFIG_PPC_SPINTABLE_COMPATIBLE
3643   -CONFIG_PPC_T1023
3644 3643 CONFIG_PPC_T1024
3645 3644 CONFIG_PPC_T1040
3646 3645 CONFIG_PPC_T1042