* [U-Boot] [PATCH] SPL: add support to boot from a partition type
@ 2017-01-28 23:20 Dalon Westergreen
2017-01-29 0:06 ` Tom Rini
0 siblings, 1 reply; 5+ messages in thread
From: Dalon Westergreen @ 2017-01-28 23:20 UTC (permalink / raw)
To: u-boot
From: Dalon Westergreen <dalon.westergreen@intel.com>
the socfpga bootrom supports mmc booting from either a raw image
starting at 0x0, or from a partition of type 0xa2. This patch
adds support for locating the boot image in the first type 0xa2
partition found.
Signed-off-by: Dalon Westergreen <dalon.westergreen@intel.com>
---
common/spl/Kconfig | 17 +++++++++++++++++
common/spl/spl_mmc.c | 45 ++++++++++++++++++++++++++++++++++++++++++++-
disk/part_dos.c | 1 +
include/part.h | 1 +
4 files changed, 63 insertions(+), 1 deletion(-)
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index b1aa148..a0430ec 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -97,6 +97,23 @@ config SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR
Address on the MMC to load U-Boot from, when the MMC is being used
in raw mode. Units: MMC sectors (1 sector = 512 bytes).
+config SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE
+ bool "MMC raw mode: by partition type"
+ depends on SPL
+ default y if ARCH_SOCFPGA
+ help
+ Use partition type for specifying U-Boot partition on MMC/SD in
+ raw mode. U-Boot will be loaded from the first partition of this
+ type to be found.
+
+config SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE
+ hex "Partition Type on the MMC to load U-Boot from"
+ depends on SPL && SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE
+ default 0xa2 if ARCH_SOCFPGA
+ help
+ Partition Type on the MMC to load U-Boot from, when the MMC is being
+ used in raw mode.
+
config TPL
bool
depends on SPL && SUPPORT_TPL
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index 0cd355c..9dd3172 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -181,6 +181,42 @@ static int mmc_load_image_raw_partition(struct spl_image_info *spl_image,
}
#endif
+#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE
+#define MAX_SEARCH_PARTITIONS 4
+static int mmc_load_image_raw_partition_type(struct spl_image_info *spl_image,
+ struct mmc *mmc, int partition_type)
+{
+ disk_partition_t info;
+ int ret;
+ int p;
+
+ /*
+ * Find the first partition of type partition_id
+ */
+ for (p = 1; p <= MAX_SEARCH_PARTITIONS; p++) {
+ ret = part_get_info(mmc_get_blk_desc(mmc), p, &info);
+ if(ret)
+ continue;
+ if(info.sys_ind == partition_type) {
+ break;
+ }
+ }
+#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
+ return mmc_load_image_raw_sector(spl_image, mmc,
+ info.start + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR);
+#else
+ return mmc_load_image_raw_sector(spl_image, mmc, info.start);
+#endif
+}
+#else
+#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE -1
+static int mmc_load_image_raw_partition_type(struct spl_image_info *spl_image,
+ struct mmc *mmc, int partition_type)
+{
+ return -ENOSYS;
+}
+#endif
+
#ifdef CONFIG_SPL_OS_BOOT
static int mmc_load_image_raw_os(struct spl_image_info *spl_image,
struct mmc *mmc)
@@ -331,12 +367,19 @@ int spl_mmc_load_image(struct spl_image_info *spl_image,
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION);
if (!err)
return err;
+
+#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE
+ err = mmc_load_image_raw_partition_type(spl_image, mmc,
+ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE);
+ if (!err)
+ return err;
+#endif
#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
err = mmc_load_image_raw_sector(spl_image, mmc,
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR);
if (!err)
return err;
-#endif
+#endif
/* If RAW mode fails, try FS mode. */
case MMCSD_MODE_FS:
debug("spl: mmc boot mode: fs\n");
diff --git a/disk/part_dos.c b/disk/part_dos.c
index ed78334..f485f11 100644
--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@@ -217,6 +217,7 @@ static int part_get_info_extended(struct blk_desc *dev_desc,
#ifdef CONFIG_PARTITION_UUIDS
sprintf(info->uuid, "%08x-%02x", disksig, part_num);
#endif
+ info->sys_ind = pt->sys_ind;
return 0;
}
diff --git a/include/part.h b/include/part.h
index 0979005..a58b687 100644
--- a/include/part.h
+++ b/include/part.h
@@ -59,6 +59,7 @@ typedef struct disk_partition {
#ifdef CONFIG_PARTITION_TYPE_GUID
char type_guid[37]; /* type GUID as string, if exists */
#endif
+ uchar sys_ind; /* partition type */
} disk_partition_t;
/* Misc _get_dev functions */
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] SPL: add support to boot from a partition type
2017-01-28 23:20 [U-Boot] [PATCH] SPL: add support to boot from a partition type Dalon Westergreen
@ 2017-01-29 0:06 ` Tom Rini
2017-01-29 1:59 ` Westergreen, Dalon
0 siblings, 1 reply; 5+ messages in thread
From: Tom Rini @ 2017-01-29 0:06 UTC (permalink / raw)
To: u-boot
On Sat, Jan 28, 2017 at 03:20:09PM -0800, Dalon Westergreen wrote:
> From: Dalon Westergreen <dalon.westergreen@intel.com>
>
> the socfpga bootrom supports mmc booting from either a raw image
> starting at 0x0, or from a partition of type 0xa2. This patch
> adds support for locating the boot image in the first type 0xa2
> partition found.
>
> Signed-off-by: Dalon Westergreen <dalon.westergreen@intel.com>
> ---
> common/spl/Kconfig | 17 +++++++++++++++++
> common/spl/spl_mmc.c | 45 ++++++++++++++++++++++++++++++++++++++++++++-
> disk/part_dos.c | 1 +
> include/part.h | 1 +
> 4 files changed, 63 insertions(+), 1 deletion(-)
Today socfpga sets SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION to 1. Do you
really have enough cases where the special partition isn't going to be
likely known when building U-Boot for a given platform?
The code itself looks fine (I don't see an easy way to get at the
max_entries field of the partition type struct, but assuming that the
ROM only support MBR tables today you could use the DOS_ENTRY_NUMBERS
constant with a comment above it). But we're making this bit of code
even more complex and adding more #ifdefs.
[snip]
> @@ -331,12 +367,19 @@ int spl_mmc_load_image(struct spl_image_info *spl_image,
> CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION);
> if (!err)
> return err;
> +
> +#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE
> + err = mmc_load_image_raw_partition_type(spl_image, mmc,
> + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE);
> + if (!err)
> + return err;
> +#endif
... but couldn't we re-structure things so that both of the "boot from a
partition" options take the same point from spl_mmc_load_image() instead
set a partition variable depending on static/dynamic partition # being
used? Or would that make things even messier looking? Thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170128/0ea9879a/attachment.sig>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] SPL: add support to boot from a partition type
2017-01-29 0:06 ` Tom Rini
@ 2017-01-29 1:59 ` Westergreen, Dalon
2017-01-29 2:05 ` Tom Rini
0 siblings, 1 reply; 5+ messages in thread
From: Westergreen, Dalon @ 2017-01-29 1:59 UTC (permalink / raw)
To: u-boot
On Sat, 2017-01-28 at 19:06 -0500, Tom Rini wrote:
> On Sat, Jan 28, 2017 at 03:20:09PM -0800, Dalon Westergreen wrote:
>
> >
> > From: Dalon Westergreen <dalon.westergreen@intel.com>
> >
> > the socfpga bootrom supports mmc booting from either a raw image
> > starting at 0x0, or from a partition of type 0xa2.??This patch
> > adds support for locating the boot image in the first type 0xa2
> > partition found.
> >
> > Signed-off-by: Dalon Westergreen <dalon.westergreen@intel.com>
> > ---
> > ?common/spl/Kconfig???| 17 +++++++++++++++++
> > ?common/spl/spl_mmc.c | 45 ++++++++++++++++++++++++++++++++++++++++++++-
> > ?disk/part_dos.c??????|??1 +
> > ?include/part.h???????|??1 +
> > ?4 files changed, 63 insertions(+), 1 deletion(-)
>
> Today socfpga sets SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION to 1.??Do you
> really have enough cases where the special partition isn't going to be
> likely known when building U-Boot for a given platform?
All of our kits actually ship with the third partition being the 0xa2
partition. ?Normally the 1 partition is the fat partition. ?I want to
support the case where the 0xa2 partition is arbitrary and used only for
the SPL. ?the 1 partition is a fat partition with the full u-boot image.
>
> The code itself looks fine (I don't see an easy way to get at the
> max_entries field of the partition type struct, but assuming that the
> ROM only support MBR tables today you could use the DOS_ENTRY_NUMBERS
> constant with a comment above it).??But we're making this bit of code
> even more complex and adding more #ifdefs.
>
> [snip]
> >
> > @@ -331,12 +367,19 @@ int spl_mmc_load_image(struct spl_image_info
> > *spl_image,
> > ? CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION);
> > ? if (!err)
> > ? return err;
> > +
> > +#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE
> > + err = mmc_load_image_raw_partition_type(spl_image, mmc,
> > + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE);
> > + if (!err)
> > + return err;
> > +#endif
>
> ... but couldn't we re-structure things so that both of the "boot from a
> partition" options take the same point from spl_mmc_load_image() instead
> set a partition variable depending on static/dynamic partition # being
> used???Or would that make things even messier looking???Thanks!
>
yes, i like this. ?seems cleaner.
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] SPL: add support to boot from a partition type
2017-01-29 1:59 ` Westergreen, Dalon
@ 2017-01-29 2:05 ` Tom Rini
2017-01-29 2:14 ` Westergreen, Dalon
0 siblings, 1 reply; 5+ messages in thread
From: Tom Rini @ 2017-01-29 2:05 UTC (permalink / raw)
To: u-boot
On Sun, Jan 29, 2017 at 01:59:17AM +0000, Westergreen, Dalon wrote:
> On Sat, 2017-01-28 at 19:06 -0500, Tom Rini wrote:
> > On Sat, Jan 28, 2017 at 03:20:09PM -0800, Dalon Westergreen wrote:
> >
> > >
> > > From: Dalon Westergreen <dalon.westergreen@intel.com>
> > >
> > > the socfpga bootrom supports mmc booting from either a raw image
> > > starting at 0x0, or from a partition of type 0xa2.??This patch
> > > adds support for locating the boot image in the first type 0xa2
> > > partition found.
> > >
> > > Signed-off-by: Dalon Westergreen <dalon.westergreen@intel.com>
> > > ---
> > > ?common/spl/Kconfig???| 17 +++++++++++++++++
> > > ?common/spl/spl_mmc.c | 45 ++++++++++++++++++++++++++++++++++++++++++++-
> > > ?disk/part_dos.c??????|??1 +
> > > ?include/part.h???????|??1 +
> > > ?4 files changed, 63 insertions(+), 1 deletion(-)
> >
> > Today socfpga sets SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION to 1.??Do you
> > really have enough cases where the special partition isn't going to be
> > likely known when building U-Boot for a given platform?
> All of our kits actually ship with the third partition being the 0xa2
> partition. ?Normally the 1 partition is the fat partition. ?I want to
> support the case where the 0xa2 partition is arbitrary and used only for
> the SPL. ?the 1 partition is a fat partition with the full u-boot image.
Er, this code is where we determine where to load U-Boot from, SPL is
running. So if I follow you, the bootrom would load SPL from the
partition with 0xa2 as the type, usually #3 and then we load U-Boot from
the FAT partition (which would be SPL_FS_LOAD_PAYLOAD_NAME and such) ?
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170128/a8059bb0/attachment.sig>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] SPL: add support to boot from a partition type
2017-01-29 2:05 ` Tom Rini
@ 2017-01-29 2:14 ` Westergreen, Dalon
0 siblings, 0 replies; 5+ messages in thread
From: Westergreen, Dalon @ 2017-01-29 2:14 UTC (permalink / raw)
To: u-boot
On Sat, 2017-01-28 at 21:05 -0500, Tom Rini wrote:
> On Sun, Jan 29, 2017 at 01:59:17AM +0000, Westergreen, Dalon wrote:
> >
> > On Sat, 2017-01-28 at 19:06 -0500, Tom Rini wrote:
> > >
> > > On Sat, Jan 28, 2017 at 03:20:09PM -0800, Dalon Westergreen wrote:
> > >
> > > >
> > > >
> > > > From: Dalon Westergreen <dalon.westergreen@intel.com>
> > > >
> > > > the socfpga bootrom supports mmc booting from either a raw image
> > > > starting at 0x0, or from a partition of type 0xa2.??This patch
> > > > adds support for locating the boot image in the first type 0xa2
> > > > partition found.
> > > >
> > > > Signed-off-by: Dalon Westergreen <dalon.westergreen@intel.com>
> > > > ---
> > > > ?common/spl/Kconfig???| 17 +++++++++++++++++
> > > > ?common/spl/spl_mmc.c | 45 ++++++++++++++++++++++++++++++++++++++++++++-
> > > > ?disk/part_dos.c??????|??1 +
> > > > ?include/part.h???????|??1 +
> > > > ?4 files changed, 63 insertions(+), 1 deletion(-)
> > >
> > > Today socfpga sets SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION to 1.??Do you
> > > really have enough cases where the special partition isn't going to be
> > > likely known when building U-Boot for a given platform?
> > All of our kits actually ship with the third partition being the 0xa2
> > partition. ?Normally the 1 partition is the fat partition. ?I want to
> > support the case where the 0xa2 partition is arbitrary and used only for
> > the SPL. ?the 1 partition is a fat partition with the full u-boot image.
>
> Er, this code is where we determine where to load U-Boot from, SPL is
> running.??So if I follow you, the bootrom would load SPL from the
> partition with 0xa2 as the type, usually #3 and then we load U-Boot from
> the FAT partition (which would be SPL_FS_LOAD_PAYLOAD_NAME and such) ?
>
yes, or if FAT isn't enabled, the spl would load the image in the 0xa2
partition or the?CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION offset by
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR. ?Both are reasonable and?
supported. ?my current thought is if partition = -1 and?
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE is set then search
for the a2 partition. ?work for you?
--dalon
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-01-29 2:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-28 23:20 [U-Boot] [PATCH] SPL: add support to boot from a partition type Dalon Westergreen
2017-01-29 0:06 ` Tom Rini
2017-01-29 1:59 ` Westergreen, Dalon
2017-01-29 2:05 ` Tom Rini
2017-01-29 2:14 ` Westergreen, Dalon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox