From patchwork Thu Feb 27 08:18:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 1245631 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=prevas.dk Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=prevas.dk header.i=@prevas.dk header.a=rsa-sha256 header.s=selector1 header.b=gtqSVAeW; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Sltj4JNNz9sPK for ; Thu, 27 Feb 2020 19:18:53 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 91B548050F; Thu, 27 Feb 2020 09:18:48 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=prevas.dk 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=prevas.dk header.i=@prevas.dk header.b="gtqSVAeW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D60D780592; Thu, 27 Feb 2020 09:18:47 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FORGED_SPF_HELO, SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02on0704.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe06::704]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C53E5804CD for ; Thu, 27 Feb 2020 09:18:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=prevas.dk Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=rasmus.villemoes@prevas.dk ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NTw02aDVGuuMJve85mCVPR5bd0zvVokxSUzPX1cKG48QG3DcZSQNnjxYG06NQU/Ri/Dhkq0DLLSnBVe8wpOpA7w9CH2Ex9V4rhd8OsIGsoLiBaKSVrY+OhHjkAxdkbDF2GPN/LrGqogrDvDaLOjBA1/cbAutvAauCKFFaa4eYqCte6JrWrlhA1ZBPxuJxmEjCwmukKalBWZjcgUY/VpJLcH7JX4hQVa/TsKWPV1dBwbi7C+hZQUnod/Q8xnTEBa9cQ+e67nbmu66ydwR5deV3v/nzDRLGs96b0U78N/SYIuHP8y0dY5JfULFIUHLSaiC5mQGJRnZObq+lSbpPxoxAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iV8NGwtf8xd1vACtp8c4tELjLlTCuaDxmkrOR2dgbTM=; b=FWRKRrYyYdIiH6BpUh2AwZOA4L8aLPRJq9wCSxMZqc16uzraD9P0vNc9ONYI4B9skWlrjQzj1JtKycg+Cwgok0kpJQVKsyS9rgyaOJrolawk3oItyMksPD/DsDpEplT5gF6H4gARHl725dFoJVcdyQ+mW8x0gciCA72x0JkrjzuwJP7hkPxPikhLO2Nrq2k80K6BFm8FliXarbNpLLodG5COEpyigFP8/3H4cN9uEv/NONzBxV69gRhxiGU3pvZi+xlmF/5hYZMUIkA7MIuuLTcTyGMQCVDJlidzwTaiRTfkQmQA+26zPwcVjX4h5eAPqB15jWcJkG7b/eGu3xWPbQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=prevas.dk; dmarc=pass action=none header.from=prevas.dk; dkim=pass header.d=prevas.dk; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=prevas.dk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iV8NGwtf8xd1vACtp8c4tELjLlTCuaDxmkrOR2dgbTM=; b=gtqSVAeWP4y6LIwFzZXCutl8TlePntCELNT/VhZw6XqooxqHJlfXioLLrMrOHoFRNYQzq90wqZd0uXXEnHNA3xwKQqVAwGlqwrpq8L4rc50E1t+kiTiJo/LnLiDg4jskgx140/KW2pbBvdVveZvyOQbyX9Sg3FHhoSDDWjE5KJo= Received: from VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM (20.178.126.85) by VI1SPR01MB330.EURPRD10.PROD.OUTLOOK.COM (52.134.123.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2772.14; Thu, 27 Feb 2020 08:18:38 +0000 Received: from VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM ([fe80::e58f:1097:b71d:32c7]) by VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM ([fe80::e58f:1097:b71d:32c7%5]) with mapi id 15.20.2772.012; Thu, 27 Feb 2020 08:18:38 +0000 Received: from prevas-ravi.prevas.se (5.186.115.35) by AM6P195CA0014.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:81::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2772.14 via Frontend Transport; Thu, 27 Feb 2020 08:18:37 +0000 From: Rasmus Villemoes To: "u-boot@lists.denx.de" CC: Simon Glass , Tom Rini , Rasmus Villemoes Subject: [PATCH] common/board_f.c: use #ifdefs a little more consistently Thread-Topic: [PATCH] common/board_f.c: use #ifdefs a little more consistently Thread-Index: AQHV7UaCeWPHys8HQE2dd6D62sYndQ== Date: Thu, 27 Feb 2020 08:18:37 +0000 Message-ID: <20200227081825.11039-1-rasmus.villemoes@prevas.dk> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6P195CA0014.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:81::27) To VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:e1::21) x-mailer: git-send-email 2.23.0 authentication-results: spf=none (sender IP is ) smtp.mailfrom=rasmus.villemoes@prevas.dk; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [5.186.115.35] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 95425499-7117-4655-92a6-08d7bb5da55d x-ms-traffictypediagnostic: VI1SPR01MB330: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8273; x-forefront-prvs: 03264AEA72 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(136003)(346002)(376002)(366004)(396003)(39850400004)(189003)(199004)(66946007)(6486002)(54906003)(1076003)(36756003)(52116002)(2906002)(71200400001)(8976002)(81156014)(8676002)(6916009)(81166006)(26005)(6506007)(16526019)(186003)(66476007)(44832011)(2616005)(66556008)(64756008)(66446008)(956004)(4326008)(86362001)(316002)(5660300002)(107886003)(8936002)(6512007)(478600001); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1SPR01MB330; H:VI1PR10MB2765.EURPRD10.PROD.OUTLOOK.COM; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: prevas.dk does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: dFJQo6Q/G3gOSQj8y34PabamzLyOLZX1XM7m5W0EXuToTezOVsuZIp23hC1nL9D/QvXtrRRBEIO6sUB4E9i5Nhr77KtTviQrq4TSu6EtGJFQEhzsH8W8KehrrqHZ1U+sAt+ekhs4KW1hg+7i1K6BIdIrbWWf75qs5HwbJmsjH9QbkeTdzl9uUxgPKFRN8khb1GI6bQxxCEydRQeyGk0Bfa+hOGNLc32v6fWL9SdJnQxEDfWDsP1NwbIh96YAjcGq7vGce7OB1ZkMEp1QFdT+mm5ls1MGGkyZCh0QhFnT4nlvuWqNQdzPhdYUCwvNjPFQZA675qhUc/pKz9pee9wJeu52oe0jxuzc9bHkJIBiO6yoklzz1ezmc+QIRBIAesBXt7vaLhVJpM9FFWRocWjNIZjFFnetKf7qeyiRuw3mM44VsZ1dbCot6asP1FX2BSWE x-ms-exchange-antispam-messagedata: a+LWqkVNQ1ohLSCw87DU7yurKvHCMd7bvHbnXSEQhK7au8LlSgbYYnhlXGQuK/dbGAneMtB6SSoxISRdpZ4aa7XXApO0S9E6lSvt9JG+Ee9tRezl2b8hgLC5aaBX15Ta4tqXmoi02hcmVIKJ5SCOkQ== MIME-Version: 1.0 X-OriginatorOrg: prevas.dk X-MS-Exchange-CrossTenant-Network-Message-Id: 95425499-7117-4655-92a6-08d7bb5da55d X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Feb 2020 08:18:37.9408 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: d350cf71-778d-4780-88f5-071a4cb1ed61 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 4ZjFpOkY9bHFoSNIkCKlP55G3KRuHScfGjcjvKDenol+3+UWsiwTu+4IlBhveP+m6qi5aZCw9vGiNVwbNpwQ2/MUplY8NHDAFuYwImJKX3Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1SPR01MB330 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.102.2 at phobos.denx.de X-Virus-Status: Clean Some init functions, e.g. print_resetinfo(), are conditionally defined depending on some config options, and are correspondingly conditionally included in the init_sequence_f[] array. Others are unconditionally defined and included in init_sequence_f[], but have their entire body, sans a mandatory "return 0", conditionally compiled. For the simple cases, switch to the former model, making it a bit more consistent. This also makes the U-Boot image very slightly smaller and avoids a few useless calls to no-op functions during board_init_f. Signed-off-by: Rasmus Villemoes --- common/board_f.c | 54 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index 82a164752a..ed63fbcea2 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -285,16 +285,16 @@ static int setup_mon_len(void) return 0; } +#if CONFIG_IS_ENABLED(HANDOFF) static int setup_spl_handoff(void) { -#if CONFIG_IS_ENABLED(HANDOFF) gd->spl_handoff = bloblist_find(BLOBLISTT_SPL_HANDOFF, sizeof(struct spl_handoff)); debug("Found SPL hand-off info %p\n", gd->spl_handoff); -#endif return 0; } +#endif __weak int arch_cpu_init(void) { @@ -437,17 +437,17 @@ static int reserve_video(void) return 0; } +#ifdef CONFIG_TRACE static int reserve_trace(void) { -#ifdef CONFIG_TRACE gd->relocaddr -= CONFIG_TRACE_BUFFER_SIZE; gd->trace_buff = map_sysmem(gd->relocaddr, CONFIG_TRACE_BUFFER_SIZE); debug("Reserving %luk for trace data at: %08lx\n", (unsigned long)CONFIG_TRACE_BUFFER_SIZE >> 10, gd->relocaddr); -#endif return 0; } +#endif static int reserve_uboot(void) { @@ -520,13 +520,13 @@ static int reserve_board(void) return 0; } +#ifdef CONFIG_MACH_TYPE static int setup_machine(void) { -#ifdef CONFIG_MACH_TYPE gd->bd->bi_arch_number = CONFIG_MACH_TYPE; /* board id for Linux */ -#endif return 0; } +#endif static int reserve_global_data(void) { @@ -537,9 +537,9 @@ static int reserve_global_data(void) return 0; } +#ifndef CONFIG_OF_EMBED static int reserve_fdt(void) { -#ifndef CONFIG_OF_EMBED /* * If the device tree is sitting immediately above our image then we * must relocate it. If it is embedded in the data section, then it @@ -553,24 +553,24 @@ static int reserve_fdt(void) debug("Reserving %lu Bytes for FDT at: %08lx\n", gd->fdt_size, gd->start_addr_sp); } -#endif return 0; } +#endif +#ifdef CONFIG_BOOTSTAGE static int reserve_bootstage(void) { -#ifdef CONFIG_BOOTSTAGE int size = bootstage_get_size(); gd->start_addr_sp -= size; gd->new_bootstage = map_sysmem(gd->start_addr_sp, size); debug("Reserving %#x Bytes for bootstage at: %08lx\n", size, gd->start_addr_sp); -#endif return 0; } +#endif __weak int arch_reserve_stacks(void) { @@ -590,16 +590,16 @@ static int reserve_stacks(void) return arch_reserve_stacks(); } +#ifdef CONFIG_BLOBLIST static int reserve_bloblist(void) { -#ifdef CONFIG_BLOBLIST gd->start_addr_sp &= ~0xf; gd->start_addr_sp -= CONFIG_BLOBLIST_SIZE; gd->new_bloblist = map_sysmem(gd->start_addr_sp, CONFIG_BLOBLIST_SIZE); -#endif return 0; } +#endif static int display_new_sp(void) { @@ -675,23 +675,23 @@ static int init_post(void) } #endif +#ifndef CONFIG_OF_EMBED static int reloc_fdt(void) { -#ifndef CONFIG_OF_EMBED if (gd->flags & GD_FLG_SKIP_RELOC) return 0; if (gd->new_fdt) { memcpy(gd->new_fdt, gd->fdt_blob, gd->fdt_size); gd->fdt_blob = gd->new_fdt; } -#endif return 0; } +#endif +#ifdef CONFIG_BOOTSTAGE static int reloc_bootstage(void) { -#ifdef CONFIG_BOOTSTAGE if (gd->flags & GD_FLG_SKIP_RELOC) return 0; if (gd->new_bootstage) { @@ -703,14 +703,14 @@ static int reloc_bootstage(void) gd->bootstage = gd->new_bootstage; bootstage_relocate(); } -#endif return 0; } +#endif +#ifdef CONFIG_BLOBLIST static int reloc_bloblist(void) { -#ifdef CONFIG_BLOBLIST if (gd->flags & GD_FLG_SKIP_RELOC) return 0; if (gd->new_bloblist) { @@ -721,10 +721,10 @@ static int reloc_bloblist(void) memcpy(gd->new_bloblist, gd->bloblist, size); gd->bloblist = gd->new_bloblist; } -#endif return 0; } +#endif static int setup_reloc(void) { @@ -886,7 +886,9 @@ static const init_fnc_t init_sequence_f[] = { #ifdef CONFIG_BLOBLIST bloblist_init, #endif +#if CONFIG_IS_ENABLED(HANDOFF) setup_spl_handoff, +#endif initf_console_record, #if defined(CONFIG_HAVE_FSP) arch_fsp_init, @@ -974,15 +976,25 @@ static const init_fnc_t init_sequence_f[] = { reserve_mmu, #endif reserve_video, +#ifdef CONFIG_TRACE reserve_trace, +#endif reserve_uboot, reserve_malloc, reserve_board, +#ifdef CONFIG_MACH_TYPE setup_machine, +#endif reserve_global_data, +#ifndef CONFIG_OF_EMBED reserve_fdt, +#endif +#ifdef CONFIG_BOOTSTAGE reserve_bootstage, +#endif +#ifdef CONFIG_BLOBLIST reserve_bloblist, +#endif reserve_arch, reserve_stacks, dram_init_banksize, @@ -1000,9 +1012,15 @@ static const init_fnc_t init_sequence_f[] = { fix_fdt, #endif INIT_FUNC_WATCHDOG_RESET +#ifndef CONFIG_OF_EMBED reloc_fdt, +#endif +#ifdef CONFIG_BOOTSTAGE reloc_bootstage, +#endif +#ifdef CONFIG_BLOBLIST reloc_bloblist, +#endif setup_reloc, #if defined(CONFIG_X86) || defined(CONFIG_ARC) copy_uboot_to_ram,