board: amlogic: remove CONFIG_ prefix about dfu information
authorJaehoon Chung <jh80.chung@samsung.com>
Fri, 30 Oct 2020 03:00:03 +0000 (12:00 +0900)
committerMarek Szyprowski <m.szyprowski@samsung.com>
Tue, 16 Nov 2021 10:04:04 +0000 (11:04 +0100)
Remove CONFIG_ prefix about dfu information.

Change-Id: I733ff160fa98ac0f70b8d76a0f17fb1d463724f5
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
board/amlogic/odroid-n2/odroid-n2.c
board/amlogic/w400/w400.c
include/samsung/tizen_amlogic.h

index d661b96..235f9b1 100644 (file)
@@ -145,7 +145,10 @@ int misc_init_r(void)
 #include <memalign.h>
 static char *get_dfu_alt_system(char *interface, char *devstr)
 {
-       return env_get("dfu_alt_system");
+       if (!strncmp(devstr, "0", 1))
+               return env_get("dfu_alt_system_sd");
+       else
+               return env_get("dfu_alt_system");
 }
 
 static char *get_dfu_alt_boot(char *interface, char *devstr)
@@ -164,9 +167,9 @@ static char *get_dfu_alt_boot(char *interface, char *devstr)
                return NULL;
 
        if (!strncmp(devstr, "0", 1))
-               alt_boot = CONFIG_DFU_ALT_SYSTEM_2;
+               alt_boot = DFU_ALT_BOOT_SD;
        else
-               alt_boot = CONFIG_DFU_ALT_SYSTEM;
+               alt_boot = DFU_ALT_BOOT_EMMC;
 
        return alt_boot;
 }
index 7f01273..31b75d2 100644 (file)
@@ -25,7 +25,10 @@ int misc_init_r(void)
 #include <memalign.h>
 static char *get_dfu_alt_system(char *interface, char *devstr)
 {
-       return env_get("dfu_alt_system");
+       if (!strncmp(devstr, "0", 1))
+               return env_get("dfu_alt_system_sd");
+       else
+               return env_get("dfu_alt_system");
 }
 
 static char *get_dfu_alt_boot(char *interface, char *devstr)
@@ -44,9 +47,9 @@ static char *get_dfu_alt_boot(char *interface, char *devstr)
                return NULL;
 
        if (!strncmp(devstr, "0", 1))
-               alt_boot = CONFIG_DFU_ALT_SYSTEM_2;
+               alt_boot = DFU_ALT_BOOT_SD;
        else
-               alt_boot = CONFIG_DFU_ALT_SYSTEM;
+               alt_boot = DFU_ALT_BOOT_EMMC;
 
        return alt_boot;
 }
index ebfa383..af35e62 100644 (file)
@@ -19,7 +19,7 @@
 
 /* DFU */
 /* For SD */
-#define CONFIG_DFU_ALT_SYSTEM_2                \
+#define DFU_ALT_SYSTEM_SD              \
        "Image fat 0 1;"                        \
        "meson64_odroidn2_drm.dtb fat 0 1;"             \
        "meson64_odroidn2.dtb fat 0 1;"         \
@@ -33,7 +33,7 @@
        "ramdisk.img part 0 7\0"
 
 /* For eMMC */
-#define CONFIG_DFU_ALT_SYSTEM          \
+#define DFU_ALT_SYSTEM         \
        "Image fat 1 1;"                        \
        "meson64_odroidn2_drm.dtb fat 1 1;"             \
        "meson64_odroidn2.dtb fat 1 1;"         \
@@ -47,7 +47,8 @@
        "ramdisk.img part 1 7\0"
 
 
-#define CONFIG_DFU_ALT_BOOT_EMMC       ""
+#define DFU_ALT_BOOT_EMMC      "u-boot.bin raw 0x1 0x850"
+#define DFU_ALT_BOOT_SD        ""
 #define CONFIG_SET_DFU_ALT_INFO
 #define CONFIG_SET_DFU_ALT_BUF_LEN     (SZ_1K)
 
@@ -75,6 +76,8 @@
        "bootmode=ramdisk\0"                    \
        "bootdev=mmc\0"                         \
        "tfm=setenv bootmode download; run bootcmd\0"   \
+       "dfu_alt_system="DFU_ALT_SYSTEM                 \
+       "dfu_alt_system_sd="DFU_ALT_SYSTEM_SD                   \
        "fdt_high=0x20000000\n"                 \
        "initrd_high=0x3d800000\n"                      \
        "opts=loglevel=4\0"                     \