artik: configs: support the Thor downloader on a bootable SD card

This patch supports the Thor downloader on a bootable SD card.
On the get_dfu_alt_system(), "dfu_alt_system" env information is replaced
to CONFIG_DFU_ALT_SYSTEM_SD when "rootdev" is '1'.

Change-Id: Ia013df50e9f9edeab9dcdfb6d674b2549c156bf7
Signed-off-by: jino.cho <jino.cho@samsung.com>

diff --git a/board/samsung/espresso3250/espresso3250.c b/board/samsung/espresso3250/espresso3250.c
index f8a5b4d9cf8ddf225ceacdcdd99b43a215dabfb0..5d7a35f2796bb2da7fa803f3e2d1259758e9108c 100644 (file)
--- a/board/samsung/espresso3250/espresso3250.c
+++ b/board/samsung/espresso3250/espresso3250.c
@@ -652,6 +652,11 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
 #ifdef CONFIG_SET_DFU_ALT_INFO
 char *get_dfu_alt_system(char *interface, char *devstr)
 {
+       char *rootdev = getenv("rootdev");
+
+       if (rootdev != NULL && rootdev[0] == '1')
+               setenv("dfu_alt_system", CONFIG_DFU_ALT_SYSTEM_SD);
+
        return getenv("dfu_alt_system");
 }
 

diff --git a/board/samsung/smdk5422/smdk5422.c b/board/samsung/smdk5422/smdk5422.c
index 17c002416736ffac12b35d4666700d5adfb5a2a7..62656acadce3d96c39adc8504088b032163f3f62 100644 (file)
--- a/board/samsung/smdk5422/smdk5422.c
+++ b/board/samsung/smdk5422/smdk5422.c
@@ -550,14 +550,16 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
 #ifdef CONFIG_SET_DFU_ALT_INFO
 char *get_dfu_alt_system(char *interface, char *devstr)
 {
-       char *info = "Not supported!";
+       char *rootdev = getenv("rootdev");
+
+       if (rootdev != NULL && rootdev[0] == '1')
+               setenv("dfu_alt_system", CONFIG_DFU_ALT_SYSTEM_SD);
 
        return getenv("dfu_alt_system");
 }
 
 char *get_dfu_alt_boot(char *interface, char *devstr)
 {
-       char *info = "Not supported!";
        struct mmc *mmc;
        char *alt_boot;
        int dev_num;

diff --git a/include/configs/artik_common.h b/include/configs/artik_common.h
index 750e1138aa648c607429cdbd0a8a3d47de1bdfc8..44a69cf5c77f209be5f70a5e22a6998ac7d0dc38 100644 (file)
--- a/include/configs/artik_common.h
+++ b/include/configs/artik_common.h
@@ -290,20 +290,34 @@
 #define CONFIG_SET_DFU_ALT_INFO
 #define CONFIG_SET_DFU_ALT_BUF_LEN     (1 << 10)       /* 1 KB */
 
-#define CONFIG_DFU_ALT_SYSTEM               \
-       "uImage fat 0 1;"                   \
-       "zImage fat 0 1;"                   \
-       "uInitrd fat 0 1;"                  \
-       "boot.scr fat 0 1;"                 \
-       "boot.cmd fat 0 1;"                 \
-       "exynos5422-artik10.dtb fat 0 1;" \
-       "exynos3250-artik5.dtb fat 0 1;" \
-       "boot part 0 1;" \
-       "modules part 0 2;" \
-       "rootfs part 0 3;" \
-       "system-data part 0 4;" \
+#define CONFIG_DFU_ALT_SYSTEM                  \
+       "uImage fat 0 1;"                       \
+       "zImage fat 0 1;"                       \
+       "uInitrd fat 0 1;"                      \
+       "boot.scr fat 0 1;"                     \
+       "boot.cmd fat 0 1;"                     \
+       "exynos5422-artik10.dtb fat 0 1;"       \
+       "exynos3250-artik5.dtb fat 0 1;"        \
+       "boot part 0 1;"                        \
+       "modules part 0 2;"                     \
+       "rootfs part 0 3;"                      \
+       "system-data part 0 4;"                 \
        "user part 0 5\0"
 
+#define CONFIG_DFU_ALT_SYSTEM_SD               \
+       "uImage fat 0 1;"                       \
+       "zImage fat 0 1;"                       \
+       "uInitrd fat 0 1;"                      \
+       "boot.scr fat 0 1;"                     \
+       "boot.cmd fat 0 1;"                     \
+       "exynos5422-artik10.dtb fat 0 1;"       \
+       "exynos3250-artik5.dtb fat 0 1;"        \
+       "boot part 0 1;"                        \
+       "modules part 0 2;"                     \
+       "rootfs part 0 3;"                      \
+       "system-data part 0 5;"                 \
+       "user part 0 6\0"
+
 #ifdef CONFIG_MACH_ARTIK5
 #define CONFIG_DFU_ALT_BOOT_EMMC               \
        "u-boot raw 0x3e 0x290 mmcpart 1;"      \
@@ -383,7 +397,7 @@
        "fdtaddr=40800000\0"                                            \
        "initrd_file=uInitrd\0"                                         \
        "initrd_addr=43000000\0"                                        \
-       "dfu_alt_system=" CONFIG_DFU_ALT_SYSTEM                 \
+       "dfu_alt_system=" CONFIG_DFU_ALT_SYSTEM                         \
        "dfu_usb_con=0\0"                                               \
        "dfu_interface=mmc\0"                                           \
        "dfu_device=${emmc_dev}\0"                                      \