From: Heesub Shin <heesub.shin@samsung.com>
Date: Wed, 18 Apr 2018 09:08:37 +0000 (+0900)
Subject: artik53x,artik305: make dtb separated from u-boot.bin
X-Git-Tag: submit/tizen/20190213.074817~96
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef6478295552bbdddd002ca32249b4a4483faa45;p=profile%2Fcommon%2Fplatform%2Fkernel%2Fu-boot-artik7.git

artik53x,artik305: make dtb separated from u-boot.bin

Now that the DTB corruption issue has been resolved, it is okay to use
CONFIG_OF_SEPARATE=y which is U-BOOT default. So, let's remove
CONFIG_OF_EMBED from all the remaining configurations.

README.md is also amended to reflect this change.

Change-Id: I46a7a5dd21f1ad7de3cdb33bcb0c92aec0719687
Signed-off-by: Heesub Shin <heesub.shin@samsung.com>
---

diff --git a/README.md b/README.md
index b622fa030c..aaa3d56682 100644
--- a/README.md
+++ b/README.md
@@ -86,16 +86,14 @@ tools/mkenvimage -s 16384 -o params.bin default_envs.txt
 ```
 
 ### 2.5 Generate fip/nexell compatable image
-The u-boot.bin (or u-boot-dtb.bin) cannot be loaded by bl1/bl2 bootloaders. You have to generate
+The u-boot-dtb.bin cannot be loaded by bl1/bl2 bootloaders. You have to generate
 a fip image and boot image for nexell bl1.
 
 #### ARTIK710
-- generate a fip-nonsecure.bin image using fip_create tool(input: u-boot.bin or u-boot-dtb.bin, output:fip-nonsecure.bin)
-- Please prefer to use u-boot-dtb.bin over u-boot.bin if it exists. It depends on the version of U-BOOT you are using.
+- generate a fip-nonsecure.bin image using fip_create tool(input: u-boot-dtb.bin, output:fip-nonsecure.bin)
 ```
-[ -e u-boot-dtb.bin ] && UBOOT=u-boot-dtb.bin || UBOOT=u-boot.bin
 tools/fip_create/fip_create \
-	--dump --bl33 $UBOOT \
+	--dump --bl33 u-boot-dtb.bin \
 	fip-nonsecure.bin
 ```
 - generate a fip-nonsecure.img using SECURE_BINGEN tool(input: fip-nonsecure.bin, output: fip-nonsecure.img)
@@ -110,13 +108,11 @@ tools/nexell/SECURE_BINGEN \
 
 #### ARTIK530
 - generate a bootloader.img using BOOT_BINGEN tool
-- Please prefer to use u-boot-dtb.bin if it exists.
 ```
-[ -e u-boot-dtb.bin ] && UBOOT=u-boot-dtb.bin || UBOOT=u-boot.bin
 tools/nexell/SECURE_BINGEN \
 	-c S5P4418 -t 3rdboot \
 	-n tools/nexell/nsih/raptor-sd.txt \
-	-i $UBOOT \
+	-i u-boot-dtb.bin \
 	-o bootloader.img \
 	-l 0x94c00000 -e 0x94c00000
 ```
diff --git a/configs/artik305_raptor_defconfig b/configs/artik305_raptor_defconfig
index 15e67908be..318a470eea 100644
--- a/configs/artik305_raptor_defconfig
+++ b/configs/artik305_raptor_defconfig
@@ -24,7 +24,6 @@ CONFIG_CMD_SD_RECOVERY=y
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_OF_CONTROL=y
-CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_NX_GPIO=y
diff --git a/configs/artik530_raptor_legacy_defconfig b/configs/artik530_raptor_legacy_defconfig
index 6f684a70e5..c4b8488614 100644
--- a/configs/artik530_raptor_legacy_defconfig
+++ b/configs/artik530_raptor_legacy_defconfig
@@ -23,7 +23,6 @@ CONFIG_CMD_SD_RECOVERY=y
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_OF_CONTROL=y
-CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_NX_GPIO=y
diff --git a/configs/artik533_raptor_defconfig b/configs/artik533_raptor_defconfig
index bb6850522a..514452aa8e 100644
--- a/configs/artik533_raptor_defconfig
+++ b/configs/artik533_raptor_defconfig
@@ -24,7 +24,6 @@ CONFIG_CMD_SD_RECOVERY=y
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
 CONFIG_OF_CONTROL=y
-CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_NX_GPIO=y