X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fscripts%2Fdefine2mk.sed;h=c641edfb0194ba81195e930b668c6250c90072d8;hb=1f6236f06b1bb219492d7ae3c17232090128da2c;hp=af40bfaf2e8758607d5e64072063b883301ca40e;hpb=02409f8cf54c7cd91981f0dfec135dbf3858090c;p=u-boot

diff --git a/tools/scripts/define2mk.sed b/tools/scripts/define2mk.sed
index af40bfaf2e..c641edfb01 100644
--- a/tools/scripts/define2mk.sed
+++ b/tools/scripts/define2mk.sed
@@ -18,8 +18,14 @@
 	s/="\(.*\)"$/=\1/;
 	# Concatenate string values
 	s/" *"//g;
-	# Wrap non-numeral values with quotes
-	s/=\(.*\?[^0-9].*\)$/=\"\1\"/;
+	# Assume strings as default - add quotes around values
+	s/=\(..*\)/="\1"/;
+	# but remove again from decimal numbers
+	s/="\([0-9][0-9]*\)"/=\1/;
+	# ... and from hex numbers
+	s/="\(0[Xx][0-9a-fA-F][0-9a-fA-F]*\)"/=\1/;
+	# ... and from configs defined from other configs
+	s/="\(CONFIG_[A-Za-z0-9_][A-Za-z0-9_]*\)"/=$(\1)/;
 	# Change '1' and empty values to "y" (not perfect, but
 	# supports conditional compilation in the makefiles
 	s/=$/=y/;