samsung: tizen_bpif3: store environment on the first 'boot' partition

Get rid of special partition for storing environment and read it from
boot (4th) FAT partition from uboot.env file, like on the other Tizen
boards.

This requires an update of sd_fusing.py to skip creating 'env' partition
and make boot partition the 4th one.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I980a7e061405629a018913281110ff068ac0b0f5

diff --git a/board/spacemit/k1-x/k1x.c b/board/spacemit/k1-x/k1x.c
index 4e9d697bbb57b8a43d5ade9923102a861fbe6e18..502ce6b33a04963f224a033bdf2de5d757c4d538 100644 (file)
--- a/board/spacemit/k1-x/k1x.c
+++ b/board/spacemit/k1-x/k1x.c
@@ -877,6 +877,7 @@ void *board_fdt_blob_setup(int *err)
        return (ulong *)&_end;
 }
 
+#ifndef CONFIG_TIZEN_K1_X
 enum env_location env_get_location(enum env_operation op, int prio)
 {
        if (prio >= 1)
@@ -909,6 +910,7 @@ enum env_location env_get_location(enum env_operation op, int prio)
 #endif
        }
 }
+#endif
 
 int misc_init_r(void)
 {

diff --git a/configs/tizen_bpif3_defconfig b/configs/tizen_bpif3_defconfig
index 2d550691e72e51a41ad7d0e0f3384549d339f3f1..2382442faeaf9a0101120856c2ecada93fb3b806 100644 (file)
--- a/configs/tizen_bpif3_defconfig
+++ b/configs/tizen_bpif3_defconfig
@@ -3,7 +3,6 @@ CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_SYS_MALLOC_LEN=0x1000000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_ENV_SIZE=0x4000
-CONFIG_ENV_OFFSET=0x60000
 CONFIG_DM_GPIO=y
 CONFIG_SPL_DM_SPI=y
 CONFIG_DEFAULT_DEVICE_TREE="k1-x_spl"
@@ -117,7 +116,7 @@ CONFIG_ENABLE_SET_NUM_PART_SEARCH=y
 CONFIG_PARTITION_TYPE_GUID=y
 CONFIG_MULTI_DTB_FIT=y
 CONFIG_ENV_IS_IN_FAT=y
-CONFIG_ENV_IS_IN_MMC=y
+CONFIG_ENV_FAT_DEVICE_AND_PART="0:4"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_SPL_ENV_IS_NOWHERE=y

diff --git a/packaging/u-boot-spacemit.spec b/packaging/u-boot-spacemit.spec
index b18b06b8da7a34292a0d2f8c3da20dd07e3c9a9e..3b3662455a3f33142dd2ff84eb954ae7df396c4c 100644 (file)
--- a/packaging/u-boot-spacemit.spec
+++ b/packaging/u-boot-spacemit.spec
@@ -68,7 +68,6 @@ mkdir -p %{buildroot}/boot
 mkdir -p %{buildroot}/var/tmp
 install -m 755 u-boot.itb %{buildroot}/var/tmp/
 install -m 755 FSBL.bin %{buildroot}/var/tmp/
-install -m 755 u-boot-env-default.bin %{buildroot}/var/tmp/
 install -m 755 bootinfo_sd.bin %{buildroot}/var/tmp/
 install -m 755 boot.scr.uimg %{buildroot}/boot/
 install -m 755 uboot.env %{buildroot}/boot/
@@ -80,7 +79,6 @@ install -m 755 uboot.env %{buildroot}/boot/
 %defattr(-,root,root,-)
 /var/tmp/u-boot.itb
 /var/tmp/FSBL.bin
-/var/tmp/u-boot-env-default.bin
 /var/tmp/bootinfo_sd.bin
 /boot/uboot.env
 /boot/boot.scr.uimg