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 759B2EB64DC for ; Tue, 18 Jul 2023 23:33:58 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B66CC86710; Wed, 19 Jul 2023 01:33:45 +0200 (CEST) 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="FNsJcMkD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 396578671A; Wed, 19 Jul 2023 01:33:43 +0200 (CEST) Received: from mail-yb1-xb2c.google.com (mail-yb1-xb2c.google.com [IPv6:2607:f8b0:4864:20::b2c]) (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 88A9B8670C for ; Wed, 19 Jul 2023 01:33:38 +0200 (CEST) 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-yb1-xb2c.google.com with SMTP id 3f1490d57ef6-ca9804dc6e4so385632276.0 for ; Tue, 18 Jul 2023 16:33:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1689723217; x=1692315217; 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=553ywMayOUMCD5Tia/CVoKv8hazGGBbpBM6cwcHrdIA=; b=FNsJcMkDjD5hqUuR/yvNWkmXU9dCYaTsKn5wtUiyxKDC0WR3FNj7mOug7mPbhyOqEP BQfXZCoYDvTHD2B4B7ThDBZr/SydpL0VxG0D0KwDAZ47xuq1SX8oMQzwBgKEU4Tl/+EZ n0/Ib0YcW1t0TyxYfgPuIr5T4+Xo0Kv8pbB00= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689723217; x=1692315217; 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=553ywMayOUMCD5Tia/CVoKv8hazGGBbpBM6cwcHrdIA=; b=f/loiBswtvBE+GhLtjwAEjZeTtsDIyhljxNJkF45aZ7Vg0uBCsj2WoqoJ/liZZ7T45 JjPDmN/A7TRmAFI4lr9gNTFysBVTCQ5rOeV5u1Cv/xhymjJgO48ClDAKoTcvA2mF7XTB 7OLqTsbWamKH7tL8DmKVkAPicfifVbslxWA5JqNxTZwl9q0aisFTU5Ch+LqWpfBoXwBv vB7ft0Beh/AmEfQPigGwHhCP8dQ6Xs0cjCcA1BJ4tshSu3YMjv0ipRxtnZi+jbY+IpVY vO15dK3xIDu9BVOQnXXOlFqsPlStZSeWtCbnTlAapuEMD62Arpz0oCydbNZ6GsivEQh1 iQfA== X-Gm-Message-State: ABy/qLZ2z6kqesoJF8t+ax4VK1gCPYWBECvrzQsWqlzxqotj4Uy35XFU MjXUygW1TtaDI/dcB+LthVjT3sq7p5qvt7+ehbLDCw== X-Google-Smtp-Source: APBJJlGQNQIRybvwbDpbZtA/M9ZEPzXmpzuKod3U5TW9n3fmwPdJ6xifBvMU0KuMhKztL+eA0WregQ== X-Received: by 2002:a25:ad60:0:b0:cb2:b640:77f3 with SMTP id l32-20020a25ad60000000b00cb2b64077f3mr595509ybe.14.1689723217028; Tue, 18 Jul 2023 16:33:37 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b00-6400-e1d8-58e7-e10a-a96d.res6.spectrum.com. [2603:6081:7b00:6400:e1d8:58e7:e10a:a96d]) by smtp.gmail.com with ESMTPSA id f3-20020a056902038300b00c39e3d75bfcsm612968ybs.44.2023.07.18.16.33.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 16:33:36 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH 3/7] xes: Remove leftover code Date: Tue, 18 Jul 2023 19:33:30 -0400 Message-Id: <20230718233334.1450692-3-trini@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230718233334.1450692-1-trini@konsulko.com> References: <20230718233334.1450692-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.8 at phobos.denx.de X-Virus-Status: Clean The platforms here have been removed, but the common code directory was forgotten. Clean up. Signed-off-by: Tom Rini --- board/xes/common/Makefile | 9 ----- board/xes/common/board.c | 67 -------------------------------- board/xes/common/fsl_8xxx_clk.c | 54 ------------------------- board/xes/common/fsl_8xxx_misc.c | 43 -------------------- board/xes/common/fsl_8xxx_misc.h | 11 ------ 5 files changed, 184 deletions(-) delete mode 100644 board/xes/common/Makefile delete mode 100644 board/xes/common/board.c delete mode 100644 board/xes/common/fsl_8xxx_clk.c delete mode 100644 board/xes/common/fsl_8xxx_misc.c delete mode 100644 board/xes/common/fsl_8xxx_misc.h diff --git a/board/xes/common/Makefile b/board/xes/common/Makefile deleted file mode 100644 index b00accca1be0..000000000000 --- a/board/xes/common/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2006 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de. - -obj-$(CONFIG_MPC86xx) += fsl_8xxx_clk.o -obj-$(CONFIG_ARCH_P2020) += fsl_8xxx_clk.o -obj-$(CONFIG_MPC85xx) += fsl_8xxx_misc.o board.o -obj-$(CONFIG_MPC86xx) += fsl_8xxx_misc.o board.o diff --git a/board/xes/common/board.c b/board/xes/common/board.c deleted file mode 100644 index 053b07a0b70f..000000000000 --- a/board/xes/common/board.c +++ /dev/null @@ -1,67 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright 2009 Extreme Engineering Solutions, Inc. - */ - -#include -#include -#include "fsl_8xxx_misc.h" -#include - -int checkboard(void) -{ - char name[] = CONFIG_SYS_BOARD_NAME; - char buf[64]; - char *s; - int i; - -#ifdef CONFIG_SYS_FORM_CUSTOM - s = "Custom"; -#elif CONFIG_SYS_FORM_6U_CPCI - s = "6U CompactPCI"; -#elif CONFIG_SYS_FORM_ATCA_PMC - s = "ATCA w/PMC"; -#elif CONFIG_SYS_FORM_ATCA_AMC - s = "ATCA w/AMC"; -#elif CONFIG_SYS_FORM_VME - s = "VME"; -#elif CONFIG_SYS_FORM_6U_VPX - s = "6U VPX"; -#elif CONFIG_SYS_FORM_PMC - s = "PMC"; -#elif CONFIG_SYS_FORM_PCI - s = "PCI"; -#elif CONFIG_SYS_FORM_3U_CPCI - s = "3U CompactPCI"; -#elif CONFIG_SYS_FORM_AMC - s = "AdvancedMC"; -#elif CONFIG_SYS_FORM_XMC - s = "XMC"; -#elif CONFIG_SYS_FORM_PMC_XMC - s = "PMC/XMC"; -#elif CONFIG_SYS_FORM_PCI_EXPRESS - s = "PCI Express"; -#elif CONFIG_SYS_FORM_3U_VPX - s = "3U VPX"; -#else -#error "Form factor not defined" -#endif - - name[strlen(name) - 1] += get_board_derivative(); - printf("Board: X-ES %s %s SBC\n", name, s); - - /* Display board specific information */ - puts(" "); - i = env_get_f("board_rev", buf, sizeof(buf)); - if (i > 0) - printf("Rev %s, ", buf); - i = env_get_f("serial#", buf, sizeof(buf)); - if (i > 0) - printf("Serial# %s, ", buf); - i = env_get_f("board_cfg", buf, sizeof(buf)); - if (i > 0) - printf("Cfg %s", buf); - puts("\n"); - - return 0; -} diff --git a/board/xes/common/fsl_8xxx_clk.c b/board/xes/common/fsl_8xxx_clk.c deleted file mode 100644 index c36b2afd50ed..000000000000 --- a/board/xes/common/fsl_8xxx_clk.c +++ /dev/null @@ -1,54 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright 2008 Extreme Engineering Solutions, Inc. - */ - -#include -#include -#include - -/* - * Return SYSCLK input frequency - 50 MHz or 66 MHz depending on POR config - */ -unsigned long get_board_sys_clk(void) -{ -#if defined(CONFIG_MPC85xx) - volatile ccsr_gur_t *gur = (void *)(CFG_SYS_MPC85xx_GUTS_ADDR); -#elif defined(CONFIG_MPC86xx) - immap_t *immap = (immap_t *)CONFIG_SYS_IMMR; - volatile ccsr_gur_t *gur = &immap->im_gur; -#endif - - if (in_be32(&gur->gpporcr) & 0x10000) - return 66666666; - else -#ifdef CONFIG_ARCH_P2020 - return 100000000; -#else - return 50000000; -#endif -} - -#ifdef CONFIG_MPC85xx -/* - * Return DDR input clock - synchronous with SYSCLK or 66 MHz - * Note: 86xx doesn't support asynchronous DDR clk - */ -unsigned long get_board_ddr_clk(void) -{ - volatile ccsr_gur_t *gur = (void *)(CFG_SYS_MPC85xx_GUTS_ADDR); - u32 ddr_ratio = (in_be32(&gur->porpllsr) & 0x00003e00) >> 9; - - if (ddr_ratio == 0x7) - return get_board_sys_clk(); - -#ifdef CONFIG_ARCH_P2020 - if (in_be32(&gur->gpporcr) & 0x20000) - return 66666666; - else - return 100000000; -#else - return 66666666; -#endif -} -#endif diff --git a/board/xes/common/fsl_8xxx_misc.c b/board/xes/common/fsl_8xxx_misc.c deleted file mode 100644 index bc7e5c5764f8..000000000000 --- a/board/xes/common/fsl_8xxx_misc.c +++ /dev/null @@ -1,43 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright 2008 Extreme Engineering Solutions, Inc. - */ - -#include -#include -#ifdef CONFIG_PCA953X -#include - -/* - * Determine if a board's flashes are write protected - */ -int board_flash_wp_on(void) -{ - if (pca953x_get_val(CFG_SYS_I2C_PCA953X_ADDR0) & - CONFIG_SYS_PCA953X_NVM_WP) - return 1; - - return 0; -} -#endif - -/* - * Return a board's derivative model number. For example: - * return 2 for the XPedite5372 and return 1 for the XPedite5201. - */ -uint get_board_derivative(void) -{ -#if defined(CONFIG_MPC85xx) - volatile ccsr_gur_t *gur = (void *)CFG_SYS_MPC85xx_GUTS_ADDR; -#elif defined(CONFIG_MPC86xx) - volatile immap_t *immap = (immap_t *)CFG_SYS_CCSRBAR; - volatile ccsr_gur_t *gur = &immap->im_gur; -#endif - - /* - * The top 4 lines of the local bus address are pulled low/high and - * can be read to determine the least significant digit of a board's - * model number. - */ - return gur->gpporcr >> 28; -} diff --git a/board/xes/common/fsl_8xxx_misc.h b/board/xes/common/fsl_8xxx_misc.h deleted file mode 100644 index 6e4858f15c39..000000000000 --- a/board/xes/common/fsl_8xxx_misc.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright 2008 Extreme Engineering Solutions, Inc. - */ - -#ifndef __FSL_8XXX_MISC_H___ -#define __FSL_8XXX_MISC_H___ - -uint get_board_derivative(void); - -#endif /* __FSL_8XXX_MISC_H__ */ -- 2.34.1