artik: configs: split artik5 and 10 configurations

This patch splits artik5 and artik10 configurations
into each config file.

Change-Id: Ie3f2e5fbad9bc5c33fd31076d4641c1490918c37
Signed-off-by: Chanho Park <chanho61.park@samsung.com>

diff --git a/include/configs/artik10.h b/include/configs/artik10.h
index b0e697dbf2d32c655130eab9f36c8b15197b6c68..9f95e067389cb03f0bff68b840bef16865965667 100644 (file)
--- a/include/configs/artik10.h
+++ b/include/configs/artik10.h
@@ -154,4 +154,22 @@
 #define WRESET                         (1 << 10)
 #define SYS_WDTRESET                   (1 << 9)
 
+#define CONFIG_DFU_ALT_BOOT_EMMC               \
+       "u-boot raw 0x3e 0x800 mmcpart 1;"      \
+       "bl1 raw 0x0 0x1e mmcpart 1;"           \
+       "bl2 raw 0x1e 0x20 mmcpart 1;"          \
+       "tzsw raw 0x83e 0x200 mmcpart 1;"       \
+       "params raw 0xa3f 0x20\0"
+
+#define CONFIG_DFU_ALT_BOOT_SD                 \
+       "u-boot raw 0x3f 0x800;"                \
+       "bl1 raw 0x1 0x1e;"                     \
+       "bl2 raw 0x1f 0x20;"                    \
+       "tzsw raw 0x83f 0x200;"                 \
+       "params raw 0xa3f 0x20\0"
+
+#define CONFIG_USB_DWC3
+#define CONFIG_USB_DWC3_GADGET
+#define CONFIG_USB_DWC3_PHY_SAMSUNG
+
 #endif /* __ARTIK10_H */

diff --git a/include/configs/artik5.h b/include/configs/artik5.h
index e476c83f5e4bf0f390f10ade77d80326d11069b3..c74efbddd1a80bb08933a17e775817921704203c 100755 (executable)
--- a/include/configs/artik5.h
+++ b/include/configs/artik5.h
@@ -139,4 +139,21 @@
 #define SYS_WDTRESET           (1 << 20)
 #define PINRESET               (1 << 16)
 
+#define CONFIG_DFU_ALT_BOOT_EMMC               \
+       "u-boot raw 0x3e 0x800 mmcpart 1;"      \
+       "bl1 raw 0x0 0x1e mmcpart 1;"           \
+       "bl2 raw 0x1e 0x20 mmcpart 1;"          \
+       "tzsw raw 0x83e 0x800 mmcpart 1;"       \
+       "params raw 0x103f 0x20\0"
+
+#define CONFIG_DFU_ALT_BOOT_SD                 \
+       "u-boot raw 0x3f 0x800;"                \
+       "bl1 raw 0x1 0x1e;"                     \
+       "bl2 raw 0x1f 0x20;"                    \
+       "tzsw raw 0x83f 0x800;"                 \
+       "params raw 0x103f 0x20\0"
+
+#define CONFIG_USB_GADGET_S3C_UDC_OTG
+#define CONFIG_USB_GADGET_S3C_UDC_OTG_PHY
+
 #endif /* __ARTIK5_H */

diff --git a/include/configs/artik_common.h b/include/configs/artik_common.h
index df02f9e1acef04751a4274d1fde23ae70006f228..ce37433f6a9a99749d8fb3ead947e65cf4a998e7 100755 (executable)
--- a/include/configs/artik_common.h
+++ b/include/configs/artik_common.h
@@ -152,20 +152,6 @@
 #define CONFIG_FASTBOOT_AUTO_REBOOT
 #define CONFIG_FASTBOOT_AUTO_REBOOT_MODE       0x3
 
-
-/* S3C UDC */
-#ifdef CONFIG_MACH_ARTIK5
-#define CONFIG_USB_GADGET_S3C_UDC_OTG
-#define CONFIG_USB_GADGET_S3C_UDC_OTG_PHY
-#endif
-
-/* DWC3 */
-#ifdef CONFIG_MACH_ARTIK10
-#define CONFIG_USB_DWC3
-#define CONFIG_USB_DWC3_GADGET
-#define CONFIG_USB_DWC3_PHY_SAMSUNG
-#endif
-
 /* USB gadget */
 #define CONFIG_USB_GADGET
 #define CONFIG_USB_GADGET_DUALSPEED
@@ -319,38 +305,6 @@
        "system-data part 0 5;"                 \
        "user part 0 6\0"
 
-#ifdef CONFIG_MACH_ARTIK5
-#define CONFIG_DFU_ALT_BOOT_EMMC               \
-       "u-boot raw 0x3e 0x800 mmcpart 1;"      \
-       "bl1 raw 0x0 0x1e mmcpart 1;"           \
-       "bl2 raw 0x1e 0x20 mmcpart 1;"          \
-       "tzsw raw 0x83e 0x800 mmcpart 1;"       \
-       "params raw 0x103f 0x20\0"
-
-#define CONFIG_DFU_ALT_BOOT_SD                 \
-       "u-boot raw 0x3f 0x800;"                \
-       "bl1 raw 0x1 0x1e;"                     \
-       "bl2 raw 0x1f 0x20;"                    \
-       "tzsw raw 0x83f 0x800;"                 \
-       "params raw 0x103f 0x20\0"
-#endif
-
-#ifdef CONFIG_MACH_ARTIK10
-#define CONFIG_DFU_ALT_BOOT_EMMC               \
-       "u-boot raw 0x3e 0x800 mmcpart 1;"      \
-       "bl1 raw 0x0 0x1e mmcpart 1;"           \
-       "bl2 raw 0x1e 0x20 mmcpart 1;"          \
-       "tzsw raw 0x83e 0x200 mmcpart 1;"       \
-       "params raw 0xa3f 0x20\0"
-
-#define CONFIG_DFU_ALT_BOOT_SD                 \
-       "u-boot raw 0x3f 0x800;"                \
-       "bl1 raw 0x1 0x1e;"                     \
-       "bl2 raw 0x1f 0x20;"                    \
-       "tzsw raw 0x83f 0x200;"                 \
-       "params raw 0xa3f 0x20\0"
-#endif
-
 #define PARTS_DEFAULT                                                  \
        "uuid_disk=${uuid_gpt_disk};"                                   \
        "name=boot,start=4MiB,size=" __stringify(CONFIG_BOOT_PART_SIZE) \