From patchwork Fri Nov 21 21:29:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Rae X-Patchwork-Id: 41367 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9C6E521459 for ; Fri, 21 Nov 2014 21:30:00 +0000 (UTC) Received: by mail-wg0-f72.google.com with SMTP id y19sf3532477wgg.3 for ; Fri, 21 Nov 2014 13:29:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id :mime-version:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=rCrpzva/09iZevjZcihCdwCLC1q1RoEQZ1XPQXzbJnE=; b=jBIeyw/NFZ7ElAzv6kvhmW54VdVf/afsqKP3MkLRYezmb8pLr67EokwJFC7eu4vSK8 JT3yA3pflx6Db+HlLvt7hT13Y9EuwI51L1+hgU8AnGedxygRDZrXNrh53wa9b0RhsHq+ dJX5hrRBgEIZsyXqEAO7Wkbv81BeCW7wYzOGXNmjaks7dx0czwVCn7umsmb11vJVslMn XurOXsDj6XqospSJwIjTrry964oLFn3u4sdicIMUckQsqyBO3JcExy3GiDwMc+udM6lh zjdjNcBG2X/Cnf2qRHN/m102haAwHVYzTiQb7ExqA8HWkf90W1xEtgt7jz7nY/eTnjMf V8Jg== X-Gm-Message-State: ALoCoQl7seeaDjiilOEci5eiQ30YMvhqeTKQsUYfjwc4oAA1ASMriCQB18u5ZzcFvkICNQVyCgO4 X-Received: by 10.180.106.67 with SMTP id gs3mr127293wib.3.1416605399866; Fri, 21 Nov 2014 13:29:59 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.206.102 with SMTP id ln6ls233955lac.95.gmail; Fri, 21 Nov 2014 13:29:59 -0800 (PST) X-Received: by 10.152.42.198 with SMTP id q6mr7585968lal.48.1416605399675; Fri, 21 Nov 2014 13:29:59 -0800 (PST) Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com. [209.85.217.174]) by mx.google.com with ESMTPS id ju18si7337351lab.8.2014.11.21.13.29.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Nov 2014 13:29:59 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) client-ip=209.85.217.174; Received: by mail-lb0-f174.google.com with SMTP id w7so4787846lbi.5 for ; Fri, 21 Nov 2014 13:29:59 -0800 (PST) X-Received: by 10.112.52.37 with SMTP id q5mr7643359lbo.32.1416605399147; Fri, 21 Nov 2014 13:29:59 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp170654lbc; Fri, 21 Nov 2014 13:29:58 -0800 (PST) X-Received: by 10.180.39.65 with SMTP id n1mr470964wik.13.1416605398430; Fri, 21 Nov 2014 13:29:58 -0800 (PST) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id wo10si11764975wjc.32.2014.11.21.13.29.57 for ; Fri, 21 Nov 2014 13:29:58 -0800 (PST) Received-SPF: none (google.com: u-boot-bounces@lists.denx.de does not designate permitted sender hosts) client-ip=85.214.87.163; Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 889CB4B957; Fri, 21 Nov 2014 22:29:56 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eyTg4YAWHK8r; Fri, 21 Nov 2014 22:29:56 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AE59F4B951; Fri, 21 Nov 2014 22:29:55 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 51B1C4B951 for ; Fri, 21 Nov 2014 22:29:50 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6Ev55NcVxlgo for ; Fri, 21 Nov 2014 22:29:50 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-gw3-out.broadcom.com (mail-gw3-out.broadcom.com [216.31.210.64]) by theia.denx.de (Postfix) with ESMTP id 77CC34B94F for ; Fri, 21 Nov 2014 22:29:45 +0100 (CET) X-IronPort-AV: E=Sophos;i="5.07,432,1413270000"; d="scan'208";a="51205095" Received: from irvexchcas08.broadcom.com (HELO IRVEXCHCAS08.corp.ad.broadcom.com) ([10.9.208.57]) by mail-gw3-out.broadcom.com with ESMTP; 21 Nov 2014 13:37:13 -0800 Received: from IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) by IRVEXCHCAS08.corp.ad.broadcom.com (10.9.208.57) with Microsoft SMTP Server (TLS) id 14.3.174.1; Fri, 21 Nov 2014 13:30:07 -0800 Received: from mail-irva-13.broadcom.com (10.10.10.20) by IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) with Microsoft SMTP Server id 14.3.174.1; Fri, 21 Nov 2014 13:29:53 -0800 Received: from mail.broadcom.com (lbrmn-vmlnx03.ric.broadcom.com [10.136.4.105]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 47B3E41016; Fri, 21 Nov 2014 13:29:14 -0800 (PST) From: Steve Rae To: Date: Fri, 21 Nov 2014 13:29:51 -0800 Message-ID: <1416605391-11890-1-git-send-email-srae@broadcom.com> X-Mailer: git-send-email 1.8.5 MIME-Version: 1.0 Cc: Tom Rini , Steve Rae Subject: [U-Boot] [PATCH v3] arm: bcm: update Cygnus and NSP board families X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: srae@broadcom.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 - updates to support Cygnus and NSP board families better - add functions so CONFIG_ARMV7_NONSEC can be enabled on Cygnus boards Signed-off-by: Steve Rae --- Changes in v3: - it was premature to add all these boards; need to simplify the effort Changes in v2: - split into two commits arch/arm/Kconfig | 12 ++++++------ board/broadcom/bcm958300k/MAINTAINERS | 4 ++-- board/broadcom/bcm958622hr/MAINTAINERS | 4 ++-- board/broadcom/bcm_ep/board.c | 14 ++++++++++++++ board/broadcom/{bcm958300k => bcmcygnus}/Kconfig | 2 +- board/broadcom/{bcm958622hr => bcmnsp}/Kconfig | 2 +- configs/bcm958300k_defconfig | 4 ++-- configs/bcm958622hr_defconfig | 2 +- 8 files changed, 29 insertions(+), 15 deletions(-) rename board/broadcom/{bcm958300k => bcmcygnus}/Kconfig (88%) rename board/broadcom/{bcm958622hr => bcmnsp}/Kconfig (88%) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9b492be..5241cb4 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -521,12 +521,12 @@ config TARGET_BCM28155_AP bool "Support bcm28155_ap" select CPU_V7 -config TARGET_BCM958300K - bool "Support bcm958300k" +config TARGET_BCMCYGNUS + bool "Support bcmcygnus" select CPU_V7 -config TARGET_BCM958622HR - bool "Support bcm958622hr" +config TARGET_BCMNSP + bool "Support bcmnsp" select CPU_V7 config ARCH_EXYNOS @@ -861,8 +861,8 @@ source "board/bluegiga/apx4devkit/Kconfig" source "board/bluewater/snapper9260/Kconfig" source "board/boundary/nitrogen6x/Kconfig" source "board/broadcom/bcm28155_ap/Kconfig" -source "board/broadcom/bcm958300k/Kconfig" -source "board/broadcom/bcm958622hr/Kconfig" +source "board/broadcom/bcmcygnus/Kconfig" +source "board/broadcom/bcmnsp/Kconfig" source "board/calao/sbc35_a9g20/Kconfig" source "board/calao/tny_a9260/Kconfig" source "board/calao/usb_a9263/Kconfig" diff --git a/board/broadcom/bcm958300k/MAINTAINERS b/board/broadcom/bcm958300k/MAINTAINERS index f75ee6e..8afc728 100644 --- a/board/broadcom/bcm958300k/MAINTAINERS +++ b/board/broadcom/bcm958300k/MAINTAINERS @@ -1,6 +1,6 @@ -Broadcom: Cygnus +BCM958300K BOARD M: Steve Rae S: Maintained -F: board/broadcom/bcm958300k/ +F: board/broadcom/bcmcygnus/ F: include/configs/bcm_ep_board.h F: configs/bcm958300k_defconfig diff --git a/board/broadcom/bcm958622hr/MAINTAINERS b/board/broadcom/bcm958622hr/MAINTAINERS index c34272f..d08aded 100644 --- a/board/broadcom/bcm958622hr/MAINTAINERS +++ b/board/broadcom/bcm958622hr/MAINTAINERS @@ -1,6 +1,6 @@ -Broadcom: Northstar Plus +BCM958622HR BOARD M: Steve Rae S: Maintained -F: board/broadcom/bcm958622hr/ +F: board/broadcom/bcmnsp/ F: include/configs/bcm_ep_board.h F: configs/bcm958622hr_defconfig diff --git a/board/broadcom/bcm_ep/board.c b/board/broadcom/bcm_ep/board.c index e48cd3f..6a70a2e 100644 --- a/board/broadcom/bcm_ep/board.c +++ b/board/broadcom/bcm_ep/board.c @@ -53,3 +53,17 @@ int board_early_init_f(void) return status; } + +#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT) +void smp_set_core_boot_addr(unsigned long addr, int corenr) +{ +} + +void smp_kick_all_cpus(void) +{ +} + +void smp_waitloop(unsigned previous_address) +{ +} +#endif diff --git a/board/broadcom/bcm958300k/Kconfig b/board/broadcom/bcmcygnus/Kconfig similarity index 88% rename from board/broadcom/bcm958300k/Kconfig rename to board/broadcom/bcmcygnus/Kconfig index 9289288..faba4cf 100644 --- a/board/broadcom/bcm958300k/Kconfig +++ b/board/broadcom/bcmcygnus/Kconfig @@ -1,4 +1,4 @@ -if TARGET_BCM958300K +if TARGET_BCMCYGNUS config SYS_BOARD default "bcm_ep" diff --git a/board/broadcom/bcm958622hr/Kconfig b/board/broadcom/bcmnsp/Kconfig similarity index 88% rename from board/broadcom/bcm958622hr/Kconfig rename to board/broadcom/bcmnsp/Kconfig index 861c559..a975082 100644 --- a/board/broadcom/bcm958622hr/Kconfig +++ b/board/broadcom/bcmnsp/Kconfig @@ -1,4 +1,4 @@ -if TARGET_BCM958622HR +if TARGET_BCMNSP config SYS_BOARD default "bcm_ep" diff --git a/configs/bcm958300k_defconfig b/configs/bcm958300k_defconfig index 066739d..527e407 100644 --- a/configs/bcm958300k_defconfig +++ b/configs/bcm958300k_defconfig @@ -1,3 +1,3 @@ -CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x20000000" +CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x40000000" CONFIG_ARM=y -CONFIG_TARGET_BCM958300K=y +CONFIG_TARGET_BCMCYGNUS=y diff --git a/configs/bcm958622hr_defconfig b/configs/bcm958622hr_defconfig index 8a45e51..7c86300 100644 --- a/configs/bcm958622hr_defconfig +++ b/configs/bcm958622hr_defconfig @@ -1,3 +1,3 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=0x01000000" CONFIG_ARM=y -CONFIG_TARGET_BCM958622HR=y +CONFIG_TARGET_BCMNSP=y