[PATCH] km/arm: cleanup defconfig files

[Stefan Roese]

On 06.11.20 10:42, Holger Brunck wrote:
> Disable some unneeded config options and adapt the ident string.
> 
> CC: Stefan Roese <sr at denx.de>
> Signed-off-by: Holger Brunck <holger.brunck at hitachi-powergrids.com>

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan

> ---
>   configs/km_kirkwood_128m16_defconfig | 8 +++++---
>   configs/km_kirkwood_defconfig        | 8 +++++---
>   configs/km_kirkwood_pci_defconfig    | 9 ++++++---
>   configs/kmcoge5un_defconfig          | 8 +++++---
>   configs/kmnusa_defconfig             | 8 +++++---
>   configs/kmsuse2_defconfig            | 8 +++++---
>   6 files changed, 31 insertions(+), 18 deletions(-)
> 
> diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig
> index d97e588ede..151425fbe3 100644
> --- a/configs/km_kirkwood_128m16_defconfig
> +++ b/configs/km_kirkwood_128m16_defconfig
> @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x2000
>   CONFIG_ENV_OFFSET=0x0
>   CONFIG_BOOTCOUNT_BOOTLIMIT=3
>   CONFIG_ENV_OFFSET_REDUND=0x2000
> -CONFIG_IDENT_STRING="\nKeymile Kirkwood 128M16"
> +CONFIG_IDENT_STRING="\nHitachi Power Grids Kirkwood 128M16"
>   CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
>   CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_128M16"
>   CONFIG_AUTOBOOT_KEYED=y
> @@ -17,16 +17,18 @@ CONFIG_AUTOBOOT_STOP_STR=" "
>   # CONFIG_DISPLAY_BOARDINFO is not set
>   CONFIG_MISC_INIT_R=y
>   CONFIG_HUSH_PARSER=y
> +# CONFIG_BOOTM_NETBSD is not set
> +# CONFIG_BOOTM_PLAN9 is not set
> +# CONFIG_BOOTM_RTEMS is not set
> +# CONFIG_BOOTM_VXWORKS is not set
>   CONFIG_CMD_ASKENV=y
>   CONFIG_CMD_GREPENV=y
>   CONFIG_CMD_EEPROM=y
>   # CONFIG_CMD_FLASH is not set
>   CONFIG_CMD_I2C=y
>   CONFIG_CMD_NAND=y
> -CONFIG_CMD_DHCP=y
>   CONFIG_CMD_MII=y
>   CONFIG_CMD_PING=y
> -CONFIG_CMD_JFFS2=y
>   CONFIG_CMD_MTDPARTS=y
>   CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
>   CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
> diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig
> index 0b364dcd9a..22c2e0509d 100644
> --- a/configs/km_kirkwood_defconfig
> +++ b/configs/km_kirkwood_defconfig
> @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x2000
>   CONFIG_ENV_OFFSET=0x0
>   CONFIG_BOOTCOUNT_BOOTLIMIT=3
>   CONFIG_ENV_OFFSET_REDUND=0x2000
> -CONFIG_IDENT_STRING="\nKeymile Kirkwood"
> +CONFIG_IDENT_STRING="\nHitachi Power Grids Kirkwood"
>   CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
>   CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD"
>   CONFIG_AUTOBOOT_KEYED=y
> @@ -17,16 +17,18 @@ CONFIG_AUTOBOOT_STOP_STR=" "
>   # CONFIG_DISPLAY_BOARDINFO is not set
>   CONFIG_MISC_INIT_R=y
>   CONFIG_HUSH_PARSER=y
> +# CONFIG_BOOTM_NETBSD is not set
> +# CONFIG_BOOTM_PLAN9 is not set
> +# CONFIG_BOOTM_RTEMS is not set
> +# CONFIG_BOOTM_VXWORKS is not set
>   CONFIG_CMD_ASKENV=y
>   CONFIG_CMD_GREPENV=y
>   CONFIG_CMD_EEPROM=y
>   # CONFIG_CMD_FLASH is not set
>   CONFIG_CMD_I2C=y
>   CONFIG_CMD_NAND=y
> -CONFIG_CMD_DHCP=y
>   CONFIG_CMD_MII=y
>   CONFIG_CMD_PING=y
> -CONFIG_CMD_JFFS2=y
>   CONFIG_CMD_MTDPARTS=y
>   CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
>   CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
> diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig
> index 82d0210574..c091cd6cfe 100644
> --- a/configs/km_kirkwood_pci_defconfig
> +++ b/configs/km_kirkwood_pci_defconfig
> @@ -9,7 +9,7 @@ CONFIG_ENV_SIZE=0x2000
>   CONFIG_ENV_OFFSET=0x0
>   CONFIG_BOOTCOUNT_BOOTLIMIT=3
>   CONFIG_ENV_OFFSET_REDUND=0x2000
> -CONFIG_IDENT_STRING="\nKeymile Kirkwood PCI"
> +CONFIG_IDENT_STRING="\nHitachi Power Grids Kirkwood PCI"
>   CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
>   CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_PCI"
>   CONFIG_AUTOBOOT_KEYED=y
> @@ -18,16 +18,18 @@ CONFIG_AUTOBOOT_STOP_STR=" "
>   # CONFIG_DISPLAY_BOARDINFO is not set
>   CONFIG_MISC_INIT_R=y
>   CONFIG_HUSH_PARSER=y
> +# CONFIG_BOOTM_NETBSD is not set
> +# CONFIG_BOOTM_PLAN9 is not set
> +# CONFIG_BOOTM_RTEMS is not set
> +# CONFIG_BOOTM_VXWORKS is not set
>   CONFIG_CMD_ASKENV=y
>   CONFIG_CMD_GREPENV=y
>   CONFIG_CMD_EEPROM=y
>   # CONFIG_CMD_FLASH is not set
>   CONFIG_CMD_I2C=y
>   CONFIG_CMD_NAND=y
> -CONFIG_CMD_DHCP=y
>   CONFIG_CMD_MII=y
>   CONFIG_CMD_PING=y
> -CONFIG_CMD_JFFS2=y
>   CONFIG_CMD_MTDPARTS=y
>   CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
>   CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
> @@ -46,6 +48,7 @@ CONFIG_BOOTCOUNT_RAM=y
>   CONFIG_MTD=y
>   CONFIG_MTD_RAW_NAND=y
>   CONFIG_SF_DEFAULT_SPEED=8100000
> +CONFIG_SPI_FLASH_MACRONIX=y
>   CONFIG_SPI_FLASH_STMICRO=y
>   CONFIG_MVGBE=y
>   CONFIG_MII=y
> diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig
> index b0ae24df03..4d2c17f399 100644
> --- a/configs/kmcoge5un_defconfig
> +++ b/configs/kmcoge5un_defconfig
> @@ -12,7 +12,7 @@ CONFIG_ENV_OFFSET=0xC0000
>   CONFIG_ENV_SECT_SIZE=0x10000
>   CONFIG_BOOTCOUNT_BOOTLIMIT=3
>   CONFIG_ENV_OFFSET_REDUND=0xD0000
> -CONFIG_IDENT_STRING="\nKeymile COGE5UN"
> +CONFIG_IDENT_STRING="\nHitachi Power Grids COGE5UN"
>   CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
>   CONFIG_SYS_EXTRA_OPTIONS="KM_COGE5UN"
>   CONFIG_AUTOBOOT_KEYED=y
> @@ -21,16 +21,18 @@ CONFIG_AUTOBOOT_STOP_STR=" "
>   # CONFIG_DISPLAY_BOARDINFO is not set
>   CONFIG_MISC_INIT_R=y
>   CONFIG_HUSH_PARSER=y
> +# CONFIG_BOOTM_NETBSD is not set
> +# CONFIG_BOOTM_PLAN9 is not set
> +# CONFIG_BOOTM_RTEMS is not set
> +# CONFIG_BOOTM_VXWORKS is not set
>   CONFIG_CMD_ASKENV=y
>   CONFIG_CMD_GREPENV=y
>   CONFIG_CMD_EEPROM=y
>   # CONFIG_CMD_FLASH is not set
>   CONFIG_CMD_I2C=y
>   CONFIG_CMD_NAND=y
> -CONFIG_CMD_DHCP=y
>   CONFIG_CMD_MII=y
>   CONFIG_CMD_PING=y
> -CONFIG_CMD_JFFS2=y
>   CONFIG_CMD_MTDPARTS=y
>   CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
>   CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
> diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig
> index 6e6cc5a92e..faaa8d1a5f 100644
> --- a/configs/kmnusa_defconfig
> +++ b/configs/kmnusa_defconfig
> @@ -12,7 +12,7 @@ CONFIG_ENV_OFFSET=0xC0000
>   CONFIG_ENV_SECT_SIZE=0x10000
>   CONFIG_BOOTCOUNT_BOOTLIMIT=3
>   CONFIG_ENV_OFFSET_REDUND=0xD0000
> -CONFIG_IDENT_STRING="\nKeymile NUSA"
> +CONFIG_IDENT_STRING="\nHitachi Power Grids Kirkwood"
>   CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
>   CONFIG_SYS_EXTRA_OPTIONS="KM_NUSA"
>   CONFIG_AUTOBOOT_KEYED=y
> @@ -21,16 +21,18 @@ CONFIG_AUTOBOOT_STOP_STR=" "
>   # CONFIG_DISPLAY_BOARDINFO is not set
>   CONFIG_MISC_INIT_R=y
>   CONFIG_HUSH_PARSER=y
> +# CONFIG_BOOTM_NETBSD is not set
> +# CONFIG_BOOTM_PLAN9 is not set
> +# CONFIG_BOOTM_RTEMS is not set
> +# CONFIG_BOOTM_VXWORKS is not set
>   CONFIG_CMD_ASKENV=y
>   CONFIG_CMD_GREPENV=y
>   CONFIG_CMD_EEPROM=y
>   # CONFIG_CMD_FLASH is not set
>   CONFIG_CMD_I2C=y
>   CONFIG_CMD_NAND=y
> -CONFIG_CMD_DHCP=y
>   CONFIG_CMD_MII=y
>   CONFIG_CMD_PING=y
> -CONFIG_CMD_JFFS2=y
>   CONFIG_CMD_MTDPARTS=y
>   CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
>   CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
> diff --git a/configs/kmsuse2_defconfig b/configs/kmsuse2_defconfig
> index 0b75b2e80d..d8280f961b 100644
> --- a/configs/kmsuse2_defconfig
> +++ b/configs/kmsuse2_defconfig
> @@ -13,7 +13,7 @@ CONFIG_ENV_OFFSET=0xC0000
>   CONFIG_ENV_SECT_SIZE=0x10000
>   CONFIG_BOOTCOUNT_BOOTLIMIT=3
>   CONFIG_ENV_OFFSET_REDUND=0xD0000
> -CONFIG_IDENT_STRING="\nABB SUSE2"
> +CONFIG_IDENT_STRING="\nHitachi Power Grids Kirkwood"
>   CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood"
>   CONFIG_SYS_EXTRA_OPTIONS="KM_SUSE2"
>   CONFIG_AUTOBOOT_KEYED=y
> @@ -22,16 +22,18 @@ CONFIG_AUTOBOOT_STOP_STR=" "
>   # CONFIG_DISPLAY_BOARDINFO is not set
>   CONFIG_MISC_INIT_R=y
>   CONFIG_HUSH_PARSER=y
> +# CONFIG_BOOTM_NETBSD is not set
> +# CONFIG_BOOTM_PLAN9 is not set
> +# CONFIG_BOOTM_RTEMS is not set
> +# CONFIG_BOOTM_VXWORKS is not set
>   CONFIG_CMD_ASKENV=y
>   CONFIG_CMD_GREPENV=y
>   CONFIG_CMD_EEPROM=y
>   # CONFIG_CMD_FLASH is not set
>   CONFIG_CMD_I2C=y
>   CONFIG_CMD_NAND=y
> -CONFIG_CMD_DHCP=y
>   CONFIG_CMD_MII=y
>   CONFIG_CMD_PING=y
> -CONFIG_CMD_JFFS2=y
>   CONFIG_CMD_MTDPARTS=y
>   CONFIG_MTDIDS_DEFAULT="nand0=orion_nand"
>   CONFIG_MTDPARTS_DEFAULT="mtdparts=orion_nand:-(ubi0);"
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de