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 9E61FC54EED for ; Mon, 23 Jan 2023 08:40:03 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 28236852B0; Mon, 23 Jan 2023 09:40:00 +0100 (CET) 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="AKX/qiIj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B1C0D856F9; Mon, 23 Jan 2023 09:39:58 +0100 (CET) Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) (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 3156F852B0 for ; Mon, 23 Jan 2023 09:39:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=mibodhi@gmail.com Received: by mail-qt1-x834.google.com with SMTP id x7so9105227qtv.13 for ; Mon, 23 Jan 2023 00:39:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=fZjGxfsX02h1pr7604pPBuI7/5U4nf+hC7uUJGjLFrc=; b=AKX/qiIjH/XopI7cRcB5J2xksJcWspezM16tpQh7b00jlc+YpoDvznf09aPoykNfUC PbhKoQ8643y5ew+5520g0gzu6WOE1E/QRicmKwZ8Lv0+oTZ9/eQKujRpstz0w4r9UDkW gStOahgCvzDnVZo+tac0Q1qpQuBagiW4Kbn2kzVtrs7+Wy2zI1xL87Lw+VHtq/f6DpA1 g5CFvsbz94O3c6/aM9hmTxOheyEyIAZ9t27yCSoMSNwE3X1ISWPqsuRr+VN2j2KeM2ON sFLtBSnJ291LgGksIo/WO70moqvpZXxZM6x9l+TvI0L6w5xcOV/fvWNXnRmcmFpJXpB0 uLDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=fZjGxfsX02h1pr7604pPBuI7/5U4nf+hC7uUJGjLFrc=; b=6XUOMI3E3tNWEZR5nStm4vRPjQmcab3t6nWQBOzBngnvKVuUukWCSkz8J78ygIuxQv 6orG50eLsweSGMQV257pgLxerECeTWtyvn+yKaWYkdOjQUPTw50p2tYz+COySvTg2nB5 dpdvF7q8DQ7v2kndChgd9r/IMxaIdVL8S0j02b2d2bFjuKLZplao2cMr06E4GYmoznV6 oFLLf3iPt4SYRrf6pI//nOoRoNCFJC0WrLrSXXpCWLRbhD/X2AKYywHvbgbRkuQw7zEr vIvgGaCumLiHTZ2+f9WVvPjFcHXZVp2ztK3CvreJkSVtpcYAsWjlnM2potCStt+yhoM4 rJtw== X-Gm-Message-State: AFqh2krUDraasZywEfNAKvPPy9r6TmeQtp4MQuVuzhiI1MCc5CX98954 7JVUluV9HS6K7SX31ju+8wg= X-Google-Smtp-Source: AMrXdXsdNKwk9hKDOwOB0QRGlj52dEpJF/6iQ04LaBvHn8mhUEjC15rFqnUrELoFkHH4ZXMARhv8Dg== X-Received: by 2002:ac8:4c84:0:b0:3a6:a89d:9ee with SMTP id j4-20020ac84c84000000b003a6a89d09eemr32289203qtv.33.1674463192778; Mon, 23 Jan 2023 00:39:52 -0800 (PST) Received: from localhost.localdomain (76-229-100-169.lightspeed.irvnca.sbcglobal.net. [76.229.100.169]) by smtp.gmail.com with ESMTPSA id w19-20020a05620a445300b00706c1f7a608sm9741007qkp.89.2023.01.23.00.39.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 00:39:52 -0800 (PST) From: Tony Dinh To: Stefan Roese , U-Boot Mailing List Cc: Michael Walle , =?UTF-8?q?Pali=20Roh=E1r?= , Tom Rini , Tony Dinh , Dave Purdy , Luka Perkov Subject: [PATCH] arm: kirkwood: Use Kirkwood common early malloc area for various Kirkwood boards Date: Mon, 23 Jan 2023 00:39:34 -0800 Message-Id: <20230123083935.11077-1-mibodhi@gmail.com> X-Mailer: git-send-email 2.30.2 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.6 at phobos.denx.de X-Virus-Status: Clean For Kirkwood boards, it is necessary to have early malloc in DRAM area when Driver Model for Serial is enabled. This patch removes individual board settings for early malloc in various Kirkwood boards, and uses the Kirkwood commonly defined settings in arch/arm/mach-kirkwood/Kconfig. Signed-off-by: Tony Dinh --- configs/dockstar_defconfig | 3 --- configs/dreamplug_defconfig | 3 --- configs/goflexhome_defconfig | 3 --- configs/iconnect_defconfig | 3 --- configs/nsa310s_defconfig | 3 --- configs/pogo_e02_defconfig | 3 --- configs/pogo_v4_defconfig | 3 --- configs/sheevaplug_defconfig | 3 --- 8 files changed, 24 deletions(-) diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig index a17d01f3fd..d08182d270 100644 --- a/configs/dockstar_defconfig +++ b/configs/dockstar_defconfig @@ -17,9 +17,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dockstar" CONFIG_SYS_PROMPT="DockStar> " CONFIG_IDENT_STRING="\nSeagate FreeAgent DockStar" CONFIG_SYS_LOAD_ADDR=0x800000 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 -# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs ${console} ${mtdparts} ${bootargs_root}; ubi part root; ubifsmount ubi:root; ubifsload 0x800000 ${kernel}; ubifsload 0x1100000 ${initrd}; bootm 0x800000 0x1100000" diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig index 6deb05575c..3cff5034b9 100644 --- a/configs/dreamplug_defconfig +++ b/configs/dreamplug_defconfig @@ -17,9 +17,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dreamplug" CONFIG_IDENT_STRING="\nMarvell-DreamPlug" CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_ENV_ADDR=0x100000 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 -# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv ethact ethernet-controller@72000; ${x_bootcmd_ethernet}; setenv ethact ethernet-controller@76000; ${x_bootcmd_ethernet}; ${x_bootcmd_usb}; ${x_bootcmd_kernel}; setenv bootargs ${x_bootargs} ${x_bootargs_root}; bootm 0x6400000;" diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig index 8ee1183309..8dc285241b 100644 --- a/configs/goflexhome_defconfig +++ b/configs/goflexhome_defconfig @@ -17,9 +17,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-goflexnet" CONFIG_SYS_PROMPT="GoFlexHome> " CONFIG_IDENT_STRING="\nSeagate GoFlex Home" CONFIG_SYS_LOAD_ADDR=0x800000 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 -# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs ${console} ${mtdparts} ${bootargs_root}; ubi part root; ubifsmount ubi:root; ubifsload 0x800000 ${kernel}; bootm 0x800000" diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig index f536dd3bcb..94f4ee2772 100644 --- a/configs/iconnect_defconfig +++ b/configs/iconnect_defconfig @@ -17,9 +17,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-iconnect" CONFIG_SYS_PROMPT="iConnect> " CONFIG_IDENT_STRING=" Iomega iConnect" CONFIG_SYS_LOAD_ADDR=0x800000 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 -# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs ${console} ${mtdparts} ${bootargs_root}; ubi part rootfs; ubifsmount ubi:rootfs; ubifsload 0x800000 ${kernel}; bootm 0x800000" diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig index e7d6ffd925..ab896ff54e 100644 --- a/configs/nsa310s_defconfig +++ b/configs/nsa310s_defconfig @@ -9,7 +9,6 @@ CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y CONFIG_SYS_KWD_CONFIG="board/zyxel/nsa310s/kwbimage.cfg" CONFIG_TEXT_BASE=0x600000 -CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_NSA310S=y CONFIG_ENV_SIZE=0x20000 @@ -19,8 +18,6 @@ CONFIG_SYS_PROMPT="NSA310s> " CONFIG_IDENT_STRING="\nZyXEL NSA310S/320S 1/2-Bay Power Media Server" CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_DISTRO_DEFAULTS=y -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 CONFIG_BOOTDELAY=3 CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig index 116e5d0ed3..067fb9e13b 100644 --- a/configs/pogo_e02_defconfig +++ b/configs/pogo_e02_defconfig @@ -17,9 +17,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-pogo_e02" CONFIG_SYS_PROMPT="PogoE02> " CONFIG_IDENT_STRING="\nPogo E02" CONFIG_SYS_LOAD_ADDR=0x800000 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 -# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs $(bootargs_console); run bootcmd_usb; bootm 0x00800000 0x01100000" diff --git a/configs/pogo_v4_defconfig b/configs/pogo_v4_defconfig index 57ec6f1fb6..3860ad30d3 100644 --- a/configs/pogo_v4_defconfig +++ b/configs/pogo_v4_defconfig @@ -9,7 +9,6 @@ CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y CONFIG_SYS_KWD_CONFIG="board/cloudengines/pogo_v4/kwbimage.cfg" CONFIG_TEXT_BASE=0x600000 -CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_TARGET_POGO_V4=y CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0xC0000 @@ -18,8 +17,6 @@ CONFIG_SYS_PROMPT="Pogo_V4> " CONFIG_IDENT_STRING="\nPogoplug V4" CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_DISTRO_DEFAULTS=y -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 CONFIG_BOOTSTAGE=y CONFIG_SHOW_BOOT_PROGRESS=y CONFIG_BOOTDELAY=10 diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 79f36c0360..cb38a3fbd5 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -16,9 +16,6 @@ CONFIG_ENV_OFFSET=0x80000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-sheevaplug" CONFIG_IDENT_STRING="\nMarvell-Sheevaplug" CONFIG_SYS_LOAD_ADDR=0x800000 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 -# CONFIG_SYS_MALLOC_F is not set CONFIG_HAS_BOARD_SIZE_LIMIT=y CONFIG_BOARD_SIZE_LIMIT=524288 CONFIG_BOOTDELAY=3 -- 2.30.2