]> git.sur5r.net Git - u-boot/commitdiff
SMDK5250: Remove reduntant code
authorRajeshwari Shinde <rajeshwari.s@samsung.com>
Tue, 25 Jun 2013 13:47:06 +0000 (19:17 +0530)
committerMinkyu Kang <mk7.kang@samsung.com>
Fri, 28 Jun 2013 00:19:38 +0000 (09:19 +0900)
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 <rajeshwari.s@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
arch/arm/include/asm/arch-exynos/spl.h
board/samsung/smdk5250/spl_boot.c

index 46b25a608ba1f96007e15655fec3e593dfe036f8..59bb7e08d47b61e0f989c99e23afdb3cd122ad62 100644 (file)
@@ -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,
index 98f2286f9efac619c16ba5ab162ac4aa6fb0a308..83275f1e0718d55507cb9d5f18258fcdb43e17cd 100644 (file)
@@ -26,6 +26,7 @@
 #include <asm/arch-exynos/dmc.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/clk.h>
+#include <asm/arch/spl.h>
 
 #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];