[RFC] gen-dtb-s: make metadata binary fields always little-endian

[Sascha Hauer]

On Sun, Aug 03, 2014 at 09:53:38PM +0400, Antony Pavlov wrote:
> On Sun, 03 Aug 2014 18:17:45 +0200
> Jan Lübbe <jlu at pengutronix.de> wrote:
> 
> > Hi,
> > 
> > On Sat, 2014-08-02 at 09:45 +0400, Antony Pavlov wrote:
> > >  
> > >                 compatlen=$($FDTGET -t s "$dtb" / compatible | wc -c)
> > > -               echo ".int 0x640c8005"
> > > -               echo ".int " $compatlen
> > > +               echo ".byte 0x05, 0x80, 0x0c, 0x64"
> > > +               python -c "print(\".byte 0x%02x, 0x%02x, 0x%02x, 0x%02x\\n\" % ($compatlen & 0xff, ($compatlen >> 8) & 0xff, ($compatlen >> 16) & 0xff, ($compatlen >> 24) & 0xff))"
> > 
> > Rather than adding a build-time dependency on python, maybe we should
> > just handle this in C?
> 
> We use sphinx for documentation generation so we already have dependency on python.

Yeah, but 'make docs' is a separate target. We shouldn't add it for the
binary build without need.

How about this? It uses shell, is readable and uses a function to avoid
duplicating the endianess conversion code.

Sascha


>From 9c3aded9eac3ec563827b6ee562335ff4bce607a Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer at pengutronix.de>
Date: Mon, 4 Aug 2014 19:31:54 +0200
Subject: [PATCH] gen-dtb-s: make metadata binary fields always little-endian

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 scripts/gen-dtb-s | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/scripts/gen-dtb-s b/scripts/gen-dtb-s
index 3e4158f..434612f 100755
--- a/scripts/gen-dtb-s
+++ b/scripts/gen-dtb-s
@@ -6,6 +6,14 @@ imd=$3
 
 echo "#include <asm-generic/barebox.lds.h>"
 
+le32() {
+	printf ".byte 0x%02x, 0x%02x, 0x%02x, 0x%02x\n" \
+		$(($1 & 0xff))				\
+		$((($1 >> 8) & 0xff))			\
+		$((($1 >> 16) & 0xff))			\
+		$((($1 >> 24) & 0xff))
+}
+
 FDTGET=scripts/dtc/fdtget
 
 if [ "$imd" = "y" ]; then
@@ -17,8 +25,8 @@ if [ "$imd" = "y" ]; then
 	if [ "$compat" != "notfound" ]; then
 
 		compatlen=$($FDTGET -t s "$dtb" / compatible | wc -c)
-		echo ".int 0x640c8005"
-		echo ".int " $compatlen
+		le32 0x640c8005
+		le32 $compatlen
 		echo ".byte " $compat
 		echo ".balign 4"
 	fi
@@ -27,8 +35,8 @@ if [ "$imd" = "y" ]; then
 
 	if [ "$model" != "notfound" ]; then
 		modellen=$($FDTGET -t s "$dtb" / model | wc -c)
-		echo ".int 0x640c8004"
-		echo ".int " $modellen
+		le32 0x640c8004
+		le32 $compatlen
 		echo ".byte " $model
 		echo ".balign 4"
 	fi
-- 
2.0.1

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |