From patchwork Wed Sep 26 13:55:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 975174 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Aum5N8bt"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 42L0SW46TZz9s4s for ; Thu, 27 Sep 2018 00:19:39 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 44B6DC21F0C; Wed, 26 Sep 2018 14:05:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 4ABCCC21FAA; Wed, 26 Sep 2018 13:50:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9A2C0C21F3F; Wed, 26 Sep 2018 13:50:48 +0000 (UTC) Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by lists.denx.de (Postfix) with ESMTPS id EB7E6C21EA6 for ; Wed, 26 Sep 2018 13:50:33 +0000 (UTC) Received: by mail-pl1-f195.google.com with SMTP id c8-v6so2191067plo.9 for ; Wed, 26 Sep 2018 06:50:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=v6A+kvp87sdLs2OtU8E15wag29XbPnj9rgEQ1palb2I=; b=Aum5N8btui4xd3VJ3CVAs3Cddo3poQXD2++ArxnDVbMI6rbaoEW2V+zyF08cJNr6qv pCfTJc1f88Z9wIdSVK6EXA53ru8+UHqIscgH1SQAEoGP20WgxuVD0Lsm6pjzof0Kkhfz HIx561hZkryD1kOeSW6hHDeGezTCKP46sTMYekFx80wzs4yCKsVhZzQViw+/lyJNNx6U tvxaWB8d1uyAu5WPIYuIvjHzrhAbFXr6phNCmPiPWfLQ451wDKNM1egWpDb9Rr4SA7Cd 4SrwXG0zkJcO6FthBED26ay/O7oP57gSj2tjd0P3jiauROYlMSAcFTQd9mt4YHH2NrO9 afnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=v6A+kvp87sdLs2OtU8E15wag29XbPnj9rgEQ1palb2I=; b=MWzC9Vf2oK6PRpKLDc8qo/fIX0/mUJru/sSEOIVqhwd8Zax2ogoE5Ahsoj5nM1T078 CE4CSlKAsR2IydsdiYkXUe2M1/Y1bpXZyK/l6njBPTpQkSAogsqNXxmu9m+836HBEkzs +cXnPg2pEU89nLGZqmHzOJnOpH0N5sT/wXRQhLCovQM+dHV6ZwAYlpVDPoZ4rG1x8dKm pesMDiMOngvuDhbhSeJco62nKhCYdIUGxTumppUcAuyfoSEPMIV5T39JN2FlL9nQQpXO ydgU0BLhsGueOCUPRo+RkC5t7nTO5DemAhxRL3jQI4HroMn4zfHeiC192EGdiuCXsYA9 l+Jw== X-Gm-Message-State: ABuFfojHu/g3IOnoKNBC4YT0XaxwCgnnyViw7AWD/kYuHyCGzqfA/LbX +XUmyLcSx51MbEHZ9HFBsAe7Ab3O X-Google-Smtp-Source: ACcGV619g/gFP+fthQKZq/F7Obwm/qY5WZbfKbsME3y2vF2EzNRhJ4A78XelCsUNqi6uq43eV0RI6g== X-Received: by 2002:a17:902:32a2:: with SMTP id z31-v6mr6400909plb.228.1537969832586; Wed, 26 Sep 2018 06:50:32 -0700 (PDT) Received: from ala-d2121-lx1.wrs.com (unknown-156-139.windriver.com. [147.11.156.139]) by smtp.gmail.com with ESMTPSA id t69-v6sm10849253pgd.43.2018.09.26.06.50.31 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Sep 2018 06:50:31 -0700 (PDT) From: Bin Meng To: Rick Chen , U-Boot Mailing List , Lukas Auer Date: Wed, 26 Sep 2018 06:55:09 -0700 Message-Id: <1537970122-26443-5-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1537970122-26443-1-git-send-email-bmeng.cn@gmail.com> References: <1537970122-26443-1-git-send-email-bmeng.cn@gmail.com> Subject: [U-Boot] [PATCH v3 04/17] riscv: Remove mach type X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Since the mach_id is not used by RISC-V, remove it. Signed-off-by: Bin Meng Reviewed-by: Lukas Auer --- Changes in v3: None Changes in v2: None arch/riscv/include/asm/mach-types.h | 29 ----------------------------- arch/riscv/include/asm/u-boot.h | 1 - board/AndesTech/ax25-ae350/ax25-ae350.c | 2 -- cmd/bdinfo.c | 1 - 4 files changed, 33 deletions(-) delete mode 100644 arch/riscv/include/asm/mach-types.h diff --git a/arch/riscv/include/asm/mach-types.h b/arch/riscv/include/asm/mach-types.h deleted file mode 100644 index f219ced..0000000 --- a/arch/riscv/include/asm/mach-types.h +++ /dev/null @@ -1,29 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2017 Andes Technology Corporation - * Rick Chen, Andes Technology Corporation - */ - -#ifndef __ASM_RISCV_MACH_TYPE_H -#define __ASM_RISCV_MACH_TYPE_H - -#ifndef __ASSEMBLY__ -/* The type of machine we're running on */ -extern unsigned int __machine_arch_type; -#endif - -#define MACH_TYPE_AE350 1 - -#ifdef CONFIG_ARCH_AE350 -# ifdef machine_arch_type -# undef machine_arch_type -# define machine_arch_type __machine_arch_type -# else -# define machine_arch_type MACH_TYPE_AE350 -# endif -# define machine_is_ae350() (machine_arch_type == MACH_TYPE_AE350) -#else -# define machine_is_ae350() (1) -#endif - -#endif /* __ASM_RISCV_MACH_TYPE_H */ diff --git a/arch/riscv/include/asm/u-boot.h b/arch/riscv/include/asm/u-boot.h index 9e5b32d..3186835 100644 --- a/arch/riscv/include/asm/u-boot.h +++ b/arch/riscv/include/asm/u-boot.h @@ -23,7 +23,6 @@ #include typedef struct bd_info { - unsigned long bi_arch_number; /* unique id for this board */ unsigned long bi_boot_params; /* where this board expects params */ unsigned long bi_memstart; /* start of DRAM memory */ unsigned long bi_memsize; /* size of DRAM memory in bytes */ diff --git a/board/AndesTech/ax25-ae350/ax25-ae350.c b/board/AndesTech/ax25-ae350/ax25-ae350.c index fd5aaa1..5f4ca0f 100644 --- a/board/AndesTech/ax25-ae350/ax25-ae350.c +++ b/board/AndesTech/ax25-ae350/ax25-ae350.c @@ -4,7 +4,6 @@ * Rick Chen, Andes Technology Corporation */ -#include #include #if defined(CONFIG_FTMAC100) && !defined(CONFIG_DM_ETH) #include @@ -21,7 +20,6 @@ DECLARE_GLOBAL_DATA_PTR; int board_init(void) { - gd->bd->bi_arch_number = MACH_TYPE_AE350; gd->bd->bi_boot_params = PHYS_SDRAM_0 + 0x400; return 0; diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index 397dd15..bc440e4 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -424,7 +424,6 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { bd_t *bd = gd->bd; - print_num("arch_number", bd->bi_arch_number); print_bi_boot_params(bd); print_bi_dram(bd); print_eth_ip_addr();