On Fri, Dec 02, 2016 at 01:37:41PM -0800, York Sun wrote:
Convert the following macros for mpc85xx/mpc86xx to Kconfig options CONFIG_SYS_CCSRBAR_DEFAULT CONFIG_SECURE_BOOT CONFIG_FSL_LAW CONFIG_SYS_FSL_NUM_LAWS
For consistency, CONFIG_SECURE_BOOT for ls1021a/ls2080a/ls1043a is also converted.
Related macros are dropped from white list.
York Sun (11): powerpc: cyrus: Separate P5020/P5040 config options powerpc: mpc85xx: Convert CONFIG_SYS_CCSRBAR_DEFAULT to Kconfig option powerpc: mpc86xx: Convert CONFIG_SYS_CCSRBAR_DEFAULT to Kconfig option script: remove CONFIG_SYS_CCSRBAR_DEFAULT from white list armv7: ls1021a: Move SECURE_BOOT option to Kconfig armv8: fsl-layerscape: Move SECURE_BOOT to Kconfig powerpc: mpc85xx: Move SECURE_BOOT to Kconfig powerpc: mpc85xx: Move CONFIG_FSL_LAW to Kconfig powerpc: mpc86xx: Move CONFIG_FSL_LAW to Kconfig powerpc: mpc85xx: Convert CONFIG_SYS_FSL_NUM_LAWS to Kconfig option powerpc: mpc86xx: Convert CONFIG_SYS_FSL_NUM_LAWS to Kconfig option
arch/arm/cpu/armv7/ls102xa/Kconfig | 6 + arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 5 + arch/arm/include/asm/arch-fsl-layerscape/config.h | 1 - .../include/asm/arch-fsl-layerscape/immap_lsch2.h | 4 +- arch/powerpc/cpu/mpc85xx/Kconfig | 156 ++++++++++++++++++++- arch/powerpc/cpu/mpc86xx/Kconfig | 22 +++ arch/powerpc/include/asm/config_mpc85xx.h | 73 ---------- arch/powerpc/include/asm/config_mpc86xx.h | 12 -- board/varisys/cyrus/Kconfig | 2 +- configs/B4860QDS_SECURE_BOOT_defconfig | 2 +- configs/BSC9132QDS_NAND_DDRCLK100_SECURE_defconfig | 3 +- configs/BSC9132QDS_NAND_DDRCLK133_SECURE_defconfig | 3 +- configs/BSC9132QDS_NOR_DDRCLK100_SECURE_defconfig | 3 +- configs/BSC9132QDS_NOR_DDRCLK133_SECURE_defconfig | 3 +- .../BSC9132QDS_SDCARD_DDRCLK100_SECURE_defconfig | 3 +- .../BSC9132QDS_SDCARD_DDRCLK133_SECURE_defconfig | 3 +- .../BSC9132QDS_SPIFLASH_DDRCLK100_SECURE_defconfig | 3 +- .../BSC9132QDS_SPIFLASH_DDRCLK133_SECURE_defconfig | 3 +- configs/C29XPCIE_NOR_SECBOOT_defconfig | 2 +- configs/C29XPCIE_SPIFLASH_SECBOOT_defconfig | 3 +- configs/Cyrus_P5020_defconfig | 4 +- configs/Cyrus_P5040_defconfig | 4 +- configs/P1010RDB-PA_36BIT_NAND_SECBOOT_defconfig | 3 +- configs/P1010RDB-PA_36BIT_NOR_SECBOOT_defconfig | 2 +- .../P1010RDB-PA_36BIT_SPIFLASH_SECBOOT_defconfig | 3 +- configs/P1010RDB-PA_NAND_SECBOOT_defconfig | 3 +- configs/P1010RDB-PA_NOR_SECBOOT_defconfig | 2 +- configs/P1010RDB-PA_SPIFLASH_SECBOOT_defconfig | 3 +- configs/P1010RDB-PB_36BIT_NAND_SECBOOT_defconfig | 3 +- configs/P1010RDB-PB_36BIT_NOR_SECBOOT_defconfig | 2 +- .../P1010RDB-PB_36BIT_SPIFLASH_SECBOOT_defconfig | 3 +- configs/P1010RDB-PB_NAND_SECBOOT_defconfig | 3 +- configs/P1010RDB-PB_NOR_SECBOOT_defconfig | 2 +- configs/P1010RDB-PB_SPIFLASH_SECBOOT_defconfig | 3 +- configs/P2041RDB_SECURE_BOOT_defconfig | 2 +- configs/P3041DS_NAND_SECURE_BOOT_defconfig | 3 +- configs/P3041DS_SECURE_BOOT_defconfig | 2 +- configs/P4080DS_SECURE_BOOT_defconfig | 2 +- configs/P5020DS_NAND_SECURE_BOOT_defconfig | 3 +- configs/P5020DS_SECURE_BOOT_defconfig | 2 +- configs/P5040DS_NAND_SECURE_BOOT_defconfig | 3 +- configs/P5040DS_SECURE_BOOT_defconfig | 2 +- configs/T1023RDB_SECURE_BOOT_defconfig | 3 +- configs/T1024QDS_DDR4_SECURE_BOOT_defconfig | 3 +- configs/T1024QDS_SECURE_BOOT_defconfig | 2 +- configs/T1024RDB_SECURE_BOOT_defconfig | 3 +- configs/T1040D4RDB_SECURE_BOOT_defconfig | 3 +- configs/T1040QDS_SECURE_BOOT_defconfig | 2 +- configs/T1040RDB_SECURE_BOOT_defconfig | 2 +- configs/T1042D4RDB_SECURE_BOOT_defconfig | 3 +- configs/T1042RDB_PI_NAND_SECURE_BOOT_defconfig | 3 +- configs/T1042RDB_SECURE_BOOT_defconfig | 2 +- configs/T2080QDS_SECURE_BOOT_defconfig | 2 +- configs/T2080RDB_SECURE_BOOT_defconfig | 2 +- configs/T4160QDS_SECURE_BOOT_defconfig | 2 +- configs/T4240QDS_SECURE_BOOT_defconfig | 2 +- configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 2 +- configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 2 +- .../ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 3 +- configs/ls1043ardb_SECURE_BOOT_defconfig | 2 +- configs/ls2080aqds_SECURE_BOOT_defconfig | 3 +- configs/ls2080ardb_SECURE_BOOT_defconfig | 3 +- doc/README.ramboot-ppc85xx | 4 +- include/configs/B4860QDS.h | 3 - include/configs/BSC9131RDB.h | 1 - include/configs/BSC9132QDS.h | 1 - include/configs/C29XPCIE.h | 1 - include/configs/MPC8536DS.h | 1 - include/configs/MPC8540ADS.h | 1 - include/configs/MPC8541CDS.h | 2 - include/configs/MPC8544DS.h | 2 - include/configs/MPC8548CDS.h | 1 - include/configs/MPC8555CDS.h | 1 - include/configs/MPC8560ADS.h | 1 - include/configs/MPC8568MDS.h | 1 - include/configs/MPC8569MDS.h | 1 - include/configs/MPC8572DS.h | 2 - include/configs/MPC8610HPCD.h | 2 - include/configs/MPC8641HPCN.h | 2 - include/configs/P1010RDB.h | 3 - include/configs/P1022DS.h | 4 - include/configs/P1023RDB.h | 1 - include/configs/P2041RDB.h | 2 - include/configs/T102xQDS.h | 2 - include/configs/T102xRDB.h | 2 - include/configs/T1040QDS.h | 2 - include/configs/T104xRDB.h | 3 - include/configs/T208xQDS.h | 2 - include/configs/T208xRDB.h | 2 - include/configs/T4240QDS.h | 1 - include/configs/T4240RDB.h | 3 - include/configs/UCP1020.h | 2 - include/configs/controlcenterd.h | 1 - include/configs/corenet_ds.h | 2 - include/configs/cyrus.h | 2 - include/configs/km/kmp204x-common.h | 2 - include/configs/p1_p2_rdb_pc.h | 3 - include/configs/p1_twr.h | 1 - include/configs/sbc8548.h | 2 - include/configs/sbc8641d.h | 2 - include/configs/socrates.h | 2 - include/configs/t4qds.h | 2 - include/configs/xpedite517x.h | 2 - include/configs/xpedite520x.h | 1 - include/configs/xpedite537x.h | 1 - include/configs/xpedite550x.h | 1 - scripts/config_whitelist.txt | 3 - 107 files changed, 276 insertions(+), 227 deletions(-)
Diffstat looks good. It's more insertions than deletions because you're not wrapping defaults, but I think in the end it's arguably more readable the way you did it and not worth re-doing the series just over that, thanks!