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 D785AC4332F for ; Sun, 20 Nov 2022 14:20:42 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1CECE852F8; Sun, 20 Nov 2022 15:14:03 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="ecA/yNUd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6871C853A9; Sun, 20 Nov 2022 15:12:15 +0100 (CET) Received: from mail-qv1-xf2a.google.com (mail-qv1-xf2a.google.com [IPv6:2607:f8b0:4864:20::f2a]) (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 A4026853A4 for ; Sun, 20 Nov 2022 15:09:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qv1-xf2a.google.com with SMTP id k2so5317335qvo.1 for ; Sun, 20 Nov 2022 06:09:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=T0FB8L5xcImd+/SZoVSNx/kwWqIzlznn6o9ddWf+m5g=; b=ecA/yNUdexWDMy9i6nAy9bDQQt0/8X5am406vU4PkkrM7vH1F9FfC1Txvio7T3aDuC IA0pLOGaQGp+er7M0/PmtLre6EvS2gQJyBG3Jq1bNxKuQrs/1ZrD5v3qLfoNzcScmKo8 lgMITftu2xi5Z7mnlyE5l4Q9bku2xtsNhAbnE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T0FB8L5xcImd+/SZoVSNx/kwWqIzlznn6o9ddWf+m5g=; b=JHuIL9CbMV+QVjexZmj8+HUyNhRBzV7hxhweMZy9cxJZ4D1k99b5hL5AVF00H42Sh8 LqMTATejbSQ8veox/VPAUJGtVae3H8lfjk9neVFvTVdfcMs+DUCDp+AUKebZ5jgndcMS iXbP5m+wK4KrBHG0kMQULON/4BmxSdxfBMkUPxgiNW9Z8CLp2ASMIhrX9X+fx1YYD1/V 6/ml+YGw42qaUIUit15nT6Pjz//sAmFNVfvyV3gCBREPVlIWm7kW5CoXoe1hwequfYfL EXsWwnXDNe+RF/dodGStf6/xXE/SKQ/yVmpCHxs6Vhb2oCpJJ+BIVa7xfGka9sKa/JNp eGwQ== X-Gm-Message-State: ANoB5pntijPmEpCJAVvFSIbTYLzhw00NWZKxIX3ecLCftRam5ex5Oh66 441nJPz8uU99APUJPAfiWjJTx2trhKSwjQ== X-Google-Smtp-Source: AA0mqf6A3etEDpWF7G9XYx5yc39rFyFysG/W0iJMZb6N9Dbk1rNQYeLxqBhMctAdLl/+2U1XyoqT3w== X-Received: by 2002:a05:6214:3788:b0:4bb:658f:c81b with SMTP id ni8-20020a056214378800b004bb658fc81bmr13901794qvb.56.1668953351965; Sun, 20 Nov 2022 06:09:11 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-29a0-035f-b06a-235e.res6.spectrum.com. [2603:6081:7b00:6400:29a0:35f:b06a:235e]) by smtp.gmail.com with ESMTPSA id bk23-20020a05620a1a1700b006ce580c2663sm6387502qkb.35.2022.11.20.06.09.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Nov 2022 06:09:11 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PoC 175/241] global: Migrate CONFIG_SERIAL_BOOT to CFG Date: Sun, 20 Nov 2022 09:08:05 -0500 Message-Id: <20221120140829.3057894-66-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221120140829.3057894-1-trini@konsulko.com> References: <20221120135520.3057773-4-trini@konsulko.com> <20221120140829.3057894-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.6 at phobos.denx.de X-Virus-Status: Clean Signed-off-by: Tom Rini --- arch/m68k/cpu/mcf5445x/cpu_init.c | 2 +- arch/m68k/cpu/mcf5445x/start.S | 10 +++++----- include/configs/stmark2.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/m68k/cpu/mcf5445x/cpu_init.c b/arch/m68k/cpu/mcf5445x/cpu_init.c index 1ce244872f14..257af6c965d2 100644 --- a/arch/m68k/cpu/mcf5445x/cpu_init.c +++ b/arch/m68k/cpu/mcf5445x/cpu_init.c @@ -28,7 +28,7 @@ void init_fbcs(void) { fbcs_t *fbcs __maybe_unused = (fbcs_t *) MMAP_FBCS; -#if !defined(CONFIG_SERIAL_BOOT) +#if !defined(CFG_SERIAL_BOOT) #if (defined(CFG_SYS_CS0_BASE) && defined(CFG_SYS_CS0_MASK) && defined(CFG_SYS_CS0_CTRL)) out_be32(&fbcs->csar0, CFG_SYS_CS0_BASE); out_be32(&fbcs->cscr0, CFG_SYS_CS0_CTRL); diff --git a/arch/m68k/cpu/mcf5445x/start.S b/arch/m68k/cpu/mcf5445x/start.S index a083c3d45d27..0beacb38dfbb 100644 --- a/arch/m68k/cpu/mcf5445x/start.S +++ b/arch/m68k/cpu/mcf5445x/start.S @@ -25,7 +25,7 @@ addl #60,%sp; /* space for 15 regs */ \ rte; -#if defined(CONFIG_SERIAL_BOOT) +#if defined(CFG_SERIAL_BOOT) #define ASM_DRAMINIT (asm_dram_init - CONFIG_TEXT_BASE + \ CFG_SYS_INIT_RAM_ADDR) #define ASM_DRAMINIT_N (asm_dram_init - CONFIG_TEXT_BASE) @@ -40,7 +40,7 @@ * These vectors are to catch any un-intended traps. */ _vectors: -#if defined(CONFIG_SERIAL_BOOT) +#if defined(CFG_SERIAL_BOOT) INITSP: .long 0 /* Initial SP */ #ifdef CONFIG_CF_SBF @@ -68,7 +68,7 @@ vector10_17: vector18_1F: .long _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT -#if !defined(CONFIG_SERIAL_BOOT) +#if !defined(CFG_SERIAL_BOOT) /* TRAP #0 - #15 */ vector20_2F: @@ -111,7 +111,7 @@ vector192_255: .long _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT #endif -#if defined(CONFIG_SERIAL_BOOT) +#if defined(CFG_SERIAL_BOOT) /* Image header: chksum 4 bytes, len 4 bytes, img dest 4 bytes */ asm_sbf_img_hdr: .long 0x00000000 /* checksum, not yet implemented */ @@ -436,7 +436,7 @@ asm_delay: . = 0x400 .globl _start _start: -#if !defined(CONFIG_SERIAL_BOOT) +#if !defined(CFG_SERIAL_BOOT) nop nop move.w #0x2700,%sr /* Mask off Interrupt */ diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index 3b4743905596..ca3eb6a31b1e 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -64,7 +64,7 @@ #define CFG_SYS_DRAM_TEST #if defined(CONFIG_CF_SBF) -#define CONFIG_SERIAL_BOOT +#define CFG_SERIAL_BOOT #endif /* Reserve 256 kB for Monitor */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index b45fcaa9432c..0d58f8ff0a1b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -184,7 +184,7 @@ CFG_SAR_REG CFG_SCIF_A CFG_SCSI_DEV_LIST CFG_SC_TIMER_CLK -CONFIG_SERIAL_BOOT +CFG_SERIAL_BOOT CONFIG_SERVERIP CONFIG_SETUP_INITRD_TAG CONFIG_SET_DFU_ALT_BUF_LEN -- 2.25.1