| Message ID | 1428958467-1589-7-git-send-email-sjoerd.simons@collabora.co.uk |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
On Monday, April 13, 2015 10:54:24 PM Sjoerd Simons wrote: > Define the common shared block environment for the host interface in > preperation for the sandbox build to use config_distro_bootcmd. > > Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> > Acked-by: Simon Glass <sjg@chromium.org> > Acked-by: Stephen Warren <swarren@nvidia.com> Acked-by : Dennis Gilmore <dennis@ausil.us> > --- > > Changes in v4: None > Changes in v3: None > Changes in v2: None > > include/config_distro_bootcmd.h | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/include/config_distro_bootcmd.h > b/include/config_distro_bootcmd.h index d71e58d..3a360ca4 100644 > --- a/include/config_distro_bootcmd.h > +++ b/include/config_distro_bootcmd.h > @@ -48,6 +48,18 @@ > #define BOOTENV_DEV_NAME_BLKDEV(devtypeu, devtypel, instance) \ > #devtypel #instance " " > > +#ifdef CONFIG_SANDBOX > +#define BOOTENV_SHARED_HOST BOOTENV_SHARED_BLKDEV(host) > +#define BOOTENV_DEV_HOST BOOTENV_DEV_BLKDEV > +#define BOOTENV_DEV_NAME_HOST BOOTENV_DEV_NAME_BLKDEV > +#else > +#define BOOTENV_SHARED_HOST > +#define BOOTENV_DEV_HOST \ > + BOOT_TARGET_DEVICES_references_HOST_without_CONFIG_SANDBOX > +#define BOOTENV_DEV_NAME_HOST \ > + BOOT_TARGET_DEVICES_references_HOST_without_CONFIG_SANDBOX > +#endif > + > #ifdef CONFIG_CMD_MMC > #define BOOTENV_SHARED_MMC BOOTENV_SHARED_BLKDEV(mmc) > #define BOOTENV_DEV_MMC BOOTENV_DEV_BLKDEV > @@ -167,6 +179,7 @@ > #define BOOTENV_DEV(devtypeu, devtypel, instance) \ > BOOTENV_DEV_##devtypeu(devtypeu, devtypel, instance) > #define BOOTENV \ > + BOOTENV_SHARED_HOST \ > BOOTENV_SHARED_MMC \ > BOOTENV_SHARED_USB \ > BOOTENV_SHARED_SATA \
On 13 April 2015 at 20:21, Dennis Gilmore <dennis@ausil.us> wrote: > On Monday, April 13, 2015 10:54:24 PM Sjoerd Simons wrote: >> Define the common shared block environment for the host interface in >> preperation for the sandbox build to use config_distro_bootcmd. >> >> Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> >> Acked-by: Simon Glass <sjg@chromium.org> >> Acked-by: Stephen Warren <swarren@nvidia.com> > Acked-by : Dennis Gilmore <dennis@ausil.us> > >> --- >> >> Changes in v4: None >> Changes in v3: None >> Changes in v2: None >> >> include/config_distro_bootcmd.h | 13 +++++++++++++ >> 1 file changed, 13 insertions(+) Applied to u-boot-x86/sandbox, thanks!
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index d71e58d..3a360ca4 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -48,6 +48,18 @@ #define BOOTENV_DEV_NAME_BLKDEV(devtypeu, devtypel, instance) \ #devtypel #instance " " +#ifdef CONFIG_SANDBOX +#define BOOTENV_SHARED_HOST BOOTENV_SHARED_BLKDEV(host) +#define BOOTENV_DEV_HOST BOOTENV_DEV_BLKDEV +#define BOOTENV_DEV_NAME_HOST BOOTENV_DEV_NAME_BLKDEV +#else +#define BOOTENV_SHARED_HOST +#define BOOTENV_DEV_HOST \ + BOOT_TARGET_DEVICES_references_HOST_without_CONFIG_SANDBOX +#define BOOTENV_DEV_NAME_HOST \ + BOOT_TARGET_DEVICES_references_HOST_without_CONFIG_SANDBOX +#endif + #ifdef CONFIG_CMD_MMC #define BOOTENV_SHARED_MMC BOOTENV_SHARED_BLKDEV(mmc) #define BOOTENV_DEV_MMC BOOTENV_DEV_BLKDEV @@ -167,6 +179,7 @@ #define BOOTENV_DEV(devtypeu, devtypel, instance) \ BOOTENV_DEV_##devtypeu(devtypeu, devtypel, instance) #define BOOTENV \ + BOOTENV_SHARED_HOST \ BOOTENV_SHARED_MMC \ BOOTENV_SHARED_USB \ BOOTENV_SHARED_SATA \