From: Jaehoon Chung Date: Mon, 1 Oct 2018 03:55:57 +0000 (+0900) Subject: config: odroid-xu3: add dfu_alt_system information version 2 X-Git-Tag: submit/tizen/20201110.005738~191 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b9327b39fac96662765b18cbf16977e5c2f6f0c5;p=platform%2Fkernel%2Fu-boot.git config: odroid-xu3: add dfu_alt_system information version 2 Add the dfu_alt_system information version 2. It's used to flash a ramdisk.img at partition 7. If there is no partition 7, it will load from mmcbootpart as mmcblk0p1. Change-Id: I2830a950ab87e80c66e4d5dc134c12523011252e Signed-off-by: Jaehoon Chung --- diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 0dbd609006..2bdb36520f 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -60,6 +60,7 @@ #define PARTS_DATA "system-data" #define PARTS_USER "user" #define PARTS_MODULES "modules" +#define PARTS_RAMDISK "ramdisk" #define CONFIG_DFU_ALT_SYSTEM \ "uImage fat 0 1;" \ @@ -77,7 +78,24 @@ ""PARTS_ROOT" part 0 2;" \ ""PARTS_DATA" part 0 3;" \ ""PARTS_USER" part 0 5;" \ - ""PARTS_MODULES" part 0 6\0" + ""PARTS_MODULES" part 0 6\0" \ + +#define CONFIG_DFU_ALT_SYSTEM_2 \ + "uImage fat 0 1;" \ + "zImage fat 0 1;" \ + "Image.itb fat 0 1;" \ + "uInitrd fat 0 1;" \ + "boot.scr fat 0 1;" \ + "boot.cmd fat 0 1;" \ + "exynos5422-odroidxu3.dtb fat 0 1;" \ + "exynos5422-odroidxu3-lite.dtb fat 0 1;" \ + "exynos5422-odroidxu4.dtb fat 0 1;" \ + ""PARTS_BOOT" part 0 1;" \ + ""PARTS_ROOT" part 0 2;" \ + ""PARTS_DATA" part 0 3;" \ + ""PARTS_USER" part 0 5;" \ + ""PARTS_MODULES" part 0 6;" \ + ""PARTS_RAMDISK" part 0 7\0"\ #define CONFIG_DFU_ALT_BOOT_EMMC \ "u-boot raw 0x3e 0x800 mmcpart 1;" \ @@ -135,10 +153,13 @@ "mmcbootpart=1\0" \ "mmcrootdev=0\0" \ "mmcrootpart=2\0" \ + "ramdiskpart=7\0"\ + "ramdisksize=800000\0"\ "dfu_usb_con=0\0" \ "dfu_interface=mmc\0" \ "dfu_device=" __stringify(CONFIG_MMC_DEFAULT_DEV) "\0" \ - "dfu_alt_system="CONFIG_DFU_ALT_SYSTEM \ + "dfu_alt_system="CONFIG_DFU_ALT_SYSTEM \ + "dfu_alt_system_2="CONFIG_DFU_ALT_SYSTEM_2 \ "dfu_alt_info=Autoset by THOR/DFU command run.\0" \ "bootclone=" \ "echo ' 'Bootloader clone from SD to eMMC.;" \ diff --git a/include/samsung/platform_boot.h b/include/samsung/platform_boot.h index 996b80c856..d61593a4a9 100644 --- a/include/samsung/platform_boot.h +++ b/include/samsung/platform_boot.h @@ -34,6 +34,11 @@ "setenv initrdname ramdisk.img;" \ "load mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} " \ "${initrdname};" \ + "elif test -e mmc ${mmcbootdev}:${ramdiskpart} sbin/init; then " \ + "setenv initrdname ramdisk.img;" \ + "part start mmc ${mmcbootdev} ${ramdiskpart} ramdisk_start; " \ + "part size mmc ${mmcbootdev} ${ramdiskpart} ramdisk_size; " \ + "mmc read ${initrdaddr} ${ramdisk_start} ${ramdisk_size}; " \ "else " \ "load mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} " \ "${initrdname};" \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 093e432efc..a3dae6d287 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -299,6 +299,7 @@ CONFIG_DFU_ALT CONFIG_DFU_ALT_BOOT_EMMC CONFIG_DFU_ALT_BOOT_SD CONFIG_DFU_ALT_SYSTEM +CONFIG_DFU_ALT_SYSTEM_2 CONFIG_DFU_ENV_SETTINGS CONFIG_DHCP_MIN_EXT_LEN CONFIG_DIALOG_POWER