From mboxrd@z Thu Jan 1 00:00:00 1970 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 8CE37C433F5 for ; Fri, 22 Apr 2022 12:04:43 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6998A83CF3; Fri, 22 Apr 2022 14:04:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Dm1Ih2cj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7B07E83CA4; Fri, 22 Apr 2022 14:04:39 +0200 (CEST) Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) (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 D273383CA4 for ; Fri, 22 Apr 2022 14:04:35 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jh80.chung@gmail.com Received: by mail-pl1-x62f.google.com with SMTP id n8so10416189plh.1 for ; Fri, 22 Apr 2022 05:04:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :cc:references:from:in-reply-to:content-transfer-encoding; bh=1ZpC0m30XL4Sy+d26buKIm/ufFXBVGJnzfVZDHE217M=; b=Dm1Ih2cj/wWOTWMKOvmJWEtIyNvFHOs45iKfUG2jCplFrzoAOMJviKzqlXd4cakOqq w3pK1ilQw/lW2Uh+4fs79kmdZZdi5eKq7IMpWLYu9TWAm5va1xBp2PMxgm2/VQT/j+1J 4bEjDlwyRtikysZjIWp3pXs7ICgp3Gk2St/z8dBACxjD1MgARPW1EF/CqSj3RpAY+4uC 7mO0vRHDxCZxdV+ssvJv/F1ATlBoj5jisIiidQnXYO0l9OpHKOgND7BGfA5DdblZzvsY fkzxyepHi11YmV15JOVxOkeu/XehcZUQ/Mt6mecULe9SB7yC/ldtdFTmF25zW2HnC0f4 hcXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=1ZpC0m30XL4Sy+d26buKIm/ufFXBVGJnzfVZDHE217M=; b=ubFEa8CM9BCvnDlePIs9o9MjZwkOJcV2oIP3QEfkCE1FzvJY8Lj8CrLagekdBqIRDM TSTeAy82p/PXd1yeOGAIM8EDpKtUT6zFMKK7i1iUZuHtt2YWYVIbR17AiUXeGNA+MHZ6 Iz1Kt4PMa5Sqlcq237kO0I/3jSN+4DD7F4phRvGGwY1XSz81q7YJY+jUJTaZqfsBOZdX qOst9tOcsuf8wwb9MkREgon8py55r0l0WMCWL0/B5sJ6Qsjherh6yAtJGsgX31Jwbd/Q PtumxQrS9J6eUm/dVFDuEbl3HO0OG2R/JbfzWxOiV+JEyj94XjhdSzC+T1za4AKM8QnS m3bA== X-Gm-Message-State: AOAM531luAL2PHIWVH9R9MwtMHZixkXNcP9OuLa1eeg4pGTmaMp8NJ8S +OGW5ldtkTolYvRW5zZVCW8= X-Google-Smtp-Source: ABdhPJwzc8ZtJuNc69V7U4I5wMpOh7C0BjbfumSvpIAdmpwGnOpSkQlFYrbpNmdJvHqbW4cG6DB45A== X-Received: by 2002:a17:902:dad1:b0:15a:54d4:900b with SMTP id q17-20020a170902dad100b0015a54d4900bmr4176159plx.25.1650629074328; Fri, 22 Apr 2022 05:04:34 -0700 (PDT) Received: from [192.168.0.19] ([183.99.112.216]) by smtp.gmail.com with ESMTPSA id 21-20020a630115000000b00382a0895661sm2154552pgb.11.2022.04.22.05.04.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 22 Apr 2022 05:04:32 -0700 (PDT) Message-ID: Date: Fri, 22 Apr 2022 21:04:29 +0900 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [PATCH 06/25] s5p_goni, smdkc100: Move some environment settings out of CONFIG Content-Language: en-US To: Tom Rini , u-boot@lists.denx.de Cc: Jaehoon Chung , Minkyu Kang References: <20220330220735.908616-1-trini@konsulko.com> <20220330220735.908616-6-trini@konsulko.com> From: Jaehoon Chung In-Reply-To: <20220330220735.908616-6-trini@konsulko.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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 On 3/31/22 07:07, Tom Rini wrote: > A number of CONFIG options are used on these platforms as part of the > default environment. Set some of these more directly and in other > cases, just reference them directly. > > Cc: Jaehoon Chung > Cc: Minkyu Kang > Signed-off-by: Tom Rini Reviewed-by: Jaehoon Chung Best Regards, Jaehoon Chung > --- > include/configs/s5p_goni.h | 23 ++++++++++------------- > include/configs/smdkc100.h | 24 ++++++++++-------------- > 2 files changed, 20 insertions(+), 27 deletions(-) > > diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h > index 0ec60cadb49e..3b4347dd00bd 100644 > --- a/include/configs/s5p_goni.h > +++ b/include/configs/s5p_goni.h > @@ -67,18 +67,14 @@ > "name="PARTS_CSC",size=150MiB,uuid=${uuid_gpt_"PARTS_CSC"};" \ > "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \ > > -#define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext4" \ > - " ${console} ${meminfo}" > - > -#define CONFIG_COMMON_BOOT "${console} ${meminfo} ${mtdparts}" > - > -#define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x100000;" \ > - " onenand write 0x32008000 0x0 0x100000\0" > +#define COMMON_BOOT "${console} ${meminfo} ${mtdparts}" > > #define CONFIG_MISC_COMMON > > #define CONFIG_EXTRA_ENV_SETTINGS \ > - CONFIG_UPDATEB \ > + "updateb=" \ > + "onenand erase 0x0 0x100000;" \ > + "onenand write 0x32008000 0x0 0x100000\0" \ > "updatek=" \ > "onenand erase 0xc00000 0x600000;" \ > "onenand write 0x31008000 0xc00000 0x600000\0" \ > @@ -91,22 +87,23 @@ > "flashboot=" \ > "set bootargs root=/dev/mtdblock${bootblock} " \ > "rootfstype=${rootfstype} ${opts} " \ > - "${lcdinfo} " CONFIG_COMMON_BOOT "; run bootk\0" \ > + "${lcdinfo} " COMMON_BOOT "; run bootk\0" \ > "ubifsboot=" \ > "set bootargs root=ubi0!rootfs rootfstype=ubifs " \ > "${opts} ${lcdinfo} " \ > - CONFIG_COMMON_BOOT "; run bootk\0" \ > + COMMON_BOOT "; run bootk\0" \ > "tftpboot=" \ > "set bootargs root=ubi0!rootfs rootfstype=ubifs " \ > - "${opts} ${lcdinfo} " CONFIG_COMMON_BOOT \ > + "${opts} ${lcdinfo} " COMMON_BOOT \ > "; tftp 0x30007FC0 uImage; bootm 0x30007FC0\0" \ > "ramboot=" \ > - "set bootargs " CONFIG_RAMDISK_BOOT \ > + "set bootargs root=/dev/ram0 rw rootfstype=ext4" \ > + " ${console} ${meminfo} " \ > "initrd=0x33000000,8M ramdisk=8192\0" \ > "mmcboot=" \ > "set bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} " \ > "rootfstype=${rootfstype} ${opts} ${lcdinfo} " \ > - CONFIG_COMMON_BOOT "; run bootk\0" \ > + COMMON_BOOT "; run bootk\0" \ > "boottrace=setenv opts initcall_debug; run bootcmd\0" \ > "bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \ > "verify=n\0" \ > diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h > index 4401094ee39c..8eea45450b5c 100644 > --- a/include/configs/smdkc100.h > +++ b/include/configs/smdkc100.h > @@ -35,19 +35,14 @@ > /* PWM */ > #define CONFIG_PWM 1 > > -#define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext2" \ > - " console=ttySAC0,115200n8" \ > - " mem=128M" > - > -#define CONFIG_COMMON_BOOT "console=ttySAC0,115200n8" \ > +#define COMMON_BOOT "console=ttySAC0,115200n8" \ > " mem=128M " \ > " " CONFIG_MTDPARTS_DEFAULT > > -#define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x40000;" \ > - " onenand write 0x32008000 0x0 0x40000\0" > - > #define CONFIG_EXTRA_ENV_SETTINGS \ > - CONFIG_UPDATEB \ > + "updateb=" \ > + "onenand erase 0x0 0x40000;" \ > + "onenand write 0x32008000 0x0 0x40000\0" \ > "updatek=" \ > "onenand erase 0x60000 0x300000;" \ > "onenand write 0x31008000 0x60000 0x300000\0" \ > @@ -60,25 +55,26 @@ > "flashboot=" \ > "set bootargs root=/dev/mtdblock${bootblock} " \ > "rootfstype=${rootfstype} " \ > - "ubi.mtd=${ubiblock} ${opts} " CONFIG_COMMON_BOOT ";" \ > + "ubi.mtd=${ubiblock} ${opts} " COMMON_BOOT ";" \ > "run bootk\0" \ > "ubifsboot=" \ > "set bootargs root=ubi0!rootfs rootfstype=ubifs " \ > - " ubi.mtd=${ubiblock} ${opts} " CONFIG_COMMON_BOOT "; " \ > + " ubi.mtd=${ubiblock} ${opts} " COMMON_BOOT "; " \ > "run bootk\0" \ > "boottrace=setenv opts initcall_debug; run bootcmd\0" \ > "android=" \ > "set bootargs root=ubi0!ramdisk ubi.mtd=${ubiblock} " \ > - "rootfstype=ubifs init=/init.sh " CONFIG_COMMON_BOOT "; " \ > + "rootfstype=ubifs init=/init.sh " COMMON_BOOT "; " \ > "run bootk\0" \ > "nfsboot=" \ > "set bootargs root=/dev/nfs ubi.mtd=${ubiblock} " \ > "nfsroot=${nfsroot},nolock " \ > "ip=${ipaddr}:${serverip}:${gatewayip}:" \ > - "${netmask}:nowplus:usb0:off " CONFIG_COMMON_BOOT "; " \ > + "${netmask}:nowplus:usb0:off " COMMON_BOOT "; " \ > "run bootk\0" \ > "ramboot=" \ > - "set bootargs " CONFIG_RAMDISK_BOOT \ > + "set bootargs root=/dev/ram0 rw rootfstype=ext2" \ > + " console=ttySAC0,115200n8 mem=128M" \ > " initrd=0x33000000,8M ramdisk=8192\0" \ > "rootfstype=cramfs\0" \ > "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \