Skip to content
Snippets Groups Projects
  • Masahiro Yamada's avatar
    e856bdcf
    flash: complete CONFIG_SYS_NO_FLASH move with renaming · e856bdcf
    Masahiro Yamada authored
    
    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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
    e856bdcf
    History
    flash: complete CONFIG_SYS_NO_FLASH move with renaming
    Masahiro Yamada authored
    
    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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
B4860QDS_SECURE_BOOT_defconfig 668 B
CONFIG_PPC=y
CONFIG_SECURE_BOOT=y
CONFIG_MPC85xx=y
CONFIG_TARGET_B4860QDS=y
# CONFIG_SYS_MALLOC_F is not set
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_BOOTDELAY=10
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_GREPENV=y
CONFIG_CMD_SF=y
CONFIG_CMD_I2C=y
CONFIG_CMD_USB=y
CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
CONFIG_CMD_EXT2=y
CONFIG_DM=y
# CONFIG_MMC is not set
CONFIG_MTD_NOR_FLASH=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SST=y
CONFIG_NETDEVICES=y
CONFIG_E1000=y
CONFIG_SYS_NS16550=y
CONFIG_FSL_ESPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_RSA=y
CONFIG_SPL_RSA=y
CONFIG_OF_LIBFDT=y