artik530: set CONFIG_OF_SEPARATE=y

Now that the FDT corruption issue has been resolved, we can use
CONFIG_OF_SEPARATE=y, instead of CONFIG_OF_EMBED. By separating the FDT
from U-BOOT binary, we will be able to create bootloader binaries which
contains customer-specific public key without rebuilding them.

With this commit, U-BOOT expects that its binary image is followed by a
valid FDT. Thus, u-boot.bin alone will not work and u-boot-dtb.bin
should be used instead.

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

diff --git a/README.md b/README.md
index f058997f3dd9ea9005efbcc41d53def42e00776d..b622fa030cb1f7a193158c476b101a3ccdc1f11f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -95,7 +95,7 @@ a fip image and boot image for nexell bl1.
 ```
 [ -e u-boot-dtb.bin ] && UBOOT=u-boot-dtb.bin || UBOOT=u-boot.bin
 tools/fip_create/fip_create \
-       --dump --bl33 $(UBOOT) \
+       --dump --bl33 $UBOOT \
        fip-nonsecure.bin
 ```
 - generate a fip-nonsecure.img using SECURE_BINGEN tool(input: fip-nonsecure.bin, output: fip-nonsecure.img)
@@ -110,11 +110,13 @@ 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 u-boot.bin \
+       -i $UBOOT \
        -o bootloader.img \
        -l 0x94c00000 -e 0x94c00000
 ```

diff --git a/configs/artik530_raptor_defconfig b/configs/artik530_raptor_defconfig
index 3929882a92ef7e1acff714c1c56c19f5e275cfda..829d71a9ec1caa5d2984fd2075787b664fcbf38e 100644 (file)
--- a/configs/artik530_raptor_defconfig
+++ b/configs/artik530_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