From d12204e947e92b0c71c0e9ce208a675573801e37 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Tue, 17 Nov 2020 11:16:28 +0100 Subject: [PATCH] samsung: tizen_rpi: make 'dfu_alt_info' static The data layout on the storage device is the same all the time for RPi3/4 boards and fully known during the compile time. Use this simple approach, which is a bit more error proof for future changes. It also obsoletes the custom code added to RPi boards. Signed-off-by: Marek Szyprowski Change-Id: I8f7211cdde50701418464419b774aeecc795efa1 --- board/raspberrypi/rpi/rpi.c | 65 --------------------------------------------- include/configs/rpi.h | 13 --------- include/samsung/tizen_rpi.h | 7 +++-- 3 files changed, 3 insertions(+), 82 deletions(-) diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 9c50e19..f4668ab 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -583,68 +583,3 @@ int checkboard(void) { return 0; } - -#ifdef CONFIG_SET_DFU_ALT_INFO -static char *get_dfu_alt_system(char *interface, char *devstr) -{ - return env_get("dfu_alt_system"); -} - -static char *get_dfu_alt_boot(char *interface, char *devstr) -{ - struct mmc *mmc; - char *alt_boot; - int dev_num; - - dev_num = simple_strtoul(devstr, NULL, 10); - - mmc = find_mmc_device(dev_num); - if (!mmc) - return NULL; - - if (mmc_init(mmc)) - return NULL; - - alt_boot = CONFIG_DFU_ALT_SYSTEM; - - return alt_boot; -} - -void set_dfu_alt_info(char *interface, char *devstr) -{ - size_t buf_size = CONFIG_SET_DFU_ALT_BUF_LEN; - ALLOC_CACHE_ALIGN_BUFFER(char, buf, buf_size); - char *alt_info = "Settings not found!"; - char *status = "error!\n"; - char *alt_setting; - char *alt_sep; - int offset = 0; - - puts("DFU alt info setting: "); - - alt_setting = get_dfu_alt_boot(interface, devstr); - if (alt_setting) { - env_set("dfu_alt_boot", alt_setting); - offset = snprintf(buf, buf_size, "%s", alt_setting); - } - - alt_setting = get_dfu_alt_system(interface, devstr); - if (alt_setting) { - if (offset) - alt_sep = ";"; - else - alt_sep = ""; - - offset += snprintf(buf + offset, buf_size - offset, - "%s%s", alt_sep, alt_setting); - } - - if (offset) { - alt_info = buf; - status = "done\n"; - } - - env_set("dfu_alt_info", alt_info); - puts(status); -} -#endif diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 91ebe41..cda3807 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -49,18 +49,6 @@ /* DFU over USB/UDC or NFS*/ #ifdef CONFIG_DFU -#ifdef CONFIG_ARM64 -#define KERNEL_FILENAME "Image" -#else -#define KERNEL_FILENAME "zImage" -#endif - -#define ENV_DFU_SETTINGS \ - "dfu_alt_info=u-boot.bin fat 0 1;uboot.env fat 0 1;" \ - "config.txt fat 0 1;" \ - KERNEL_FILENAME " fat 0 1\0" -#else -#define ENV_DFU_SETTINGS "" #endif /* Console configuration */ @@ -177,7 +165,6 @@ TIZEN_ENV_SETTING \ "dhcpuboot=usb start; dhcp u-boot.uimg; bootm\0" \ ENV_DEVICE_SETTINGS \ - ENV_DFU_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ BOOTENV diff --git a/include/samsung/tizen_rpi.h b/include/samsung/tizen_rpi.h index 96aaf85..6770f4a 100644 --- a/include/samsung/tizen_rpi.h +++ b/include/samsung/tizen_rpi.h @@ -20,7 +20,7 @@ #endif /* DFU */ -#define CONFIG_DFU_ALT_SYSTEM \ +#define DFU_ALT_SYSTEM \ "Image fat 0 1;" \ "bcm2710-rpi-3-b.dtb fat 0 1;" \ "bcm2837-rpi-3-b.dtb fat 0 1;" \ @@ -39,10 +39,8 @@ "module part 0 6;" \ "ramdisk.img part 0 7;" \ "ramdisk-recovery part 0 8;" \ - "hal.img part 0 10\0" + "hal.img part 0 10" -#define CONFIG_DFU_ALT_BOOT_EMMC "" -#define CONFIG_SET_DFU_ALT_INFO #define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K) #define PARTS_DEFAULT \ @@ -83,6 +81,7 @@ */ #define TIZEN_ENV_SETTING \ "kernel=" KERNEL_NAME "\0" \ + "dfu_alt_info=" DFU_ALT_SYSTEM "\0" \ "mmcbootdev=0\0" \ "mmcbootpart=1\0" \ "mmcrootdev=0\0" \ -- 2.7.4