Skip to contentSkip to conversation

common: Makefile: allow for spl builds with env_fat

PATCH New Felipe Balbi 2 participants 8 messages Sep 23, 2014 – Oct 23, 2014

lore
Share & tools
lore

Felipe Balbi

author
#0 lore raw

PATCH 1/2 common: Makefile: allow for spl builds with env_fat

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 <[email protected]>
---
 common/Makefile | 1 +
 1 file changed, 1 insertion(+)
common/Makefile +1 -0
index aca0f7f..1ff7ce0 100644
@@ -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
Signature · 1 line
2.1.1.273.g97b8860
author
#1 lore raw

PATCH 1/2 common: Makefile: allow for spl builds with env_fat

Quoted 4 lines · Felipe Balbi

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 <[email protected]>

ping

Quoted 19 lines
---
 common/Makefile | 1 +
 1 file changed, 1 insertion(+)
common/Makefile +1 -0
index aca0f7f..1ff7ce0 100644
@@ -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
Signature · 1 line
2.1.1.273.g97b8860
Signature · 8 lines
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>
author
#2 lore raw

PATCH 1/2 common: Makefile: allow for spl builds with env_fat

Quoted 7 lines · Felipe Balbi
Quoted 4 lines · Felipe Balbi

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 <[email protected]>

ping

ping here

Signature · 8 lines
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>
#3 lore raw

PATCH 1/2 common: Makefile: allow for spl builds with env_fat

Quoted 10 lines · Felipe Balbi
Quoted 7 lines · Felipe Balbi
Quoted 4 lines · Felipe Balbi

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 <[email protected]>

ping

ping here

Looks fine, will take it for the next merge window.

Signature · 8 lines
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>
author
#4 lore raw

PATCH 2/2 arm: am43xx: switch over to CONFIG_ENV_IS_IN_FAT

In reply to Felipe Balbi

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 <[email protected]>
---
 include/configs/am43xx_evm.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
include/configs/am43xx_evm.h +9 -2
index 0707827..4472c3e 100644
@@ -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
Signature · 1 line
2.1.1.273.g97b8860
author
#5 lore raw

PATCH 2/2 arm: am43xx: switch over to CONFIG_ENV_IS_IN_FAT

Quoted 6 lines · Felipe Balbi

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 <[email protected]>

ping

Quoted 43 lines
---
 include/configs/am43xx_evm.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
include/configs/am43xx_evm.h +9 -2
index 0707827..4472c3e 100644
@@ -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
Signature · 1 line
2.1.1.273.g97b8860
Signature · 8 lines
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>
#6 lore raw

PATCH 2/2 arm: am43xx: switch over to CONFIG_ENV_IS_IN_FAT

In reply to Felipe Balbi
Quoted 6 lines · Felipe Balbi

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 <[email protected]>

Applied to u-boot-ti/master, thanks!

Signature · 8 lines
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>
#7 lore raw

PATCH 1/2 common: Makefile: allow for spl builds with env_fat

In reply to Felipe Balbi
Quoted 4 lines · Felipe Balbi

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 <[email protected]>

Applied to u-boot-ti/master, thanks!

Signature · 8 lines
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>