summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/logos/atmel.bmpbin26334 -> 15478 bytes
-rw-r--r--tools/scripts/define2mk.sed2
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/logos/atmel.bmp b/tools/logos/atmel.bmp
index 3c445c9..5c659ce 100644
--- a/tools/logos/atmel.bmp
+++ b/tools/logos/atmel.bmp
Binary files differ
diff --git a/tools/scripts/define2mk.sed b/tools/scripts/define2mk.sed
index 13e2845..c641edf 100644
--- a/tools/scripts/define2mk.sed
+++ b/tools/scripts/define2mk.sed
@@ -24,6 +24,8 @@
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/;