From patchwork Mon Feb 12 23:39:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 872523 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=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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DcL2Ifwn"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zgMc36Ks2z9s7h for ; Tue, 13 Feb 2018 10:40:35 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 50BE8C21F4D; Mon, 12 Feb 2018 23:40:33 +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.5 required=5.0 tests=FREEMAIL_FROM, FROM_LOCAL_NOVOWEL, RCVD_IN_DNSWL_BLOCKED, 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 CF893C21F44; Mon, 12 Feb 2018 23:39:54 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C08CEC21F3F; Mon, 12 Feb 2018 23:39:46 +0000 (UTC) Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by lists.denx.de (Postfix) with ESMTPS id 890A9C21EE7 for ; Mon, 12 Feb 2018 23:39:42 +0000 (UTC) Received: by mail-lf0-f65.google.com with SMTP id q194so22686542lfe.13 for ; Mon, 12 Feb 2018 15:39:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9p+0G+jgdz42oa1PRBq46yydyQQMub/muhDpEQwiLXA=; b=DcL2IfwnDJo/8nsXDA9DlaLutYKL7Y+b6phfAG0PclHDYt422ijINhp8HIYdypclZw e9xpvkKrvj0fuk9Ri7oBwxE4ZbvZoNAtP896uX0Iq6DCZnXUP/90/ZhOvQLdcB2m8FqK JujZuHdTI9lzfc0M+P0v+j/9f2cAwPVJQhLJ+uItOa60yXFRPrly/Bp0X1f1VNxfHRqw m60tFZPbr115srLwRHbv5YVIYKci6iB90AGp60EmcTIL9Cz8+sl+Y6vEtFnhDn4ToG7B L49B5/arSvyNIb1lcewdiOqxdJ65nW/XcsAtL/r6R2a6uQdVJbqyw32dcLh+Kt2CHi0k nAfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9p+0G+jgdz42oa1PRBq46yydyQQMub/muhDpEQwiLXA=; b=HpQWebcnCvpBSB+Hd2KnvWq70xtsVaQjYROylzZNTk3aK4r7z3c9EM4rbDsMrWuE7b WYyVAlQYO5T0cUR6egkUltyORUgtPdDmxT3IpzbH+ZMuLP5ZZsgU2KlFyk1ZnZxdgd9a HGuuTITts2SOi7bdgx5a05zQFvXvW2i8T35+PAbSwGYb0EDLrk9zTCFW0e+JWQIJZQeU 5s8J0d9MO4jdyj/XPwMo7jP4xST/9qbTlGhTe5UzEsT5ZrhsZ1wy8f7etzXcEeup0QNP z2UU4dr5Jn/Ji7FZWW0hBADCC3gpdKpbqJwdGAa1P5n0hrCAzzEF29/VLAJ2NJYs+hkI 9DMg== X-Gm-Message-State: APf1xPDUZoDIoJXyLsXeGnOYz2TH1WYQ7s+oTeJj8U8pXCm3k33cONq8 N95/SFZEfo+Gf9IV2/zV4tU= X-Google-Smtp-Source: AH8x225Io7LdptQzJvlGqB9JmlU1mJ25mh4CXqR8BOV9eAWtwABhfvwdQPehLFwlgvQumdIChEY84A== X-Received: by 10.25.228.18 with SMTP id b18mr5970951lfh.61.1518478782046; Mon, 12 Feb 2018 15:39:42 -0800 (PST) Received: from octofox.com (jcmvbkbc-1-pt.tunnel.tserv24.sto1.ipv6.he.net. [2001:470:27:1fa::2]) by smtp.gmail.com with ESMTPSA id x8sm1915767lff.22.2018.02.12.15.39.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Feb 2018 15:39:41 -0800 (PST) From: Max Filippov To: Tom Rini Date: Mon, 12 Feb 2018 15:39:18 -0800 Message-Id: <1518478759-11609-2-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1518478759-11609-1-git-send-email-jcmvbkbc@gmail.com> References: <1518478759-11609-1-git-send-email-jcmvbkbc@gmail.com> Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 1/2] board/cadence/xtfpga: move SYS_MONITOR_LEN to Kconfig 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" Signed-off-by: Max Filippov --- board/cadence/xtfpga/Kconfig | 5 +++++ include/configs/xtfpga.h | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/board/cadence/xtfpga/Kconfig b/board/cadence/xtfpga/Kconfig index 69296be49c7a..67ae3860b6d4 100644 --- a/board/cadence/xtfpga/Kconfig +++ b/board/cadence/xtfpga/Kconfig @@ -36,4 +36,9 @@ config BOARD_SDRAM_SIZE default 0x18000000 if XTFPGA_ML605 default 0x38000000 if XTFPGA_KC705 +config SYS_MONITOR_LEN + hex + default 0x00020000 if XTFPGA_LX60 + default 0x00040000 if !XTFPGA_LX60 + endif diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index 79cc1e8fc1b8..86c7e7cf279c 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -59,13 +59,6 @@ #define CONFIG_SYS_SDRAM_BASE MEMADDR(0x00000000) -/* Lx60 can only map 128kb memory (instead of 256kb) when running under OCD */ -#ifdef CONFIG_XTFPGA_LX60 -# define CONFIG_SYS_MONITOR_LEN 0x00020000 /* 128KB */ -#else -# define CONFIG_SYS_MONITOR_LEN 0x00040000 /* 256KB */ -#endif - #define CONFIG_SYS_MALLOC_LEN (256 << 10) /* heap 256KB */ /* Linux boot param area in RAM (used only when booting linux) */ From patchwork Mon Feb 12 23:39:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 872524 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=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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZoIX1JYi"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zgMgD1plDz9t2f for ; Tue, 13 Feb 2018 10:43:20 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C01C7C21F06; Mon, 12 Feb 2018 23:43:11 +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.5 required=5.0 tests=FREEMAIL_FROM, FROM_LOCAL_NOVOWEL, RCVD_IN_DNSWL_BLOCKED, 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 95E20C21EE7; Mon, 12 Feb 2018 23:39:58 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 29F8DC21F45; Mon, 12 Feb 2018 23:39:48 +0000 (UTC) Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by lists.denx.de (Postfix) with ESMTPS id F3EF5C21F3E for ; Mon, 12 Feb 2018 23:39:44 +0000 (UTC) Received: by mail-lf0-f66.google.com with SMTP id j193so6737437lfe.0 for ; Mon, 12 Feb 2018 15:39:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BaKUuyzzLIQruAl8mfEy7Xskzd0azdGm3PiLPyxDQsI=; b=ZoIX1JYiMUsqCBdPO3Ul0OzjHCCZxYvdLFxVtUrVp8c9o6REhRtGDOa0Jvivjpjg6O PEz5FCbg/WWvvpwbmHmNOehxT2QJ8jINU51eAkAMlgFXR3TC1Alqurt/iRP+pDI0cSyn fGss+mP4SE44xBpO36THGdfHmSxfgHkIW2mzInlINlyZUub9qrhk22Zw5HJP1tAEVbfR Qd1FiL56Gc+PELTcRCxWfP5FgjeVGo0uc2jhaWASPGOhb8wWO8f2OXxR6xXiVn5J0fm9 NG5i2Zs8aKnh7w20YJ0pmCdE3/9hfVRb/xkmR7VMlbSS4JAS5v5aCPBKxnM21eLP//5E XrZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BaKUuyzzLIQruAl8mfEy7Xskzd0azdGm3PiLPyxDQsI=; b=kl46eDlc3F8zgHljCAbTaD6FOOnx/sJCWtOzwfsL71lRLQ0V6kbfh0u0j0QiB+gz7o jkkX6+MymfL77hl2WwVoZ8ecGizOyL6pxfGLecuIK5dNVCUJHrt0EA65tD31CYchfkkS n8Xc8KB3Gye796+iZGiPkGRTOsDFsrxCnr/QRpIRnQiVx70v3QQSWp0Tr2IOjrFRYxR3 RpAtfWhVTxhy6mv9grQtHkcT3GdSyyFWtoXMhJRauJIqDXBD++pGQ/F5Ps1fdmdhWYcL jSkUUtiD5vUBVRARWoSwW6rJyohwqUaDkfiW9P82igshMDO1ByQaZXt09fjn7koHqM+o Hl+w== X-Gm-Message-State: APf1xPBca/tSD6uegsWq8rsmAoJY0P+6+MS9jkoNjESfYnR4Mv5Eyjdg F1CKSoxV6aVI64/ymc+CuY0= X-Google-Smtp-Source: AH8x225/VNpISeX5l5QgG2xA7Kw/wkWCYaAT3OBIsB5FW1pfLlA/Lt8PykQxO+1IJIJkFFinuOJu4Q== X-Received: by 10.46.22.87 with SMTP id 23mr8407196ljw.21.1518478784386; Mon, 12 Feb 2018 15:39:44 -0800 (PST) Received: from octofox.com (jcmvbkbc-1-pt.tunnel.tserv24.sto1.ipv6.he.net. [2001:470:27:1fa::2]) by smtp.gmail.com with ESMTPSA id x8sm1915767lff.22.2018.02.12.15.39.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Feb 2018 15:39:43 -0800 (PST) From: Max Filippov To: Tom Rini Date: Mon, 12 Feb 2018 15:39:19 -0800 Message-Id: <1518478759-11609-3-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1518478759-11609-1-git-send-email-jcmvbkbc@gmail.com> References: <1518478759-11609-1-git-send-email-jcmvbkbc@gmail.com> Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 2/2] xtensa: clean up CONFIG_SYS_TEXT_ADDR 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" Drop CONFIG_SYS_MEMORY_TOP. Rename CONFIG_SYS_TEXT_ADDR to XTENSA_SYS_TEXT_ADDR. Signed-off-by: Max Filippov --- arch/xtensa/cpu/start.S | 2 +- arch/xtensa/cpu/u-boot.lds | 4 ++-- include/configs/xtfpga.h | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/xtensa/cpu/start.S b/arch/xtensa/cpu/start.S index 8e4bc99e4295..cdb875da5339 100644 --- a/arch/xtensa/cpu/start.S +++ b/arch/xtensa/cpu/start.S @@ -226,7 +226,7 @@ _start: #endif movi a0, 0 - movi sp, (CONFIG_SYS_TEXT_ADDR - 16) & 0xfffffff0 + movi sp, (XTENSA_SYS_TEXT_ADDR - 16) & 0xfffffff0 #ifdef CONFIG_DEBUG_UART movi a4, debug_uart_init diff --git a/arch/xtensa/cpu/u-boot.lds b/arch/xtensa/cpu/u-boot.lds index 853ae5a94891..7200bc59fbfc 100644 --- a/arch/xtensa/cpu/u-boot.lds +++ b/arch/xtensa/cpu/u-boot.lds @@ -74,9 +74,9 @@ SECTIONS SECTION_VECTOR(DoubleExceptionVector,text,XCHAL_DOUBLEEXC_VECTOR_VADDR, FOLLOWING(.DoubleExceptionVector.literal)) - __monitor_start = CONFIG_SYS_TEXT_ADDR; + __monitor_start = XTENSA_SYS_TEXT_ADDR; - SECTION_text(CONFIG_SYS_TEXT_ADDR, FOLLOWING(.DoubleExceptionVector.text)) + SECTION_text(XTENSA_SYS_TEXT_ADDR, FOLLOWING(.DoubleExceptionVector.text)) SECTION_rodata(ALIGN(16), FOLLOWING(.text)) SECTION_u_boot_list(ALIGN(16), FOLLOWING(.rodata)) SECTION_data(ALIGN(16), FOLLOWING(.u_boot_list)) diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index 86c7e7cf279c..d0b3b34571d2 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -91,9 +91,8 @@ #define CONFIG_SYS_MEMORY_SIZE CONFIG_SYS_SDRAM_SIZE #endif -#define CONFIG_SYS_MEMORY_TOP MEMADDR(CONFIG_SYS_MEMORY_SIZE) -#define CONFIG_SYS_TEXT_ADDR \ - (CONFIG_SYS_MEMORY_TOP - CONFIG_SYS_MONITOR_LEN) +#define XTENSA_SYS_TEXT_ADDR \ + (MEMADDR(CONFIG_SYS_MEMORY_SIZE) - CONFIG_SYS_MONITOR_LEN) /* Used by tftpboot; env var 'loadaddr' */ #define CONFIG_SYS_LOAD_ADDR MEMADDR(0x02000000)