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 b622fa030cb1f7a193158c476b101a3ccdc1f11f..aaa3d566823f49bf2c6dc4ed30f6d459a8528666 100644 (file)
--- 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 15e67908be0f8d99ef14b1210b6f28f8c1ca7dfa..318a470eead52d86c020c9e78bb8d8e7dfe23129 100644 (file)
--- 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 6f684a70e5c8f84ed40236a660860e1dee434c88..c4b8488614a4dcff083d7b9feea72ac50063812e 100644 (file)
--- 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 bb6850522ab750fe8e14e2418d8b7e188fd68577..514452aa8ee99812d4ddc68753eb4ff0cdef2e3e 100644 (file)
--- 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