Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ebccf25518dc8d5253d70d69fc738c0f80cb888a

Authored by York Sun
1 parent 4fd64746b0
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: C29XPCIE: Remove macro CONFIG_C29XPCIE 

Use CONFIG_TARGET_C29XPCIE instead.

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

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

arch/powerpc/include/asm/fsl_secure_boot.h
Diff comments   View file @ ebccf25
... ... @@ -18,7 +18,7 @@
18 18 #define CONFIG_SYS_PBI_FLASH_BASE 0xc0000000
19 19 #elif defined(CONFIG_TARGET_BSC9132QDS)
20 20 #define CONFIG_SYS_PBI_FLASH_BASE 0xc8000000
21   -#elif defined(CONFIG_C29XPCIE)
  21 +#elif defined(CONFIG_TARGET_C29XPCIE)
22 22 #define CONFIG_SYS_PBI_FLASH_BASE 0xcc000000
23 23 #else
24 24 #define CONFIG_SYS_PBI_FLASH_BASE 0xce000000
... ... @@ -54,7 +54,7 @@
54 54 #endif
55 55 #endif
56 56  
57   -#if defined(CONFIG_C29XPCIE)
  57 +#if defined(CONFIG_TARGET_C29XPCIE)
58 58 #define CONFIG_KEY_REVOCATION
59 59 #endif
60 60  
... ... @@ -140,7 +140,7 @@
140 140 #define CONFIG_BOOTSCRIPT_HDR_ADDR 0xe8e00000
141 141 #elif defined(CONFIG_TARGET_BSC9132QDS)
142 142 #define CONFIG_BOOTSCRIPT_HDR_ADDR 0x88020000
143   -#elif defined(CONFIG_C29XPCIE)
  143 +#elif defined(CONFIG_TARGET_C29XPCIE)
144 144 #define CONFIG_BOOTSCRIPT_HDR_ADDR 0xec020000
145 145 #else
146 146 #define CONFIG_BOOTSCRIPT_HDR_ADDR 0xee020000
configs/C29XPCIE_NAND_defconfig
Diff comments   View file @ ebccf25
... ... @@ -8,7 +8,7 @@
8 8 CONFIG_FIT_VERBOSE=y
9 9 CONFIG_OF_BOARD_SETUP=y
10 10 CONFIG_OF_STDOUT_VIA_ALIAS=y
11   -CONFIG_SYS_EXTRA_OPTIONS="C29XPCIE,NAND"
  11 +CONFIG_SYS_EXTRA_OPTIONS="NAND"
12 12 CONFIG_BOOTDELAY=-1
13 13 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
14 14 CONFIG_SPL=y
configs/C29XPCIE_NOR_SECBOOT_defconfig
Diff comments   View file @ ebccf25
... ... @@ -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="C29XPCIE,SECURE_BOOT"
  9 +CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
10 10 CONFIG_BOOTDELAY=-1
11 11 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
12 12 CONFIG_HUSH_PARSER=y
configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig
Diff comments   View file @ ebccf25
... ... @@ -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="C29XPCIE,SPIFLASH,SECURE_BOOT"
  9 +CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH,SECURE_BOOT"
10 10 CONFIG_BOOTDELAY=-1
11 11 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
12 12 CONFIG_HUSH_PARSER=y
configs/C29XPCIE_SPIFLASH_defconfig
Diff comments   View file @ ebccf25
... ... @@ -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="C29XPCIE,SPIFLASH"
  8 +CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
9 9 CONFIG_BOOTDELAY=-1
10 10 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
11 11 CONFIG_HUSH_PARSER=y
configs/C29XPCIE_defconfig
Diff comments   View file @ ebccf25
... ... @@ -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="C29XPCIE"
9 8 CONFIG_BOOTDELAY=-1
10 9 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
11 10 CONFIG_HUSH_PARSER=y
scripts/config_whitelist.txt
Diff comments   View file @ ebccf25
... ... @@ -467,7 +467,6 @@
467 467 CONFIG_BUILD_TARGET
468 468 CONFIG_BUS_WIDTH
469 469 CONFIG_BZIP2
470   -CONFIG_C29XPCIE
471 470 CONFIG_CACHELINE_ALIGNED_L1
472 471 CONFIG_CADDY2
473 472 CONFIG_CALXEDA_XGMAC