Skip to contentSkip to conversation

SMDK5250: Remove reduntant code

PATCH New Rajeshwari Shinde 4 participants 4 messages Jun 25, 2013 – Jun 28, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 SMDK5250: Remove reduntant code

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.

---
 arch/arm/include/asm/arch-exynos/spl.h |    1 +
 board/samsung/smdk5250/spl_boot.c      |   10 +---------
 2 files changed, 2 insertions(+), 9 deletions(-)
arch/arm/include/asm/arch-exynos/spl.h +1 -0
index 46b25a6..59bb7e0 100644
@@ -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,
board/samsung/smdk5250/spl_boot.c +1 -9
index 98f2286..83275f1 100644
@@ -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];
Signature · 1 line
1.7.4.4
#2 lore raw

PATCH 1/1 SMDK5250: Remove reduntant code

Hi Minkyu,

Please do let me know your coments on the same. If no comments can we get this patch merged.

Quoted 17 lines · Simon Glass

On Tue, Jun 25, 2013 at 6:47 AM, Rajeshwari Shinde <[email protected]

Quoted 8 lines

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.

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Signature · 2 lines
Regards,
Rajeshwari Shinde
#3 lore raw

PATCH 1/1 SMDK5250: Remove reduntant code

In reply to Rajeshwari Shinde
Quoted 41 lines · Rajeshwari Shinde

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.

---
 arch/arm/include/asm/arch-exynos/spl.h |    1 +
 board/samsung/smdk5250/spl_boot.c      |   10 +---------
 2 files changed, 2 insertions(+), 9 deletions(-)
arch/arm/include/asm/arch-exynos/spl.h +1 -0
index 46b25a6..59bb7e0 100644
@@ -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,
board/samsung/smdk5250/spl_boot.c +1 -2
index 98f2286..83275f1 100644
@@ -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,

board/samsung/smdk5250/spl_boot.c u32 irom_ptr_table[] = { · line 54

Quoted 10 lines
board/samsung/smdk5250/spl_boot.c +0 -7
-	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.