[U-Boot] [PATCH 2/3] flash: complete CONFIG_SYS_NO_FLASH move with renaming

[Tom Rini]

On Sat, Feb 11, 2017 at 10:43:54PM +0900, Masahiro Yamada wrote:

> We repeated partial moves for CONFIG_SYS_NO_FLASH, but this is
> not completed. Finish this work by the tool.
> 
> During this move, let's rename it to CONFIG_MTD_NOR_FLASH.
> Actually, we have more instances of "#ifndef CONFIG_SYS_NO_FLASH"
> than those of "#ifdef CONFIG_SYS_NO_FLASH".  Flipping the logic will
> make the code more readable.  Besides, negative meaning symbols do
> not fit in obj-$(CONFIG_...) style Makefiles.
> 
> This commit was created as follows:
> 
> [1] Edit "default n" to "default y" in the config entry in
>     common/Kconfig.
> 
> [2] Run "tools/moveconfig.py -y -r HEAD SYS_NO_FLASH"
> 
> [3] Rename the instances in defconfigs by the following:
>   find . -path './configs/*_defconfig' | xargs sed -i \
>   -e '/CONFIG_SYS_NO_FLASH=y/d' \
>   -e 's/# CONFIG_SYS_NO_FLASH is not set/CONFIG_MTD_NOR_FLASH=y/'
> 
> [4] Change the conditionals by the following:
>   find . -name '*.[ch]' | xargs sed -i \
>   -e 's/ifndef CONFIG_SYS_NO_FLASH/ifdef CONFIG_MTD_NOR_FLASH/' \
>   -e 's/ifdef CONFIG_SYS_NO_FLASH/ifndef CONFIG_MTD_NOR_FLASH/' \
>   -e 's/!defined(CONFIG_SYS_NO_FLASH)/defined(CONFIG_MTD_NOR_FLASH)/' \
>   -e 's/defined(CONFIG_SYS_NO_FLASH)/!defined(CONFIG_MTD_NOR_FLASH)/'
> 
> [5] Modify the following manually
>   - Rename the rest of instances
>   - Remove the description from README
>   - Create the new Kconfig entry in drivers/mtd/Kconfig
>   - Remove the old Kconfig entry from common/Kconfig
>   - Remove the garbage comments from include/configs/*.h
> 
> Signed-off-by: Masahiro Yamada <yamada.masahiro at socionext.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170212/81e60501/attachment.sig>