* [U-Boot] [PATCH 1/2] common: Makefile: allow for spl builds with env_fat
@ 2014-09-23 15:44 Felipe Balbi
2014-09-23 15:44 ` [U-Boot] [PATCH 2/2] arm: am43xx: switch over to CONFIG_ENV_IS_IN_FAT Felipe Balbi
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Felipe Balbi @ 2014-09-23 15:44 UTC (permalink / raw)
To: u-boot
If CONFIG_SPL_BUILD and CONFIG_ENV_IS_IN_FAT are
defined, u-boot spl will fail to build. Fix that.
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
common/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/Makefile b/common/Makefile
index aca0f7f..1ff7ce0 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -233,6 +233,7 @@ obj-$(CONFIG_SPL_ENV_SUPPORT) += env_flags.o
obj-$(CONFIG_SPL_ENV_SUPPORT) += env_callback.o
obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
obj-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o
+obj-$(CONFIG_ENV_IS_IN_FAT) += env_fat.o
obj-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o
obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
--
2.1.1.273.g97b8860
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 2/2] arm: am43xx: switch over to CONFIG_ENV_IS_IN_FAT
2014-09-23 15:44 [U-Boot] [PATCH 1/2] common: Makefile: allow for spl builds with env_fat Felipe Balbi
@ 2014-09-23 15:44 ` Felipe Balbi
2014-09-26 0:38 ` Felipe Balbi
2014-10-23 17:16 ` [U-Boot] [U-Boot, " Tom Rini
2014-09-26 0:38 ` [U-Boot] [PATCH 1/2] common: Makefile: allow for spl builds with env_fat Felipe Balbi
2014-10-23 17:16 ` [U-Boot] [U-Boot, " Tom Rini
2 siblings, 2 replies; 8+ messages in thread
From: Felipe Balbi @ 2014-09-23 15:44 UTC (permalink / raw)
To: u-boot
By using CONFIG_ENV_IS_IN_FAT it's far easier
to have a private, minimal environment for e.g.
booting off of network or mounting rootfs on NFS
without having to modify the configuration header.
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
include/configs/am43xx_evm.h | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 0707827..4472c3e 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -11,6 +11,9 @@
#define CONFIG_AM43XX
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_SAVEENV
+
#define CONFIG_BOARD_LATE_INIT
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_SYS_CACHELINE_SIZE 32
@@ -82,7 +85,11 @@
/* NS16550 Configuration */
#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */
-#define CONFIG_ENV_IS_NOWHERE
+#define CONFIG_ENV_IS_IN_FAT
+#define FAT_ENV_INTERFACE "mmc"
+#define FAT_ENV_DEVICE_AND_PART "0:1"
+#define FAT_ENV_FILE "uboot.env"
+#define CONFIG_FAT_WRITE
#define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
@@ -103,7 +110,7 @@
#ifdef CONFIG_QSPI_BOOT
#define CONFIG_SYS_TEXT_BASE 0x30000000
-#undef CONFIG_ENV_IS_NOWHERE
+#undef CONFIG_ENV_IS_IN_FAT
#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
--
2.1.1.273.g97b8860
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 1/2] common: Makefile: allow for spl builds with env_fat
2014-09-23 15:44 [U-Boot] [PATCH 1/2] common: Makefile: allow for spl builds with env_fat Felipe Balbi
2014-09-23 15:44 ` [U-Boot] [PATCH 2/2] arm: am43xx: switch over to CONFIG_ENV_IS_IN_FAT Felipe Balbi
@ 2014-09-26 0:38 ` Felipe Balbi
2014-10-03 20:48 ` Felipe Balbi
2014-10-23 17:16 ` [U-Boot] [U-Boot, " Tom Rini
2 siblings, 1 reply; 8+ messages in thread
From: Felipe Balbi @ 2014-09-26 0:38 UTC (permalink / raw)
To: u-boot
On Tue, Sep 23, 2014 at 10:44:17AM -0500, Felipe Balbi wrote:
> If CONFIG_SPL_BUILD and CONFIG_ENV_IS_IN_FAT are
> defined, u-boot spl will fail to build. Fix that.
>
> Signed-off-by: Felipe Balbi <balbi@ti.com>
ping
> ---
> common/Makefile | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/common/Makefile b/common/Makefile
> index aca0f7f..1ff7ce0 100644
> --- a/common/Makefile
> +++ b/common/Makefile
> @@ -233,6 +233,7 @@ obj-$(CONFIG_SPL_ENV_SUPPORT) += env_flags.o
> obj-$(CONFIG_SPL_ENV_SUPPORT) += env_callback.o
> obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
> obj-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o
> +obj-$(CONFIG_ENV_IS_IN_FAT) += env_fat.o
> obj-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
> obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o
> obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
> --
> 2.1.1.273.g97b8860
>
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140925/9c6e2a4a/attachment.pgp>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 2/2] arm: am43xx: switch over to CONFIG_ENV_IS_IN_FAT
2014-09-23 15:44 ` [U-Boot] [PATCH 2/2] arm: am43xx: switch over to CONFIG_ENV_IS_IN_FAT Felipe Balbi
@ 2014-09-26 0:38 ` Felipe Balbi
2014-10-23 17:16 ` [U-Boot] [U-Boot, " Tom Rini
1 sibling, 0 replies; 8+ messages in thread
From: Felipe Balbi @ 2014-09-26 0:38 UTC (permalink / raw)
To: u-boot
On Tue, Sep 23, 2014 at 10:44:18AM -0500, Felipe Balbi wrote:
> By using CONFIG_ENV_IS_IN_FAT it's far easier
> to have a private, minimal environment for e.g.
> booting off of network or mounting rootfs on NFS
> without having to modify the configuration header.
>
> Signed-off-by: Felipe Balbi <balbi@ti.com>
ping
> ---
> include/configs/am43xx_evm.h | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
> index 0707827..4472c3e 100644
> --- a/include/configs/am43xx_evm.h
> +++ b/include/configs/am43xx_evm.h
> @@ -11,6 +11,9 @@
>
> #define CONFIG_AM43XX
>
> +#define CONFIG_CMD_FAT
> +#define CONFIG_CMD_SAVEENV
> +
> #define CONFIG_BOARD_LATE_INIT
> #define CONFIG_ARCH_CPU_INIT
> #define CONFIG_SYS_CACHELINE_SIZE 32
> @@ -82,7 +85,11 @@
> /* NS16550 Configuration */
> #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */
>
> -#define CONFIG_ENV_IS_NOWHERE
> +#define CONFIG_ENV_IS_IN_FAT
> +#define FAT_ENV_INTERFACE "mmc"
> +#define FAT_ENV_DEVICE_AND_PART "0:1"
> +#define FAT_ENV_FILE "uboot.env"
> +#define CONFIG_FAT_WRITE
>
> #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
>
> @@ -103,7 +110,7 @@
>
> #ifdef CONFIG_QSPI_BOOT
> #define CONFIG_SYS_TEXT_BASE 0x30000000
> -#undef CONFIG_ENV_IS_NOWHERE
> +#undef CONFIG_ENV_IS_IN_FAT
> #define CONFIG_ENV_IS_IN_SPI_FLASH
> #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
> #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
> --
> 2.1.1.273.g97b8860
>
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140925/09afc008/attachment.pgp>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 1/2] common: Makefile: allow for spl builds with env_fat
2014-09-26 0:38 ` [U-Boot] [PATCH 1/2] common: Makefile: allow for spl builds with env_fat Felipe Balbi
@ 2014-10-03 20:48 ` Felipe Balbi
2014-10-04 15:50 ` Tom Rini
0 siblings, 1 reply; 8+ messages in thread
From: Felipe Balbi @ 2014-10-03 20:48 UTC (permalink / raw)
To: u-boot
On Thu, Sep 25, 2014 at 07:38:26PM -0500, Felipe Balbi wrote:
> On Tue, Sep 23, 2014 at 10:44:17AM -0500, Felipe Balbi wrote:
> > If CONFIG_SPL_BUILD and CONFIG_ENV_IS_IN_FAT are
> > defined, u-boot spl will fail to build. Fix that.
> >
> > Signed-off-by: Felipe Balbi <balbi@ti.com>
>
> ping
ping here
--
balbi
-------------- 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/20141003/36fa6ea3/attachment.pgp>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 1/2] common: Makefile: allow for spl builds with env_fat
2014-10-03 20:48 ` Felipe Balbi
@ 2014-10-04 15:50 ` Tom Rini
0 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2014-10-04 15:50 UTC (permalink / raw)
To: u-boot
On Fri, Oct 03, 2014 at 03:48:35PM -0500, Felipe Balbi wrote:
> On Thu, Sep 25, 2014 at 07:38:26PM -0500, Felipe Balbi wrote:
> > On Tue, Sep 23, 2014 at 10:44:17AM -0500, Felipe Balbi wrote:
> > > If CONFIG_SPL_BUILD and CONFIG_ENV_IS_IN_FAT are
> > > defined, u-boot spl will fail to build. Fix that.
> > >
> > > Signed-off-by: Felipe Balbi <balbi@ti.com>
> >
> > ping
>
> ping here
Looks fine, will take it for the next merge window.
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141004/4cd6439a/attachment.pgp>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [U-Boot, 1/2] common: Makefile: allow for spl builds with env_fat
2014-09-23 15:44 [U-Boot] [PATCH 1/2] common: Makefile: allow for spl builds with env_fat Felipe Balbi
2014-09-23 15:44 ` [U-Boot] [PATCH 2/2] arm: am43xx: switch over to CONFIG_ENV_IS_IN_FAT Felipe Balbi
2014-09-26 0:38 ` [U-Boot] [PATCH 1/2] common: Makefile: allow for spl builds with env_fat Felipe Balbi
@ 2014-10-23 17:16 ` Tom Rini
2 siblings, 0 replies; 8+ messages in thread
From: Tom Rini @ 2014-10-23 17:16 UTC (permalink / raw)
To: u-boot
On Tue, Sep 23, 2014 at 10:44:17AM -0500, Felipe Balbi wrote:
> If CONFIG_SPL_BUILD and CONFIG_ENV_IS_IN_FAT are
> defined, u-boot spl will fail to build. Fix that.
>
> Signed-off-by: Felipe Balbi <balbi@ti.com>
Applied to u-boot-ti/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141023/468e712f/attachment.pgp>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [U-Boot, 2/2] arm: am43xx: switch over to CONFIG_ENV_IS_IN_FAT
2014-09-23 15:44 ` [U-Boot] [PATCH 2/2] arm: am43xx: switch over to CONFIG_ENV_IS_IN_FAT Felipe Balbi
2014-09-26 0:38 ` Felipe Balbi
@ 2014-10-23 17:16 ` Tom Rini
1 sibling, 0 replies; 8+ messages in thread
From: Tom Rini @ 2014-10-23 17:16 UTC (permalink / raw)
To: u-boot
On Tue, Sep 23, 2014 at 10:44:18AM -0500, Felipe Balbi wrote:
> By using CONFIG_ENV_IS_IN_FAT it's far easier
> to have a private, minimal environment for e.g.
> booting off of network or mounting rootfs on NFS
> without having to modify the configuration header.
>
> Signed-off-by: Felipe Balbi <balbi@ti.com>
Applied to u-boot-ti/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141023/ad46b8bb/attachment.pgp>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-10-23 17:16 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-23 15:44 [U-Boot] [PATCH 1/2] common: Makefile: allow for spl builds with env_fat Felipe Balbi
2014-09-23 15:44 ` [U-Boot] [PATCH 2/2] arm: am43xx: switch over to CONFIG_ENV_IS_IN_FAT Felipe Balbi
2014-09-26 0:38 ` Felipe Balbi
2014-10-23 17:16 ` [U-Boot] [U-Boot, " Tom Rini
2014-09-26 0:38 ` [U-Boot] [PATCH 1/2] common: Makefile: allow for spl builds with env_fat Felipe Balbi
2014-10-03 20:48 ` Felipe Balbi
2014-10-04 15:50 ` Tom Rini
2014-10-23 17:16 ` [U-Boot] [U-Boot, " Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox