Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0FC72C433FE for ; Wed, 23 Mar 2022 21:21:30 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0DEFC83FD6; Wed, 23 Mar 2022 22:21:02 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id CC75383FC8; Wed, 23 Mar 2022 22:20:29 +0100 (CET) Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D1EB083FD5 for ; Wed, 23 Mar 2022 22:20:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f180.google.com with SMTP id q194so2155739qke.5 for ; Wed, 23 Mar 2022 14:20:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LKsa+LpywSHhlluvW00MGytryF4kd3YL4iGz+HxHgeU=; b=fa60pjnNYhMpu3hB9SiAuvn4z8L+uxrm59xerGJ0bQI2bRioHSh5xkN7m7uYBIdZ14 AxcbhMyfxKm6eobsXQbc5GlZPEWMzxK+Rmu53RJE79F/hzwe64pO0et9j04vNE1X3LXi Wdt8yi1vktnVsgAEwXx/d+TRBabQF7zfkp2OaakhrUTWQAS3H7TIayJ+8K5gZ/N3nnza CJdc0eEuX4VDllh1JAXNDaYbuCD3ArDH91U4rnrHHbgs+QEM8pOn0x4VZ0HBeemGzT0F jGrdY09O4/x2idG6K6s2LlX3Mu+eom2iCaJUWagHT5bT15cZV8YhMV79kiZzVsCI70Bb flpA== X-Gm-Message-State: AOAM530TkPADlhT7/5qzBAkl/Mae2134ymaKbSHToh3YWucgERWaj+W5 1umnaYQ/VIlyoGv6i80Y7NpW5P1sXQ== X-Google-Smtp-Source: ABdhPJxy/PiAhcvMClrcBhA3kgzic2bKRV2HxkzQu62AvIPo1yJioOSWnb2qYbgPAbfJC6kx5jzlgw== X-Received: by 2002:a05:620a:28c7:b0:67d:6d4e:16ee with SMTP id l7-20020a05620a28c700b0067d6d4e16eemr1336352qkp.59.1648070422510; Wed, 23 Mar 2022 14:20:22 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-2ef0-5dff-fedb-a8ba.res6.spectrum.com. [2603:6081:7b01:cbda:2ef0:5dff:fedb:a8ba]) by smtp.gmail.com with ESMTPSA id w8-20020ac87e88000000b002e1cdc11203sm868269qtj.18.2022.03.23.14.20.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Mar 2022 14:20:21 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Holger Brunck Subject: [PATCH 10/22] Convert CONFIG_KM_COGE5UN et al to Kconfig Date: Wed, 23 Mar 2022 17:19:57 -0400 Message-Id: <20220323212009.1066483-10-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220323212009.1066483-1-trini@konsulko.com> References: <20220323212009.1066483-1-trini@konsulko.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean This converts the following to Kconfig: CONFIG_KM_COGE5UN CONFIG_KM_KIRKWOOD_128M16 CONFIG_KM_KIRKWOOD CONFIG_KM_KIRKWOOD_PCI CONFIG_KM_NUSA CONFIG_KM_SUSE2 Cc: Holger Brunck Signed-off-by: Tom Rini --- board/keymile/km_arm/Kconfig | 23 +++++++++++++++++++++++ configs/km_kirkwood_128m16_defconfig | 2 +- configs/km_kirkwood_defconfig | 2 +- configs/km_kirkwood_pci_defconfig | 2 +- configs/kmcoge5un_defconfig | 1 - configs/kmnusa_defconfig | 2 +- configs/kmsuse2_defconfig | 2 +- 7 files changed, 28 insertions(+), 6 deletions(-) diff --git a/board/keymile/km_arm/Kconfig b/board/keymile/km_arm/Kconfig index c52b365b1757..9d222d713653 100644 --- a/board/keymile/km_arm/Kconfig +++ b/board/keymile/km_arm/Kconfig @@ -60,4 +60,27 @@ config BOARD_SPECIFIC_OPTIONS # dummy imply FS_CRAMFS imply CMD_USB +choice + prompt "Board model" + +config KM_COGE5UN + bool "Hitachi Power Grids COGE5UN" + +config KM_KIRKWOOD_128M16 + bool "Hitachi Power Grids Kirkwood 128M16" + +config KM_KIRKWOOD + bool "Hitachi Power Grids Kirkwood" + +config KM_KIRKWOOD_PCI + bool "Hitachi Power Grids Kirkwood PCI" + +config KM_NUSA + bool "Hitachi Power Grids Kirkwood (NUSA)" + +config KM_SUSE2 + bool "Hitachi Power Grids Kirkwood (SUSE2)" + +endchoice + endif diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig index 470c6e69e8be..36bb19f4033a 100644 --- a/configs/km_kirkwood_128m16_defconfig +++ b/configs/km_kirkwood_128m16_defconfig @@ -6,6 +6,7 @@ CONFIG_ARCH_KIRKWOOD=y CONFIG_SYS_KWD_CONFIG="board/keymile/km_arm/kwbimage_128M16_1.cfg" CONFIG_SYS_TEXT_BASE=0x07d00000 CONFIG_TARGET_KM_KIRKWOOD=y +CONFIG_KM_KIRKWOOD_128M16=y CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x0 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood" @@ -13,7 +14,6 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_ENV_OFFSET_REDUND=0x2000 CONFIG_IDENT_STRING="\nHitachi Power Grids Kirkwood 128M16" CONFIG_SYS_LOAD_ADDR=0x800000 -CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_128M16" CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit key to stop autoboot in %2ds\n" CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig index 7caa9edae207..a2213b698e14 100644 --- a/configs/km_kirkwood_defconfig +++ b/configs/km_kirkwood_defconfig @@ -6,6 +6,7 @@ CONFIG_ARCH_KIRKWOOD=y CONFIG_SYS_KWD_CONFIG="board/keymile/km_arm/kwbimage.cfg" CONFIG_SYS_TEXT_BASE=0x07d00000 CONFIG_TARGET_KM_KIRKWOOD=y +CONFIG_KM_KIRKWOOD=y CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x0 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood" @@ -13,7 +14,6 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_ENV_OFFSET_REDUND=0x2000 CONFIG_IDENT_STRING="\nHitachi Power Grids Kirkwood" CONFIG_SYS_LOAD_ADDR=0x800000 -CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD" CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit key to stop autoboot in %2ds\n" CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig index db2d532af2c4..a2d6ec8f3558 100644 --- a/configs/km_kirkwood_pci_defconfig +++ b/configs/km_kirkwood_pci_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_KWD_CONFIG="board/keymile/km_arm/kwbimage.cfg" CONFIG_SYS_TEXT_BASE=0x07d00000 CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_KM_FPGA_CONFIG=y +CONFIG_KM_KIRKWOOD_PCI=y CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x0 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-km_kirkwood" @@ -14,7 +15,6 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_ENV_OFFSET_REDUND=0x2000 CONFIG_IDENT_STRING="\nHitachi Power Grids Kirkwood PCI" CONFIG_SYS_LOAD_ADDR=0x800000 -CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_PCI" CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit key to stop autoboot in %2ds\n" CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig index 25db57fc16d8..5cae77bf8e68 100644 --- a/configs/kmcoge5un_defconfig +++ b/configs/kmcoge5un_defconfig @@ -17,7 +17,6 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_ENV_OFFSET_REDUND=0xD0000 CONFIG_IDENT_STRING="\nHitachi Power Grids COGE5UN" CONFIG_SYS_LOAD_ADDR=0x800000 -CONFIG_SYS_EXTRA_OPTIONS="KM_COGE5UN" CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit key to stop autoboot in %2ds\n" CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig index 690cb3cfa548..5b17ed516f6e 100644 --- a/configs/kmnusa_defconfig +++ b/configs/kmnusa_defconfig @@ -9,6 +9,7 @@ CONFIG_TARGET_KM_KIRKWOOD=y CONFIG_KM_FPGA_CONFIG=y CONFIG_KM_ENV_IS_IN_SPI_NOR=y CONFIG_KM_PIGGY4_88E6352=y +CONFIG_KM_NUSA=y CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_SECT_SIZE=0x10000 @@ -17,7 +18,6 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_ENV_OFFSET_REDUND=0xD0000 CONFIG_IDENT_STRING="\nHitachi Power Grids Kirkwood" CONFIG_SYS_LOAD_ADDR=0x800000 -CONFIG_SYS_EXTRA_OPTIONS="KM_NUSA" CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit key to stop autoboot in %2ds\n" CONFIG_AUTOBOOT_STOP_STR=" " diff --git a/configs/kmsuse2_defconfig b/configs/kmsuse2_defconfig index 409eb456e090..5575c7611b1f 100644 --- a/configs/kmsuse2_defconfig +++ b/configs/kmsuse2_defconfig @@ -10,6 +10,7 @@ CONFIG_KM_FPGA_CONFIG=y CONFIG_KM_FPGA_FORCE_CONFIG=y CONFIG_KM_FPGA_NO_RESET=y CONFIG_KM_ENV_IS_IN_SPI_NOR=y +CONFIG_KM_SUSE2=y CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_SECT_SIZE=0x10000 @@ -18,7 +19,6 @@ CONFIG_BOOTCOUNT_BOOTLIMIT=3 CONFIG_ENV_OFFSET_REDUND=0xD0000 CONFIG_IDENT_STRING="\nHitachi Power Grids Kirkwood" CONFIG_SYS_LOAD_ADDR=0x800000 -CONFIG_SYS_EXTRA_OPTIONS="KM_SUSE2" CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Hit key to stop autoboot in %2ds\n" CONFIG_AUTOBOOT_STOP_STR=" " -- 2.25.1