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 Shinde X-Patchwork-Id: 18114 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-gh0-f198.google.com (mail-gh0-f198.google.com [209.85.160.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B34D325E4B for ; Tue, 25 Jun 2013 13:45:57 +0000 (UTC) Received: by mail-gh0-f198.google.com with SMTP id r13sf12972517ghr.5 for ; Tue, 25 Jun 2013 06:45:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:x-auditid:from:to:cc:subject:date:message-id:x-mailer :x-brightmail-tracker:x-brightmail-tracker:dlp-filter:x-mtr :x-cfilter-loop:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=XXXlxHwIM2opjTDaJytN2LXJamyeVRieqsKZsDZWSsQ=; b=DaFnl4G3nGKfUSMvZmEZx6EJK0PQQxk7ty7HMrUeBuKn2mS83whXmiv534PVv2mYE6 XqWCxiBO6PAJKT22L56qnfVRicH7edsXZAT9edbUSTrmBvvISI25Ylthne8IoX0/98al Wbz7SPwORQFokVylZtjizOoGV578Esgp68Bb5xlIRJMndETudCDr2VjuSXIeW2i0l0MC KdWX+9LTuBbJOwv8IVGyBjaemBoDTJKiCKoLg65Fyf6pe+tcW02MdY2kbnOthWOUsu24 C+ZgGaNf2iqnGuQafEK6tyQjLgMOKbRJq0BLxZobQVcJB6qyOH9qdcyLL4Fp0rk7C4fb gNEA== X-Received: by 10.236.62.132 with SMTP id y4mr880247yhc.13.1372167956925; Tue, 25 Jun 2013 06:45:56 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.116.197 with SMTP id jy5ls11631qeb.10.gmail; Tue, 25 Jun 2013 06:45:56 -0700 (PDT) X-Received: by 10.58.46.196 with SMTP id x4mr14006267vem.73.1372167956732; Tue, 25 Jun 2013 06:45:56 -0700 (PDT) Received: from mail-vb0-x22d.google.com (mail-vb0-x22d.google.com [2607:f8b0:400c:c02::22d]) by mx.google.com with ESMTPS id sd1si6274044veb.11.2013.06.25.06.45.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Jun 2013 06:45:56 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::22d is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::22d; Received: by mail-vb0-f45.google.com with SMTP id p14so9472672vbm.32 for ; Tue, 25 Jun 2013 06:45:56 -0700 (PDT) X-Received: by 10.52.27.172 with SMTP id u12mr11221715vdg.64.1372167956605; Tue, 25 Jun 2013 06:45:56 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.165.8 with SMTP id yu8csp68632veb; Tue, 25 Jun 2013 06:45:56 -0700 (PDT) X-Received: by 10.68.95.164 with SMTP id dl4mr8876242pbb.42.1372167955645; Tue, 25 Jun 2013 06:45:55 -0700 (PDT) Received: from mailout4.samsung.com (mailout4.samsung.com. [203.254.224.34]) by mx.google.com with ESMTP id ib1si11443058pbc.70.2013.06.25.06.45.55 for ; Tue, 25 Jun 2013 06:45:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of rajeshwari.s@samsung.com designates 203.254.224.34 as permitted sender) client-ip=203.254.224.34; 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 patches@linaro.org; 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 Cc: patches@linaro.org, sjg@chromium.org, mk7.kang@samsung.com, u-boot-review@google.com Subject: [PATCH] SMDK5250: Remove reduntant code 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 X-Gm-Message-State: ALoCoQn7c9MzrHagdhby8Fj7oDmIvH8jkO3q5CcbI1g8FG9jxOJERaB1pop+GyJLRLRv921O9BJo X-Original-Sender: rajeshwari.s@samsung.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::22d is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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];