Skip to contentSkip to conversation

uboot: qstrip BR2_TARGET_UBOOT_CUSTOM_DTS_PATH

PATCH New Michael Trimarchi 3 participants 5 messages Apr 7, 2017 – Apr 8, 2017

lore
Share & tools
lore

Michael Trimarchi

author
#0 lore raw

PATCH 1/2 uboot: qstrip BR2_TARGET_UBOOT_CUSTOM_DTS_PATH

We need to avoid failing of copy of custom dts using cp -f <> command. Just strip in the beginning as done for other configuration variable

Signed-off-by Michael Trimarchi <[email protected]>
---
 boot/uboot/uboot.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
boot/uboot/uboot.mk +3 -2
index 1d464d967..f0f39f3bd 100644
@@ -6,6 +6,7 @@
 
 UBOOT_VERSION = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION))
 UBOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))
+UBOOT_CUSTOM_DTS_PATH=$(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_DTS_PATH))
 
 UBOOT_LICENSE = GPL-2.0+
 UBOOT_LICENSE_FILES = Licenses/gpl-2.0.txt

@@ -195,8 +196,8 @@ endef
 endif # BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY
 
 define UBOOT_BUILD_CMDS
-	$(if $(BR2_TARGET_UBOOT_CUSTOM_DTS_PATH),
-		cp -f $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_DTS_PATH)) $(@D)/arch/$(UBOOT_ARCH)/dts/
+	$(if $(UBOOT_CUSTOM_DTS_PATH),
+		cp -f $(UBOOT_CUSTOM_DTS_PATH) $(@D)/arch/$(UBOOT_ARCH)/dts/
 	)
 	$(TARGET_CONFIGURE_OPTS) 	\
 		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) 		\
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH 2/2 beaglebone: increase size of ext4 more then 60MB

This is due to the fact that we removed auto-calculation of the ext4 filesystem size in
https://git.buildroot.org/buildroot/commit/?id=c6bca8cef0310bc649240b451989457ce94a8358,
and we default to 60 MB for the filesystem size, which is not enough for this demo

Signed-off-by Thomas Petazzoni <[email protected]>
Tested-by Michael Trimarchi <[email protected]>
---
 configs/beaglebone_qt5_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/beaglebone_qt5_defconfig +1 -0
index 78dc10973..cdf8b96c1 100644
@@ -26,6 +26,7 @@ BR2_PACKAGE_TI_SGX_KM=y
 BR2_PACKAGE_TI_SGX_UM=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_BLOCKS=126976
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
Signature · 1 line
2.11.0
#2 lore raw

PATCH 2/2 beaglebone: increase size of ext4 more then 60MB

Hello,

Quoted 8 lines · Michael Trimarchi

This is due to the fact that we removed auto-calculation of the ext4 filesystem size in
https://git.buildroot.org/buildroot/commit/?id=c6bca8cef0310bc649240b451989457ce94a8358,
and we default to 60 MB for the filesystem size, which is not enough for this demo

Signed-off-by Thomas Petazzoni <[email protected]>
Tested-by Michael Trimarchi <[email protected]>

This shouldn't have my Signed-off-by, but yours, it's your patch, and you're submitting it. If you really want to credit me, you can always do something like:

Suggested-by Thomas Petazzoni <[email protected]>

Could you resubmit after using your Signed-off-by? Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#3 lore raw

PATCH 1/2 uboot: qstrip BR2_TARGET_UBOOT_CUSTOM_DTS_PATH

In reply to Michael Trimarchi

Hello Michael,

Quoted 22 lines · Michael Trimarchi

We need to avoid failing of copy of custom dts using cp -f <> command. Just strip in the beginning as done for other configuration variable

Signed-off-by Michael Trimarchi <[email protected]>
---
 boot/uboot/uboot.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
boot/uboot/uboot.mk +1 -0
index 1d464d967..f0f39f3bd 100644
@@ -6,6 +6,7 @@
 
 UBOOT_VERSION = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION))
 UBOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))
+UBOOT_CUSTOM_DTS_PATH=$(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_DTS_PATH))
 
 UBOOT_LICENSE = GPL-2.0+
 UBOOT_LICENSE_FILES = Licenses/gpl-2.0.txt

boot/uboot/uboot.mk endef · line 203

Quoted 10 lines
boot/uboot/uboot.mk +2 -2
@@ -195,8 +196,8 @@ endef
 endif # BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY
 
 define UBOOT_BUILD_CMDS
-	$(if $(BR2_TARGET_UBOOT_CUSTOM_DTS_PATH),
-		cp -f $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_DTS_PATH)) $(@D)/arch/$(UBOOT_ARCH)/dts/
+	$(if $(UBOOT_CUSTOM_DTS_PATH),
+		cp -f $(UBOOT_CUSTOM_DTS_PATH) $(@D)/arch/$(UBOOT_ARCH)/dts/
 	)
 	$(TARGET_CONFIGURE_OPTS) 	\
 		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) 		\
Tested-by Peter Seiderer <[email protected]>

Regards,
Peter

#4 lore raw

PATCH 1/2 uboot: qstrip BR2_TARGET_UBOOT_CUSTOM_DTS_PATH

In reply to Michael Trimarchi

Hello,

Quoted 3 lines · Michael Trimarchi

UBOOT_VERSION = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION)) UBOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))
+UBOOT_CUSTOM_DTS_PATH=$(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_DTS_PATH))

Space around = signs to match our coding style. Also, I've moved this assignment closer to where it's used.

Applied with those two issues fixed. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com