On 25/06/13 22:47, Rajeshwari Shinde wrote:

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

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 <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];

applied to u-boot-samsung.

Thanks, Minkyu Kang.