Message ID | 1472491575-30091-3-git-send-email-jacob2.chen@rock-chips.com |
---|---|
State | Changes Requested |
Delegated to: | Simon Glass |
Headers | show |
Hi, On 29 August 2016 at 11:26, Jacob Chen <jacob2.chen@rock-chips.com> wrote: > From: "jacob2.chen" <jacob2.chen@rock-chips.com> > > Below link contains documents about rockchip linux partitions. > http://rockchip.wikidot.com/partitions > Please add to the commit message some info about why this change is needed. Please can you update README.rockchip with this info and the link. Regards, Simon > Signed-off-by: jacob2.chen <jacob2.chen@rock-chips.com> > --- > > include/configs/kylin_rk3036.h | 25 +++++++++---------------- > include/configs/rk3288_common.h | 7 ++++++- > 2 files changed, 15 insertions(+), 17 deletions(-) > > diff --git a/include/configs/kylin_rk3036.h b/include/configs/kylin_rk3036.h > index e8ca76d..e08654b 100644 > --- a/include/configs/kylin_rk3036.h > +++ b/include/configs/kylin_rk3036.h > @@ -18,7 +18,6 @@ > #undef CONFIG_ENV_IS_NOWHERE > #define CONFIG_ENV_IS_IN_MMC > #define CONFIG_SYS_MMC_ENV_DEV 0 /* emmc */ > -#define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ > #define CONFIG_ENV_OFFSET (SZ_4M - SZ_64K) /* reserved area */ > #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) > #define CONFIG_SYS_REDUNDAND_ENVIRONMENT > @@ -28,25 +27,19 @@ > #define CONFIG_RANDOM_UUID > #define PARTS_DEFAULT \ > "uuid_disk=${uuid_gpt_disk};" \ > - "name=loader,start=32K,size=4000K,uuid=${uuid_gpt_loader};" \ > - "name=reserved,size=64K,uuid=${uuid_gpt_reserved};" \ > - "name=misc,size=4M,uuid=${uuid_gpt_misc};" \ > - "name=recovery,size=32M,uuid=${uuid_gpt_recovery};" \ > - "name=boot_a,size=32M,uuid=${uuid_gpt_boot_a};" \ > - "name=boot_b,size=32M,uuid=${uuid_gpt_boot_b};" \ > - "name=system_a,size=818M,uuid=${uuid_gpt_system_a};" \ > - "name=system_b,size=818M,uuid=${uuid_gpt_system_b};" \ > - "name=vendor_a,size=50M,uuid=${uuid_gpt_vendor_a};" \ > - "name=vendor_b,size=50M,uuid=${uuid_gpt_vendor_b};" \ > - "name=cache,size=100M,uuid=${uuid_gpt_cache};" \ > - "name=metadata,size=16M,uuid=${uuid_gpt_metadata};" \ > - "name=persist,size=4M,uuid=${uuid_gpt_persist};" \ > - "name=userdata,size=-,uuid=${uuid_gpt_userdata};\0" \ > + "name=loader1,start=32K,size=4000K,uuid=${uuid_gpt_loader1};" \ > + "name=reserved1,size=64K,uuid=${uuid_gpt_reserved1};" \ > + "name=reserved2,size=4M,uuid=${uuid_gpt_reserved2};" \ > + "name=loader2,size=4MB,uuid=${uuid_gpt_loader2};" \ > + "name=atf,size=4M,uuid=${uuid_gpt_atf};" \ > + "name=boot,size=128M,bootable,uuid=${uuid_gpt_boot};" \ > + "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \ > > #undef CONFIG_EXTRA_ENV_SETTINGS > #define CONFIG_EXTRA_ENV_SETTINGS \ > "partitions=" PARTS_DEFAULT \ > - > + ENV_MEM_LAYOUT_SETTINGS \ > + BOOTENV > #endif > > #define CONFIG_BOARD_LATE_INIT > diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h > index d3d4c68..cf5ab59 100644 > --- a/include/configs/rk3288_common.h > +++ b/include/configs/rk3288_common.h > @@ -120,7 +120,12 @@ > #define CONFIG_RANDOM_UUID > #define PARTS_DEFAULT \ > "uuid_disk=${uuid_gpt_disk};" \ > - "name=boot,start=8M,size=64M,bootable,uuid=${uuid_gpt_boot};" \ > + "name=loader1,start=32K,size=4000K,uuid=${uuid_gpt_loader1};" \ > + "name=reserved1,size=64K,uuid=${uuid_gpt_reserved1};" \ > + "name=reserved2,size=4M,uuid=${uuid_gpt_reserved2};" \ > + "name=loader2,size=4MB,uuid=${uuid_gpt_loader2};" \ > + "name=atf,size=4M,uuid=${uuid_gpt_atf};" \ > + "name=boot,size=128M,bootable,uuid=${uuid_gpt_boot};" \ > "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \ > > /* First try to boot from SD (index 0), then eMMC (index 1 */ > -- > 2.7.4 >
diff --git a/include/configs/kylin_rk3036.h b/include/configs/kylin_rk3036.h index e8ca76d..e08654b 100644 --- a/include/configs/kylin_rk3036.h +++ b/include/configs/kylin_rk3036.h @@ -18,7 +18,6 @@ #undef CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 /* emmc */ -#define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ #define CONFIG_ENV_OFFSET (SZ_4M - SZ_64K) /* reserved area */ #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) #define CONFIG_SYS_REDUNDAND_ENVIRONMENT @@ -28,25 +27,19 @@ #define CONFIG_RANDOM_UUID #define PARTS_DEFAULT \ "uuid_disk=${uuid_gpt_disk};" \ - "name=loader,start=32K,size=4000K,uuid=${uuid_gpt_loader};" \ - "name=reserved,size=64K,uuid=${uuid_gpt_reserved};" \ - "name=misc,size=4M,uuid=${uuid_gpt_misc};" \ - "name=recovery,size=32M,uuid=${uuid_gpt_recovery};" \ - "name=boot_a,size=32M,uuid=${uuid_gpt_boot_a};" \ - "name=boot_b,size=32M,uuid=${uuid_gpt_boot_b};" \ - "name=system_a,size=818M,uuid=${uuid_gpt_system_a};" \ - "name=system_b,size=818M,uuid=${uuid_gpt_system_b};" \ - "name=vendor_a,size=50M,uuid=${uuid_gpt_vendor_a};" \ - "name=vendor_b,size=50M,uuid=${uuid_gpt_vendor_b};" \ - "name=cache,size=100M,uuid=${uuid_gpt_cache};" \ - "name=metadata,size=16M,uuid=${uuid_gpt_metadata};" \ - "name=persist,size=4M,uuid=${uuid_gpt_persist};" \ - "name=userdata,size=-,uuid=${uuid_gpt_userdata};\0" \ + "name=loader1,start=32K,size=4000K,uuid=${uuid_gpt_loader1};" \ + "name=reserved1,size=64K,uuid=${uuid_gpt_reserved1};" \ + "name=reserved2,size=4M,uuid=${uuid_gpt_reserved2};" \ + "name=loader2,size=4MB,uuid=${uuid_gpt_loader2};" \ + "name=atf,size=4M,uuid=${uuid_gpt_atf};" \ + "name=boot,size=128M,bootable,uuid=${uuid_gpt_boot};" \ + "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \ #undef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \ "partitions=" PARTS_DEFAULT \ - + ENV_MEM_LAYOUT_SETTINGS \ + BOOTENV #endif #define CONFIG_BOARD_LATE_INIT diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index d3d4c68..cf5ab59 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -120,7 +120,12 @@ #define CONFIG_RANDOM_UUID #define PARTS_DEFAULT \ "uuid_disk=${uuid_gpt_disk};" \ - "name=boot,start=8M,size=64M,bootable,uuid=${uuid_gpt_boot};" \ + "name=loader1,start=32K,size=4000K,uuid=${uuid_gpt_loader1};" \ + "name=reserved1,size=64K,uuid=${uuid_gpt_reserved1};" \ + "name=reserved2,size=4M,uuid=${uuid_gpt_reserved2};" \ + "name=loader2,size=4MB,uuid=${uuid_gpt_loader2};" \ + "name=atf,size=4M,uuid=${uuid_gpt_atf};" \ + "name=boot,size=128M,bootable,uuid=${uuid_gpt_boot};" \ "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \ /* First try to boot from SD (index 0), then eMMC (index 1 */