From patchwork Tue Jun 25 13:47:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajeshwari Birje X-Patchwork-Id: 254154 X-Patchwork-Delegate: promsoft@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 6ECD72C007C for ; Tue, 25 Jun 2013 23:46:28 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 82E3F4A02A; Tue, 25 Jun 2013 15:46:26 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 7JR+ZqvebZ95; Tue, 25 Jun 2013 15:46:26 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 933A74A021; Tue, 25 Jun 2013 15:46:19 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A1A994A021 for ; Tue, 25 Jun 2013 15:46:11 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 TuHuGGrDoMGN for ; Tue, 25 Jun 2013 15:46:04 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 BL_NJABL=ERR(-1.5) (only DNSBL check requested) Received: from mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by theia.denx.de (Postfix) with ESMTP id 854BB4A020 for ; Tue, 25 Jun 2013 15:45:56 +0200 (CEST) Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MOY002QVBKIO450@mailout4.samsung.com> for u-boot@lists.denx.de; Tue, 25 Jun 2013 22:45:54 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.123]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id FA.1A.17404.21F99C15; Tue, 25 Jun 2013 22:45:54 +0900 (KST) X-AuditID: cbfee68d-b7f096d0000043fc-eb-51c99f126306 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 57.1B.28381.11F99C15; Tue, 25 Jun 2013 22:45:54 +0900 (KST) Received: from rajeshwari-linux.sisodomain.com ([107.108.215.115]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MOY00IIJBKC7D20@mmp2.samsung.com>; Tue, 25 Jun 2013 22:45:53 +0900 (KST) From: Rajeshwari Shinde To: u-boot@lists.denx.de Date: Tue, 25 Jun 2013 19:17:06 +0530 Message-id: <1372168026-5741-1-git-send-email-rajeshwari.s@samsung.com> X-Mailer: git-send-email 1.7.4.4 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKLMWRmVeSWpSXmKPExsWyRsSkWldo/slAg+5FvBYdR1oYLaYc/sJi 8W3LNkaL5a83slu83dvJ7sDqMbvhIovHgk2lHneu7WHzOHtnB6NH35ZVjAGsUVw2Kak5mWWp Rfp2CVwZOx/vZC+YyFtx+ftM1gbGJ1xdjJwcEgImEvennmCFsMUkLtxbz9bFyMUhJLCUUeLo 1OvsMEWHX7cxQSSmM0rMffiBEcKZyCTxe14PWDubgJHE1pPTGEFsEQEJiV/9V8FsZoEoie/d l8AmCQsYSMz5Nw3MZhFQlXj9disbiM0r4C7xfepdJohtChLHpn5lBVkgIfCZTeLVOZgGAYlv kw+xdDFyACVkJTYdYIaol5Q4uOIGywRGwQWMDKsYRVMLkguKk9KLDPWKE3OLS/PS9ZLzczcx AoP09L9nvTsYbx+wPsSYDDRuIrOUaHI+MMjzSuINjc2MLExNTI2NzC3NSBNWEudVa7EOFBJI TyxJzU5NLUgtii8qzUktPsTIxMEp1cB482/dglzxtX+NzPxn2fc2KPG8veSzKGRziI2BRkNI fKDOHqaSw6VskXXOLyZ7uzw48iLimbGZa2eRV/PyJ09ZeDV71sd3lsezvdh+ZaLSw6QT6Ub/ FpbItu4+tYFpl+9l4amsNQcf/mnRMtf1esaQtSylKvF0vFK6wK2GuS/+OXyTc0m72avEUpyR aKjFXFScCAB5lG3zaAIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsVy+t9jQV2h+ScDDf5NZ7HoONLCaDHl8BcW i29btjFaLH+9kd3i7d5OdgdWj9kNF1k8Fmwq9bhzbQ+bx9k7Oxg9+rasYgxgjWpgtMlITUxJ LVJIzUvOT8nMS7dV8g6Od443NTMw1DW0tDBXUshLzE21VXLxCdB1y8wB2q6kUJaYUwoUCkgs LlbSt8M0ITTETdcCpjFC1zckCK7HyAANJKxhzNj5eCd7wUTeisvfZ7I2MD7h6mLk5JAQMJE4 /LqNCcIWk7hwbz1bFyMXh5DAdEaJuQ8/MEI4E5kkfs/rYQWpYhMwkth6chojiC0iICHxq/8q mM0sECXxvfsSO4gtLGAgMeffNDCbRUBV4vXbrWwgNq+Au8T3qXehtilIHJv6lXUCI/cCRoZV jKKpBckFxUnpuYZ6xYm5xaV56XrJ+bmbGMEx8ExqB+PKBotDjAIcjEo8vJG7TgQKsSaWFVfm HmKU4GBWEuE9lHUyUIg3JbGyKrUoP76oNCe1+BBjMtD2icxSosn5wPjMK4k3NDYxNzU2tTSx MDGzJE1YSZz3QKt1oJBAemJJanZqakFqEcwWJg5OqQZGk62rV7UHbrhkWbZpf8z181/iAy72 bXt5nlVHov5A1zHd9KMLOrJYojfvn6Lrzt69WWsqZ6uMY7Vxss3dVj4VM/VmhhubdnEcV/dZ 7+UqsVtmUd/Nz3nyv/ue/X/4MbOc13/pmvNTXz57myJit/bzy9Xx69tqLxtnrKi5Z7vu6Kvd lo77YjdbKbEUZyQaajEXFScCABcYennFAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: u-boot-review@google.com, patches@linaro.org Subject: [U-Boot] [PATCH] SMDK5250: Remove reduntant code X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de enum boot_mode is defined twice once in spl.h and also in spl_boot.c, hence removing the same from spl_boot.c and including the header file. Signed-off-by: Rajeshwari Shinde Acked-by: Simon Glass --- arch/arm/include/asm/arch-exynos/spl.h | 1 + board/samsung/smdk5250/spl_boot.c | 10 +--------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/arch/arm/include/asm/arch-exynos/spl.h b/arch/arm/include/asm/arch-exynos/spl.h index 46b25a6..59bb7e0 100644 --- a/arch/arm/include/asm/arch-exynos/spl.h +++ b/arch/arm/include/asm/arch-exynos/spl.h @@ -32,6 +32,7 @@ enum boot_mode { * pin values are the same across Exynos4 and Exynos5. */ BOOT_MODE_MMC = 4, + BOOT_MODE_EMMC = 8, /* EMMC4.4 */ BOOT_MODE_SERIAL = 20, /* Boot based on Operating Mode pin settings */ BOOT_MODE_OM = 32, diff --git a/board/samsung/smdk5250/spl_boot.c b/board/samsung/smdk5250/spl_boot.c index 98f2286..83275f1 100644 --- a/board/samsung/smdk5250/spl_boot.c +++ b/board/samsung/smdk5250/spl_boot.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "clock_init.h" @@ -48,15 +49,6 @@ u32 irom_ptr_table[] = { [USB_INDEX] = 0x02020070, /* iROM Function Pointer-USB boot*/ }; -enum boot_mode { - BOOT_MODE_MMC = 4, - BOOT_MODE_SERIAL = 20, - BOOT_MODE_EMMC = 8, /* EMMC4.4 */ - /* Boot based on Operating Mode pin settings */ - BOOT_MODE_OM = 32, - BOOT_MODE_USB, /* Boot using USB download */ -}; - void *get_irom_func(int index) { return (void *)*(u32 *)irom_ptr_table[index];