From patchwork Mon Oct 22 11:52:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hatim Ali X-Patchwork-Id: 12400 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 604F023EF8 for ; Mon, 22 Oct 2012 12:00:22 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id DE422A1991D for ; Mon, 22 Oct 2012 12:00:21 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so3279562iej.11 for ; Mon, 22 Oct 2012 05:00:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:x-auditid :from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :dlp-filter:x-mtr:x-brightmail-tracker:x-brightmail-tracker :x-cfilter-loop:x-gm-message-state; bh=x9UqP7bDrPX7ghMoodBCmL2tH/v+uAdkgI4z3QutIWA=; b=VHWshY354oFDU4rC/QmPQtxgy2SnvjOLPjT2b2sPOyveSv+AouRlsY9WaJrhrlwcow jFkvfBzR3ApreStc+M/Ba22eKfjMyFb+5QDXx+ckaUWaZR6nVpyiWC4ZnidWXvW4mkKU PMsWRPFMBka2I8CpWxvHOGisb3+1FqXSCsf98HmiBVL+WiIi5LaBSaNX1G1cAWQzH55y pWwlohGIuNkjlGwYlDPIDPcKNA+aEKYubeaCb2D3HT7l7NcADwR98i8KGVeF2fgM0erx lRIuzLOe6mF6P17U1LbJMp7p8n2ZOYqcuyZDOqOvnhrTGd5wBKXPaKtAIiFZQvBCMrhP FHgw== Received: by 10.50.88.233 with SMTP id bj9mr8711252igb.70.1350907221289; Mon, 22 Oct 2012 05:00:21 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp218881igt; Mon, 22 Oct 2012 05:00:20 -0700 (PDT) Received: by 10.66.80.166 with SMTP id s6mr17259347pax.21.1350907220438; Mon, 22 Oct 2012 05:00:20 -0700 (PDT) Received: from mailout4.samsung.com (mailout4.samsung.com. [203.254.224.34]) by mx.google.com with ESMTP id s9si13135414pav.1.2012.10.22.05.00.19; Mon, 22 Oct 2012 05:00:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of hatim.rv@samsung.com designates 203.254.224.34 as permitted sender) client-ip=203.254.224.34; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of hatim.rv@samsung.com designates 203.254.224.34 as permitted sender) smtp.mail=hatim.rv@samsung.com Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MCA004Q1MN2MKO0@mailout4.samsung.com> for patches@linaro.org; Mon, 22 Oct 2012 21:00:19 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.126]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 64.4E.01231.35535805; Mon, 22 Oct 2012 21:00:19 +0900 (KST) X-AuditID: cbfee61a-b7fa66d0000004cf-25-50853553d0e8 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id A3.4E.01231.25535805; Mon, 22 Oct 2012 21:00:18 +0900 (KST) Received: from hatim-linux.sisodomain.com ([107.108.73.95]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MCA006A7MH2ZQ10@mmp1.samsung.com> for patches@linaro.org; Mon, 22 Oct 2012 21:00:18 +0900 (KST) From: Hatim Ali To: u-boot@lists.denx.de Cc: sjg@chromium.org, promsoft@gmail.com, patches@linaro.org Subject: [PATCH 6/6 V7] EXYNOS5: Enable SPI booting. Date: Mon, 22 Oct 2012 17:22:09 +0530 Message-id: <1350906729-23749-7-git-send-email-hatim.rv@samsung.com> X-Mailer: git-send-email 1.7.2.3 In-reply-to: <1350906729-23749-1-git-send-email-hatim.rv@samsung.com> References: <1350906729-23749-1-git-send-email-hatim.rv@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrNLMWRmVeSWpSXmKPExsWyRsSkTjfYtDXAoO8jt8WUw19YHBg97lzb wxbAGMVlk5Kak1mWWqRvl8CVcXHrQvaCrboVv07dZW9g/KHSxcjJISFgIvFs72omCFtM4sK9 9WwgtpDAUkaJaYs4YWoWHd3O3MXIBRRfxChx7dJdFiiHSeLpoo9g3WwCahLrX3eCdYsISEj8 6r/KCGIzC9hILOm5B2YLA026v/4AK4jNIqAqcWDOfrBeXgEXiWcPfrNDbFOQeHVjLZjNKeAq cb+/A6ieA2iZi8T8XkWIVgGJb5MPsYCEJQRkJTYdALtNQuAym8SJtV1Qz0hKHFxxg2UCo/AC RoZVjKKpBckFxUnpuYZ6xYm5xaV56XrJ+bmbGIEhePrfM6kdjCsbLA4xCnAwKvHwaii0Bgix JpYVV+YeYpTgYFYS4b0iBhTiTUmsrEotyo8vKs1JLT7E6AN0yURmKdHkfGB85JXEGxqbmJsa m1oaGZmZmuIQVhLnbfZICRASSE8sSc1OTS1ILYIZx8TBKdXA2JV6+duTgsltaRL1jx74G+mb th3Usg1hkjz4nUujcRmjccXXslXPjGzn5VzYdVPq5PuCM7fiw5JUdCbMWXV8XvXq7bPlZvN9 nqbBxrXoVe9lsf1fhSbLnt1cEtL/wXByz6m9sw4v/DIv4+eZfwoXbZe++ZKTJb3u9f+Q3GsF e8VXOZbvKtDq6VdiKc5INNRiLipOBADW0FPrbgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmkeLIzCtJLcpLzFFi42I5/e+xgG6QaWuAwdWPFhZTDn9hcWD0uHNt D1sAY1QDo01GamJKapFCal5yfkpmXrqtkndwvHO8qZmBoa6hpYW5kkJeYm6qrZKLT4CuW2YO 0FglhbLEnFKgUEBicbGSvh2mCaEhbroWMI0Rur4hQXA9RgZoIGENY8bFrQvZC7bqVvw6dZe9 gfGHShcjJ4eEgInEoqPbmSFsMYkL99azdTFycQgJLGKUuHbpLguUwyTxdNFHJpAqNgE1ifWv O9lAbBEBCYlf/VcZQWxmARuJJT33wGxhoKn31x9gBbFZBFQlDszZD9bLK+Ai8ezBb3aIbQoS r26sBbM5BVwl7vd3ANVzAC1zkZjfqziBkXcBI8MqRtHUguSC4qT0XEO94sTc4tK8dL3k/NxN jOAQfya1g3Flg8UhRgEORiUeXg2F1gAh1sSy4srcQ4wSHMxKIrxXxIBCvCmJlVWpRfnxRaU5 qcWHGH2AjprILCWanA+Mv7ySeENjE3NTY1NLEwsTM0scwkrivM0eKQFCAumJJanZqakFqUUw 45g4OKUaGNv4vq4IufXLa9135nDNmo+el1LELhl+eP1k76NJt1srFRizo3fsbTsR2OPZoHr1 Xnl0YOz0ONf3Fxs9vjLzfIpPuGgpmvgh/5ws5wod+Tu7Z05Xebruadjjq3FztHf2rrx6Wuv2 zNlMU74LL/e06rka8PZnXKik9aFFHVlMHx1zbysFRx+6ekuJpTgj0VCLuag4EQB5pLsdngIA AA== X-CFilter-Loop: Reflected X-Gm-Message-State: ALoCoQktVjU4tGOJr3Sc03aXDeVBxndobHUbPb5ZUnXRwZ3J8uJlL0WXlMlA20iMsQLrZprB5opB From: Rajeshwari Shinde This patch enables SPI Booting for EXYNOS5 Signed-off-by: Rajeshwari Shinde Acked-by: Simon Glass --- Changes since v4: No Change Changes since v5: No Change Changes since v6: No Change diff --git a/board/samsung/smdk5250/Makefile b/board/samsung/smdk5250/Makefile index 1474fa8..47c6a5a 100644 --- a/board/samsung/smdk5250/Makefile +++ b/board/samsung/smdk5250/Makefile @@ -36,7 +36,7 @@ COBJS += smdk5250.o endif ifdef CONFIG_SPL_BUILD -COBJS += mmc_boot.o +COBJS += spl_boot.o endif SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) diff --git a/board/samsung/smdk5250/mmc_boot.c b/board/samsung/smdk5250/mmc_boot.c deleted file mode 100644 index 449a919..0000000 --- a/board/samsung/smdk5250/mmc_boot.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2012 Samsung Electronics - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#include -#include - -/* -* Copy U-boot from mmc to RAM: -* COPY_BL2_FNPTR_ADDR: Address in iRAM, which Contains -* Pointer to API (Data transfer from mmc to ram) -*/ -void copy_uboot_to_ram(void) -{ - u32 (*copy_bl2)(u32, u32, u32) = (void *) *(u32 *)COPY_BL2_FNPTR_ADDR; - - copy_bl2(BL2_START_OFFSET, BL2_SIZE_BLOC_COUNT, CONFIG_SYS_TEXT_BASE); -} - -void board_init_f(unsigned long bootflag) -{ - __attribute__((noreturn)) void (*uboot)(void); - copy_uboot_to_ram(); - - /* Jump to U-Boot image */ - uboot = (void *)CONFIG_SYS_TEXT_BASE; - (*uboot)(); - /* Never returns Here */ -} - -/* Place Holders */ -void board_init_r(gd_t *id, ulong dest_addr) -{ - /* Function attribute is no-return */ - /* This Function never executes */ - while (1) - ; -} - -void save_boot_params(u32 r0, u32 r1, u32 r2, u32 r3) {} diff --git a/board/samsung/smdk5250/spl_boot.c b/board/samsung/smdk5250/spl_boot.c new file mode 100644 index 0000000..d8f3c1e --- /dev/null +++ b/board/samsung/smdk5250/spl_boot.c @@ -0,0 +1,85 @@ +/* + * Copyright (C) 2012 Samsung Electronics + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include +#include + +enum boot_mode { + BOOT_MODE_MMC = 4, + BOOT_MODE_SERIAL = 20, + /* Boot based on Operating Mode pin settings */ + BOOT_MODE_OM = 32, + BOOT_MODE_USB, /* Boot using USB download */ +}; + + typedef u32 (*spi_copy_func_t)(u32 offset, u32 nblock, u32 dst); + +/* +* Copy U-boot from mmc to RAM: +* COPY_BL2_FNPTR_ADDR: Address in iRAM, which Contains +* Pointer to API (Data transfer from mmc to ram) +*/ +void copy_uboot_to_ram(void) +{ + spi_copy_func_t spi_copy; + enum boot_mode bootmode; + u32 (*copy_bl2)(u32, u32, u32); + + bootmode = readl(EXYNOS5_POWER_BASE) & OM_STAT; + + switch (bootmode) { + case BOOT_MODE_SERIAL: + spi_copy = *(spi_copy_func_t *)EXYNOS_COPY_SPI_FNPTR_ADDR; + spi_copy(SPI_FLASH_UBOOT_POS, CONFIG_BL2_SIZE, + CONFIG_SYS_TEXT_BASE); + break; + case BOOT_MODE_MMC: + copy_bl2 = (void *) *(u32 *)COPY_BL2_FNPTR_ADDR; + copy_bl2(BL2_START_OFFSET, BL2_SIZE_BLOC_COUNT, + CONFIG_SYS_TEXT_BASE); + break; + default: + break; + } +} + +void board_init_f(unsigned long bootflag) +{ + __attribute__((noreturn)) void (*uboot)(void); + copy_uboot_to_ram(); + + /* Jump to U-Boot image */ + uboot = (void *)CONFIG_SYS_TEXT_BASE; + (*uboot)(); + /* Never returns Here */ +} + +/* Place Holders */ +void board_init_r(gd_t *id, ulong dest_addr) +{ + /* Function attribute is no-return */ + /* This Function never executes */ + while (1) + ; +} + +void save_boot_params(u32 r0, u32 r1, u32 r2, u32 r3) {} diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h index 604c61e..c7864a5 100644 --- a/include/configs/smdk5250.h +++ b/include/configs/smdk5250.h @@ -188,6 +188,11 @@ /* U-boot copy size from boot Media to DRAM.*/ #define BL2_START_OFFSET (CONFIG_BL2_OFFSET/512) #define BL2_SIZE_BLOC_COUNT (CONFIG_BL2_SIZE/512) + +#define OM_STAT (0x1f << 1) +#define EXYNOS_COPY_SPI_FNPTR_ADDR 0x02020058 +#define SPI_FLASH_UBOOT_POS (CONFIG_SEC_FW_SIZE + CONFIG_BL1_SIZE) + #define CONFIG_DOS_PARTITION #define CONFIG_IRAM_STACK 0x02050000